From c3c311c90471ef70e19f0292d453c4e45fa6e0cb Mon Sep 17 00:00:00 2001 From: Lin Yang Date: Mon, 18 Mar 2019 15:20:44 -0700 Subject: [PATCH] Update attach action for RSD 2.3 Change-Id: I991fa5ed9a75a528a6281bc0a387b016dcdc7736 --- rsdclient/osc/v2/node.py | 9 ++++----- rsdclient/tests/v2/test_node.py | 5 +++-- rsdclient/v2/node.py | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rsdclient/osc/v2/node.py b/rsdclient/osc/v2/node.py index 73c41dc..6eeab59 100644 --- a/rsdclient/osc/v2/node.py +++ b/rsdclient/osc/v2/node.py @@ -341,17 +341,16 @@ class AttachEndpoint(command.Command): metavar='', help='URI of the specific resource to attach to node.') parser.add_argument( - '--capacity', - metavar='', - type=int, - help='Required storage capacity in GiB.') + '--protocol', + metavar='', + help='Specified protocol of attaching resource.') return parser def take_action(self, parsed_args): self.log.debug("take_action(%s)", parsed_args) rsd_client = self.app.client_manager.rsd rsd_client.node.attach(parsed_args.node, parsed_args.resource, - parsed_args.capacity) + parsed_args.protocol) class DetachEndpoint(command.Command): diff --git a/rsdclient/tests/v2/test_node.py b/rsdclient/tests/v2/test_node.py index 7d23d81..6662958 100644 --- a/rsdclient/tests/v2/test_node.py +++ b/rsdclient/tests/v2/test_node.py @@ -106,9 +106,10 @@ class NodeTest(testtools.TestCase): node_uri = '/redfish/v1/Nodes/1' mock_node = mock.Mock() self.client.get_node.return_value = mock_node - self.mgr.attach(node_uri, 'fake uri', 10) + self.mgr.attach(node_uri, 'fake uri', 'protocol') self.mgr.client.get_node.assert_called_once_with('/redfish/v1/Nodes/1') - mock_node.attach_endpoint.assert_called_once_with('fake uri', 10) + mock_node.attach_endpoint.assert_called_once_with( + 'fake uri', 'protocol') def test_detach(self): node_uri = '/redfish/v1/Nodes/1' diff --git a/rsdclient/v2/node.py b/rsdclient/v2/node.py index 004d630..c408da7 100644 --- a/rsdclient/v2/node.py +++ b/rsdclient/v2/node.py @@ -70,9 +70,9 @@ class NodeManager(base.Manager): nodes, ["Identity", "Name", "UUID", "Description"]) return node_info_table - def attach(self, node_uri, endpoint=None, capacity=None): + def attach(self, node_uri, endpoint=None, protocol=None): node = self.client.get_node(node_uri) - node.attach_endpoint(endpoint, capacity) + node.attach_endpoint(endpoint, protocol) def detach(self, node_uri, endpoint): node = self.client.get_node(node_uri)