Merge "Fix error in flavor set/unset command"

Author: Jenkins

openstackclient/compute/v2/flavor.py

@@ -239,7 +239,8 @@ def get_parser(self, prog_name):
 
     def take_action(self, parsed_args):
         compute_client = self.app.client_manager.compute
-        flavor = compute_client.flavors.find(name=parsed_args.flavor)
+        flavor = utils.find_resource(compute_client.flavors,
+                                     parsed_args.flavor)
         flavor.set_keys(parsed_args.property)
 
 
@@ -289,5 +290,6 @@ def get_parser(self, prog_name):
 
     def take_action(self, parsed_args):
         compute_client = self.app.client_manager.compute
-        flavor = compute_client.flavors.find(name=parsed_args.flavor)
+        flavor = utils.find_resource(compute_client.flavors,
+                                     parsed_args.flavor)
         flavor.unset_keys(parsed_args.property)

openstackclient/tests/compute/v2/test_flavor.py

@@ -288,8 +288,10 @@ def test_flavor_set(self):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
-
-        self.flavors_mock.find.assert_called_with(name='baremetal')
+        try:
+            self.flavors_mock.find.assert_called_with(name=parsed_args.flavor)
+        except Exception:
+            self.flavors_mock.get.assert_called_with(parsed_args.flavor)
         self.assertIsNone(result)
 
 
@@ -382,6 +384,8 @@ def test_flavor_unset(self):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
-
-        self.flavors_mock.find.assert_called_with(name='baremetal')
+        try:
+            self.flavors_mock.find.assert_called_with(name=parsed_args.flavor)
+        except Exception:
+            self.flavors_mock.get.assert_called_with(parsed_args.flavor)
         self.assertIsNone(result)

releasenotes/notes/bug-1575624-87957ff60ad661a6.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - Fixed ``flavor set/unset`` command to properly find a
+    flavor to be set/unset by flavor id.
+    [Bug `1575624 <https://bugs.launchpad.net/bugs/1575624>`_]