openstack/python-openstackclient
Code Issues Proposed changes

Merge "Rename parameter "identifier" to "network" in network commands"

Browse Source
This commit is contained in:
Jenkins 2016-02-15 17:16:30 +00:00 committed by Gerrit Code Review
commit 67bec569f8
2 changed files with 8 additions and 8 deletions
openstackclient
network/v2
network.py
tests/network/v2
test_network.py

8
openstackclient/network/v2/network.py

@ -245,7 +245,7 @@ class SetNetwork(command.Command):
def get_parser(self, prog_name): def get_parser(self, prog_name):
parser = super(SetNetwork, self).get_parser(prog_name) parser = super(SetNetwork, self).get_parser(prog_name)
parser.add_argument( parser.add_argument(
'identifier', 'network',
metavar="<network>", metavar="<network>",
help=("Network to modify (name or ID)") help=("Network to modify (name or ID)")
) )
@ -286,7 +286,7 @@ class SetNetwork(command.Command):
def take_action(self, parsed_args): def take_action(self, parsed_args):
client = self.app.client_manager.network 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) attrs = _get_attrs(self.app.client_manager, parsed_args)
if attrs == {}: if attrs == {}:
@ -303,7 +303,7 @@ class ShowNetwork(command.ShowOne):
def get_parser(self, prog_name): def get_parser(self, prog_name):
parser = super(ShowNetwork, self).get_parser(prog_name) parser = super(ShowNetwork, self).get_parser(prog_name)
parser.add_argument( parser.add_argument(
'identifier', 'network',
metavar="<network>", metavar="<network>",
help=("Network to display (name or ID)") help=("Network to display (name or ID)")
) )
@ -311,7 +311,7 @@ class ShowNetwork(command.ShowOne):
def take_action(self, parsed_args): def take_action(self, parsed_args):
client = self.app.client_manager.network 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) columns = _get_columns(obj)
data = utils.get_item_properties(obj, columns, formatters=_formatters) data = utils.get_item_properties(obj, columns, formatters=_formatters)
return (columns, data) return (columns, data)

8
openstackclient/tests/network/v2/test_network.py

@ -454,7 +454,7 @@ class TestSetNetwork(TestNetwork):
'--share', '--share',
] ]
verifylist = [ verifylist = [
('identifier', self._network.name), ('network', self._network.name),
('admin_state', True), ('admin_state', True),
('name', 'noob'), ('name', 'noob'),
('shared', True), ('shared', True),
@ -478,7 +478,7 @@ class TestSetNetwork(TestNetwork):
'--no-share', '--no-share',
] ]
verifylist = [ verifylist = [
('identifier', self._network.name), ('network', self._network.name),
('admin_state', False), ('admin_state', False),
('shared', False), ('shared', False),
] ]
@ -495,7 +495,7 @@ class TestSetNetwork(TestNetwork):
def test_set_nothing(self): def test_set_nothing(self):
arglist = [self._network.name, ] arglist = [self._network.name, ]
verifylist = [('identifier', self._network.name), ] verifylist = [('network', self._network.name), ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.assertRaises(exceptions.CommandError, self.cmd.take_action, self.assertRaises(exceptions.CommandError, self.cmd.take_action,
@ -552,7 +552,7 @@ class TestShowNetwork(TestNetwork):
self._network.name, self._network.name,
] ]
verifylist = [ verifylist = [
('identifier', self._network.name), ('network', self._network.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)