diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-15 17:16:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-15 17:16:30 +0000 |
| commit | 67bec569f866f8ffe2eac4d268fab6a610608e90 (patch) | |
| tree | dd6789e0ec5fe83ae1608f5c8636824cd6d4f58c /openstackclient | |
| parent | 5543857381f39fc9c0e0c89f8332e64a94e7682f (diff) | |
| parent | 324e026f579041466a48ec4d93e41f05ca8314d2 (diff) | |
| download | python-openstackclient-67bec569f866f8ffe2eac4d268fab6a610608e90.tar.gz | |
Merge "Rename parameter "identifier" to "network" in network commands"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/network/v2/network.py | 8 | ||||
| -rw-r--r-- | openstackclient/tests/network/v2/test_network.py | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/openstackclient/network/v2/network.py b/openstackclient/network/v2/network.py index ae80b48a..636c333e 100644 --- a/openstackclient/network/v2/network.py +++ b/openstackclient/network/v2/network.py @@ -245,7 +245,7 @@ class SetNetwork(command.Command): def get_parser(self, prog_name): parser = super(SetNetwork, self).get_parser(prog_name) parser.add_argument( - 'identifier', + 'network', metavar="<network>", help=("Network to modify (name or ID)") ) @@ -286,7 +286,7 @@ class SetNetwork(command.Command): def take_action(self, parsed_args): client = self.app.client_manager.network - obj = client.find_network(parsed_args.identifier, ignore_missing=False) + obj = client.find_network(parsed_args.network, ignore_missing=False) attrs = _get_attrs(self.app.client_manager, parsed_args) if attrs == {}: @@ -303,7 +303,7 @@ class ShowNetwork(command.ShowOne): def get_parser(self, prog_name): parser = super(ShowNetwork, self).get_parser(prog_name) parser.add_argument( - 'identifier', + 'network', metavar="<network>", help=("Network to display (name or ID)") ) @@ -311,7 +311,7 @@ class ShowNetwork(command.ShowOne): def take_action(self, parsed_args): client = self.app.client_manager.network - obj = client.find_network(parsed_args.identifier, ignore_missing=False) + obj = client.find_network(parsed_args.network, ignore_missing=False) columns = _get_columns(obj) data = utils.get_item_properties(obj, columns, formatters=_formatters) return (columns, data) diff --git a/openstackclient/tests/network/v2/test_network.py b/openstackclient/tests/network/v2/test_network.py index e56c16df..f7721951 100644 --- a/openstackclient/tests/network/v2/test_network.py +++ b/openstackclient/tests/network/v2/test_network.py @@ -454,7 +454,7 @@ class TestSetNetwork(TestNetwork): '--share', ] verifylist = [ - ('identifier', self._network.name), + ('network', self._network.name), ('admin_state', True), ('name', 'noob'), ('shared', True), @@ -478,7 +478,7 @@ class TestSetNetwork(TestNetwork): '--no-share', ] verifylist = [ - ('identifier', self._network.name), + ('network', self._network.name), ('admin_state', False), ('shared', False), ] @@ -495,7 +495,7 @@ class TestSetNetwork(TestNetwork): def test_set_nothing(self): arglist = [self._network.name, ] - verifylist = [('identifier', self._network.name), ] + verifylist = [('network', self._network.name), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.assertRaises(exceptions.CommandError, self.cmd.take_action, @@ -552,7 +552,7 @@ class TestShowNetwork(TestNetwork): self._network.name, ] verifylist = [ - ('identifier', self._network.name), + ('network', self._network.name), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) |