Merge "compute: Stop sending rxtx_factor when unset"

Author: Zuul

openstackclient/compute/v2/flavor.py

@@ -102,8 +102,7 @@ def get_parser(self, prog_name):
             "--rxtx-factor",
             type=float,
             metavar="<factor>",
-            default=1.0,
-            help=_("RX/TX factor (default 1.0)"),
+            help=_("RX/TX factor"),
         )
         public_group = parser.add_mutually_exclusive_group()
         public_group.add_argument(
@@ -177,10 +176,19 @@ def take_action(self, parsed_args):
             'id': flavor_id,
             'ephemeral': parsed_args.ephemeral,
             'swap': parsed_args.swap,
-            'rxtx_factor': parsed_args.rxtx_factor,
             'is_public': parsed_args.public,
         }
 
+        if parsed_args.rxtx_factor:
+            if sdk_utils.supports_microversion(compute_client, '2.102'):
+                msg = _(
+                    'The --rxtx-factor parameter is only supported until '
+                    'API microversion 2.101'
+                )
+                raise exceptions.CommandError(msg)
+
+            args['rxtx_factor'] = parsed_args.rxtx_factor
+
         if parsed_args.description:
             if not sdk_utils.supports_microversion(compute_client, '2.55'):
                 msg = _(
@@ -206,6 +214,7 @@ def take_action(self, parsed_args):
                     "Failed to add project %(project)s access to flavor: %(e)s"
                 )
                 LOG.error(msg, {'project': parsed_args.project, 'e': e})
+
         if parsed_args.properties:
             try:
                 flavor = compute_client.create_flavor_extra_specs(

openstackclient/tests/unit/compute/v2/test_flavor.py

@@ -106,7 +106,6 @@ def test_flavor_create_default_options(self):
             'id': None,
             'ephemeral': 0,
             'swap': 0,
-            'rxtx_factor': 1.0,
             'is_public': True,
         }
 
@@ -395,6 +394,32 @@ def test_flavor_create_with_description_pre_v255(self):
             exceptions.CommandError, self.cmd.take_action, parsed_args
         )
 
+    def test_flavor_create_with_rxtx_factor_post_v2102(self):
+        self.set_compute_api_version('2.102')
+
+        arglist = [
+            '--id',
+            self.flavor.id,
+            '--ram',
+            str(self.flavor.ram),
+            '--vcpus',
+            str(self.flavor.vcpus),
+            '--rxtx-factor',
+            '1.0',
+            self.flavor.name,
+        ]
+        verifylist = [
+            ('ram', self.flavor.ram),
+            ('vcpus', self.flavor.vcpus),
+            ('rxtx_factor', 1.0),
+            ('name', self.flavor.name),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
+
 
 class TestFlavorDelete(TestFlavor):
     def setUp(self):

releasenotes/notes/drop-flavor-rxtx_factor-9062e1857de2353a.yaml

@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    The ``flavor create`` command will no longer provide a default value for
+    ``rxtx_factor``, following the removal of this field in Nova API
+    microversion v2.102. This field was a no-op for all supported virt
+    drivers so this should not affect any users.