From e6d9eb56fea56560fdaeae0eceb19f0606ad8334 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Mon, 7 Nov 2016 11:49:00 +0000 Subject: [PATCH] test_cpu_pinning: Enable resize tests The bugs that caused these issues have been resolved upstream. Time to re-enable these tests. There are two fixes required: - Correct invalid Tempest API calls - Add missing resize confirmation steps Change-Id: I9c489ccebde9a91a9aca7a8196952bd2f245f2c1 --- .../tests/scenario/test_cpu_pinning.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/intel_nfv_ci_tests/tests/scenario/test_cpu_pinning.py b/intel_nfv_ci_tests/tests/scenario/test_cpu_pinning.py index 63df4d8..50278b8 100644 --- a/intel_nfv_ci_tests/tests/scenario/test_cpu_pinning.py +++ b/intel_nfv_ci_tests/tests/scenario/test_cpu_pinning.py @@ -15,7 +15,6 @@ import libvirt from tempest.lib.common.utils import data_utils -from tempest.lib import decorators import testtools import xml.etree.ElementTree as ET @@ -147,10 +146,17 @@ class CPUPolicyTest(base.BaseV2ComputeAdminTest): return server def _resize_server(self, server, flavor): - self.servers_client.resize(server['id'], flavor['id']) + self.servers_client.resize_server(server['id'], flavor['id']) + + waiters.wait_for_server_status(self.servers_client, server['id'], + 'VERIFY_RESIZE') + self.servers_client.confirm_resize_server(server['id']) + waiters.wait_for_server_status(self.servers_client, server['id'], + 'ACTIVE') # get more information server = self.servers_client.show_server(server['id'])['server'] + self.assertEqual(flavor['id'], server['flavor']['id']) return server @@ -216,7 +222,6 @@ class CPUPolicyTest(base.BaseV2ComputeAdminTest): sib.remove(pcpu) self.assertFalse(set(sib).isdisjoint(cpu_pinnings.values())) - @decorators.skip_because(bug='0') @testtools.skipUnless(CONF.compute_feature_enabled.resize, 'Resize not available.') def test_resize_pinned_server_to_unpinned(self): @@ -233,7 +238,6 @@ class CPUPolicyTest(base.BaseV2ComputeAdminTest): self.assertEqual(len(cpu_pinnings), 0) - @decorators.skip_because(bug='0') @testtools.skipUnless(CONF.compute_feature_enabled.resize, 'Resize not available.') def test_resize_unpinned_server_to_pinned(self):