Compute: Add tag support for server add fixed ip

Change-Id: I62ed4729dead9f91630d1f568c834c9642965558
Story: 2002195
Task: 21679

1 files changed, 66 insertions, 0 deletions

diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
index 59282b4a..c91d6e48 100644
--- a/openstackclient/tests/unit/compute/v2/test_server.py
+++ b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -177,6 +177,72 @@ class TestServerAddFixedIP(TestServer):
         extralist = ['--fixed-ip-address', '5.6.7.8']
         self._test_server_add_fixed_ip(extralist, '5.6.7.8')
 
+    def test_server_add_fixed_ip_with_tag(self):
+        self.app.client_manager.compute.api_version = api_versions.APIVersion(
+            '2.49')
+
+        servers = self.setup_servers_mock(count=1)
+        network = compute_fakes.FakeNetwork.create_one_network()
+        with mock.patch(
+            'openstackclient.api.compute_v2.APIv2.network_find'
+        ) as net_mock:
+            net_mock.return_value = network
+
+            arglist = [
+                servers[0].id,
+                network['id'],
+                '--fixed-ip-address', '5.6.7.8',
+                '--tag', 'tag1',
+            ]
+            verifylist = [
+                ('server', servers[0].id),
+                ('network', network['id']),
+                ('fixed_ip_address', '5.6.7.8'),
+                ('tag', 'tag1'),
+            ]
+            parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+            result = self.cmd.take_action(parsed_args)
+
+            servers[0].interface_attach.assert_called_once_with(
+                port_id=None,
+                net_id=network['id'],
+                fixed_ip='5.6.7.8',
+                tag='tag1'
+            )
+            self.assertIsNone(result)
+
+    def test_server_add_fixed_ip_with_tag_pre_v249(self):
+        self.app.client_manager.compute.api_version = api_versions.APIVersion(
+            '2.48')
+
+        servers = self.setup_servers_mock(count=1)
+        network = compute_fakes.FakeNetwork.create_one_network()
+        with mock.patch(
+            'openstackclient.api.compute_v2.APIv2.network_find'
+        ) as net_mock:
+            net_mock.return_value = network
+
+            arglist = [
+                servers[0].id,
+                network['id'],
+                '--fixed-ip-address', '5.6.7.8',
+                '--tag', 'tag1',
+            ]
+            verifylist = [
+                ('server', servers[0].id),
+                ('network', network['id']),
+                ('fixed_ip_address', '5.6.7.8'),
+                ('tag', 'tag1'),
+            ]
+            parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+            ex = self.assertRaises(
+                exceptions.CommandError,
+                self.cmd.take_action,
+                parsed_args)
+            self.assertIn(
+                '--os-compute-api-version 2.49 or greater is required',
+                str(ex))
+
 
 @mock.patch(
     'openstackclient.api.compute_v2.APIv2.floating_ip_add'