Merge "Compute: Add tag support for server add fixed ip"

1 files changed, 25 insertions, 5 deletions

diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 09842f88..4aed8ad7 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -236,6 +236,14 @@ class AddFixedIP(command.Command):
             metavar="<ip-address>",
             help=_("Requested fixed IP address"),
         )
+        parser.add_argument(
+            '--tag',
+            metavar='<tag>',
+            help=_(
+                'Tag for the attached interface. '
+                '(supported by --os-compute-api-version 2.52 or above)'
+            )
+        )
         return parser
 
     def take_action(self, parsed_args):
@@ -246,11 +254,23 @@ class AddFixedIP(command.Command):
 
         network = compute_client.api.network_find(parsed_args.network)
 
-        server.interface_attach(
-            port_id=None,
-            net_id=network['id'],
-            fixed_ip=parsed_args.fixed_ip_address,
-        )
+        kwargs = {
+            'port_id': None,
+            'net_id': network['id'],
+            'fixed_ip': parsed_args.fixed_ip_address,
+        }
+
+        if parsed_args.tag:
+            if compute_client.api_version < api_versions.APIVersion('2.49'):
+                msg = _(
+                    '--os-compute-api-version 2.49 or greater is required to '
+                    'support the --tag option'
+                )
+                raise exceptions.CommandError(msg)
+
+            kwargs['tag'] = parsed_args.tag
+
+        server.interface_attach(**kwargs)
 
 
 class AddFloatingIP(network_common.NetworkAndComputeCommand):