Merge "Allow openstack flavor set to update flavor description using name"

Author: Zuul

openstackclient/compute/v2/flavor.py

@@ -402,7 +402,7 @@ def take_action(self, parsed_args):
             if compute_client.api_version < api_versions.APIVersion("2.55"):
                 msg = _("--os-compute-api-version 2.55 or later is required")
                 raise exceptions.CommandError(msg)
-            compute_client.flavors.update(flavor=parsed_args.flavor,
+            compute_client.flavors.update(flavor=flavor.id,
                                           description=parsed_args.description)
 
 

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

@@ -749,6 +749,42 @@ def test_flavor_set_description_api_older(self):
             self.assertRaises(exceptions.CommandError, self.cmd.take_action,
                               parsed_args)
 
+    def test_flavor_set_description_using_name_api_newer(self):
+        arglist = [
+            '--description', 'description',
+            self.flavor.name,
+        ]
+        verifylist = [
+            ('description', 'description'),
+            ('flavor', self.flavor.name),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.app.client_manager.compute.api_version = 2.55
+        with mock.patch.object(novaclient.api_versions,
+                               'APIVersion',
+                               return_value=2.55):
+            result = self.cmd.take_action(parsed_args)
+            self.flavors_mock.update.assert_called_with(
+                flavor=self.flavor.id, description='description')
+            self.assertIsNone(result)
+
+    def test_flavor_set_description_using_name_api_older(self):
+        arglist = [
+            '--description', 'description',
+            self.flavor.name,
+        ]
+        verifylist = [
+            ('description', 'description'),
+            ('flavor', self.flavor.name),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.app.client_manager.compute.api_version = 2.54
+        with mock.patch.object(novaclient.api_versions,
+                               'APIVersion',
+                               return_value=2.55):
+            self.assertRaises(exceptions.CommandError, self.cmd.take_action,
+                              parsed_args)
+
 
 class TestFlavorShow(TestFlavor):