Merge "Set instance CPU policy to 'share' through image property"

Author: Zuul

nova/tests/unit/virt/test_hardware.py

@@ -848,6 +848,127 @@ def test_best_config(self):
 
 class NUMATopologyTest(test.NoDBTestCase):
 
+    def test_cpu_policy_constraint(self):
+        testdata = [
+            {
+                "flavor": objects.Flavor(extra_specs={
+                    "hw:cpu_policy": "dedicated"
+                }),
+                "image": {
+                    "properties": {
+                        "hw_cpu_policy": "dedicated"
+                    }
+                },
+                "expect": fields.CPUAllocationPolicy.DEDICATED
+            },
+            {
+                "flavor": objects.Flavor(extra_specs={
+                    "hw:cpu_policy": "dedicated"
+                }),
+                "image": {
+                    "properties": {
+                        "hw_cpu_policy": "shared"
+                    }
+                },
+                "expect": fields.CPUAllocationPolicy.DEDICATED
+            },
+            {
+                "flavor": objects.Flavor(extra_specs={
+                    "hw:cpu_policy": "dedicated"
+                }),
+                "image": {
+                    "properties": {
+                    }
+                },
+                "expect": fields.CPUAllocationPolicy.DEDICATED
+            },
+            {
+                "flavor": objects.Flavor(extra_specs={
+                    "hw:cpu_policy": "shared"
+                }),
+                "image": {
+                    "properties": {
+                        "hw_cpu_policy": "dedicated"
+                    }
+                },
+                "expect": exception.ImageCPUPinningForbidden
+            },
+            {
+                "flavor": objects.Flavor(extra_specs={
+                    "hw:cpu_policy": "shared"
+                }),
+                "image": {
+                    "properties": {
+                        "hw_cpu_policy": "shared"
+                    }
+                },
+                "expect": fields.CPUAllocationPolicy.SHARED
+            },
+            {
+                "flavor": objects.Flavor(extra_specs={
+                    "hw:cpu_policy": "shared"
+                }),
+                "image": {
+                    "properties": {
+                    }
+                },
+                "expect": fields.CPUAllocationPolicy.SHARED
+            },
+            {
+                "flavor": objects.Flavor(),
+                "image": {
+                    "properties": {
+                        "hw_cpu_policy": "dedicated"
+                    }
+                },
+                "expect": fields.CPUAllocationPolicy.DEDICATED
+            },
+            {
+                "flavor": objects.Flavor(),
+                "image": {
+                    "properties": {
+                        "hw_cpu_policy": "shared"
+                    }
+                },
+                "expect": fields.CPUAllocationPolicy.SHARED
+            },
+            {
+                "flavor": objects.Flavor(),
+                "image": {
+                    "properties": {
+                    }
+                },
+                "expect": None
+            },
+            {
+                "flavor": objects.Flavor(extra_specs={
+                    "hw:cpu_policy": "invalid"
+                }),
+                "image": {
+                    "properties": {
+                    }
+                },
+                "expect": exception.InvalidCPUAllocationPolicy
+            },
+        ]
+
+        for testitem in testdata:
+            image_meta = objects.ImageMeta.from_dict(testitem["image"])
+            if testitem["expect"] is None:
+                cpu_policy = hw.get_cpu_policy_constraint(
+                    testitem["flavor"], image_meta)
+                self.assertIsNone(cpu_policy)
+            elif type(testitem["expect"]) == type:
+                self.assertRaises(testitem["expect"],
+                                  hw.get_cpu_policy_constraint,
+                                  testitem["flavor"],
+                                  image_meta)
+            else:
+                cpu_policy = hw.get_cpu_policy_constraint(
+                    testitem["flavor"], image_meta)
+                self.assertIsNotNone(cpu_policy)
+                self.assertEqual(testitem["expect"], cpu_policy)
+
     def test_topology_constraints(self):
         testdata = [
             {

nova/virt/hardware.py

@@ -1512,7 +1512,7 @@ def get_cpu_policy_constraint(flavor, image_meta):
         if image_policy == fields.CPUAllocationPolicy.DEDICATED:
             raise exception.ImageCPUPinningForbidden()
         cpu_policy = flavor_policy
-    elif image_policy == fields.CPUAllocationPolicy.DEDICATED:
+    elif image_policy in fields.CPUAllocationPolicy.ALL:
         cpu_policy = image_policy
     else:
         cpu_policy = None