Take into account shared CPUs per NUMA

MixedCPUPolicyTest.test_shared_pinned_and_unpinned_guest was not taking
into account that only the shared PCPUs from the target NUMA node will
be allocated to the guest i.e. given the below topology:

[0]: 0,2,4,6,8,10,12
[1]: 1,3,5,7,9,11,13

PCPUs 0-3 are used as the shared set, with the remaining allocated
for dedicated set. Then scheduling a 2 vCPU guest with mixed policy
should would result in the guest either getting 0,2 or 1,3 only for its
shared PCPUs not 0-3.

This update checks that number of pCPUs allocated for shared is the
accurate length and a subset of the entire shared set.

Change-Id: I9bd375b563f67968ceae61d7db2ee86436dad771

whitebox_tempest_plugin/api/compute/test_cpu_pinning.py

@@ -877,7 +877,7 @@ class NUMACPUDedicatedLiveMigrationTest(NUMALiveMigrationBase):
                 'cpu_dedicated_set of the compute host')
 
         shared_cpus_per_numa = \
-            CONF.whitebox_hardware.dedicated_cpus_per_numa
+            CONF.whitebox_hardware.shared_cpus_per_numa
         if shared_cpus_per_numa == 0:
             raise cls.skipException(
                 'Need at least 1 or more pCPU\'s per NUMA allocated to the '
@@ -1026,6 +1026,14 @@ class MixedCPUPolicyTest(BasePinningTest, numa_helper.NUMAHelperMixin):
     mixed_cpu_policy = {'hw:cpu_policy': 'mixed',
                         'hw:cpu_dedicated_mask': '^0'}
 
+    @classmethod
+    def skip_checks(cls):
+        super(MixedCPUPolicyTest, cls).skip_checks()
+        if CONF.whitebox_hardware.shared_cpus_per_numa == 0:
+            raise cls.skipException(
+                'Need at least 1 or more pCPU\'s per NUMA allocated to the '
+                'cpu_shared_set of the compute host')
+
     def test_shared_pinned_and_unpinned_guest(self):
         flavor = self.create_flavor(vcpus=self.vcpus,
                                     extra_specs=self.mixed_cpu_policy)
@@ -1044,12 +1052,19 @@ class MixedCPUPolicyTest(BasePinningTest, numa_helper.NUMAHelperMixin):
         guest_shared_cpus = self.get_host_pcpus_for_guest_vcpu(server['id'], 0)
 
         # Validate the PCPUs mapped to core 0 are a subset of the cpu shared
-        # set of the host
-        self.assertCountEqual(guest_shared_cpus, host_shared_cpus,
-                              'Shared CPU Set %s of shared server %s is '
-                              'not equal to shared set of host %s' %
-                              (guest_shared_cpus, server['id'],
-                               host_shared_cpus))
+        # set of the host and number of shared CPUs are accurate to what
+        # is expected for the NUMA node
+        self.assertEqual(
+            CONF.whitebox_hardware.shared_cpus_per_numa,
+            len(guest_shared_cpus),
+            'Number of Shared CPUs allocated to guest should be %s but '
+            'instead found %s' % (CONF.whitebox_hardware.shared_cpus_per_numa,
+                                  len(guest_shared_cpus)))
+        self.assertTrue(
+            guest_shared_cpus.issubset(host_shared_cpus),
+            'Shared CPUs allocated to guest %s is not a subset of the shared '
+            'CPUs that compute host is expected to provide %s' %
+            (guest_shared_cpus, host_shared_cpus))
 
         # Find the PCPU pinned to core 1 of the guest
         guest_dedicated_cpus = \