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

Author: Jenkins

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 @@ def get_parser(self, prog_name):
 
     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,15 +303,15 @@ 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)")
         )
         return parser
 
     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)

openstackclient/tests/network/v2/test_network.py

@@ -454,7 +454,7 @@ def test_set_this(self):
             '--share',
         ]
         verifylist = [
-            ('identifier', self._network.name),
+            ('network', self._network.name),
             ('admin_state', True),
             ('name', 'noob'),
             ('shared', True),
@@ -478,7 +478,7 @@ def test_set_that(self):
             '--no-share',
         ]
         verifylist = [
-            ('identifier', self._network.name),
+            ('network', self._network.name),
             ('admin_state', False),
             ('shared', False),
         ]
@@ -495,7 +495,7 @@ def test_set_that(self):
 
     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 @@ def test_show_all_options(self):
             self._network.name,
         ]
         verifylist = [
-            ('identifier', self._network.name),
+            ('network', self._network.name),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)