From 643200e9aab3516834f419cf994b556b48cbefa7 Mon Sep 17 00:00:00 2001 From: Waldemar Znoinski Date: Sat, 10 Dec 2016 11:28:00 +0000 Subject: [PATCH] fix nits + validate numa_topology_test Change-Id: I901c399e53b7c62ac92ac9c54bea0ebea5c040b5 --- .../tests/scenario/test_numa_topology.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/intel_nfv_ci_tests/tests/scenario/test_numa_topology.py b/intel_nfv_ci_tests/tests/scenario/test_numa_topology.py index c428ec7..84d1b14 100644 --- a/intel_nfv_ci_tests/tests/scenario/test_numa_topology.py +++ b/intel_nfv_ci_tests/tests/scenario/test_numa_topology.py @@ -41,7 +41,7 @@ def get_host_numa_placement(instance, vcpus): % out.strip(), shell=True) cgroup = cgroup.split(":")[-1].strip() if cgroup.index('emulator'): - cgroup = cgroup + '/..' + cgroup += '/..' placement = [] for i in range(vcpus): @@ -63,9 +63,8 @@ class NUMARemoteClient(remote_client.RemoteClient): for i in range(int(node_count)): node_cmd = 'cat /sys/devices/system/node/node%d/' % i - node = {} - node['cpu'] = self.exec_command(node_cmd + 'cpulist') - node['mem'] = self.exec_command(node_cmd + 'meminfo') + node = {'cpu': self.exec_command(node_cmd + 'cpulist'), + 'mem': self.exec_command(node_cmd + 'meminfo')} nodes.append(node) return nodes @@ -146,11 +145,11 @@ class NUMAServersTest(base.BaseV2ComputeAdminTest): # Validate guest topology # TODO(stephenfin): Validate more of the NUMA topology than this - numa_nodes = linux_client.get_numa_nodes() + numa_nodes = linux_client.get_numa_topology() self.assertEqual(2, len(numa_nodes)) # Validate host topology - placement = self.get_placement(server, 4) + placement = get_host_numa_placement(server, 4) self.assertEqual(placement[0], placement[1]) self.assertNotEqual(placement[1], placement[2]) self.assertEqual(placement[2], placement[3])