Skip to content

Commit 324e026

Browse files
author
Tang Chen
committed
Rename parameter "identifier" to "network" in network commands
In other commands, the name or ID of an object is just the name of the object. For example, name or ID of a server is "server", router is "router". So, do not use "identifier" in network commands. Also, the parameter in doc file network.rst is not "identifier", but "network". Change-Id: I1ec3beefbb878a207bca280b994ca176ef04ee2d
1 parent d8abec3 commit 324e026

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

openstackclient/network/v2/network.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ class SetNetwork(command.Command):
238238
def get_parser(self, prog_name):
239239
parser = super(SetNetwork, self).get_parser(prog_name)
240240
parser.add_argument(
241-
'identifier',
241+
'network',
242242
metavar="<network>",
243243
help=("Network to modify (name or ID)")
244244
)
@@ -279,7 +279,7 @@ def get_parser(self, prog_name):
279279

280280
def take_action(self, parsed_args):
281281
client = self.app.client_manager.network
282-
obj = client.find_network(parsed_args.identifier, ignore_missing=False)
282+
obj = client.find_network(parsed_args.network, ignore_missing=False)
283283

284284
attrs = _get_attrs(self.app.client_manager, parsed_args)
285285
if attrs == {}:
@@ -296,15 +296,15 @@ class ShowNetwork(command.ShowOne):
296296
def get_parser(self, prog_name):
297297
parser = super(ShowNetwork, self).get_parser(prog_name)
298298
parser.add_argument(
299-
'identifier',
299+
'network',
300300
metavar="<network>",
301301
help=("Network to display (name or ID)")
302302
)
303303
return parser
304304

305305
def take_action(self, parsed_args):
306306
client = self.app.client_manager.network
307-
obj = client.find_network(parsed_args.identifier, ignore_missing=False)
307+
obj = client.find_network(parsed_args.network, ignore_missing=False)
308308
columns = _get_columns(obj)
309309
data = utils.get_item_properties(obj, columns, formatters=_formatters)
310310
return (columns, data)

openstackclient/tests/network/v2/test_network.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ def test_set_this(self):
453453
'--share',
454454
]
455455
verifylist = [
456-
('identifier', self._network.name),
456+
('network', self._network.name),
457457
('admin_state', True),
458458
('name', 'noob'),
459459
('shared', True),
@@ -477,7 +477,7 @@ def test_set_that(self):
477477
'--no-share',
478478
]
479479
verifylist = [
480-
('identifier', self._network.name),
480+
('network', self._network.name),
481481
('admin_state', False),
482482
('shared', False),
483483
]
@@ -494,7 +494,7 @@ def test_set_that(self):
494494

495495
def test_set_nothing(self):
496496
arglist = [self._network.name, ]
497-
verifylist = [('identifier', self._network.name), ]
497+
verifylist = [('network', self._network.name), ]
498498

499499
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
500500
self.assertRaises(exceptions.CommandError, self.cmd.take_action,
@@ -553,7 +553,7 @@ def test_show_all_options(self):
553553
self._network.name,
554554
]
555555
verifylist = [
556-
('identifier', self._network.name),
556+
('network', self._network.name),
557557
]
558558

559559
parsed_args = self.check_parser(self.cmd, arglist, verifylist)

0 commit comments

Comments
 (0)