openstack/whitebox-tempest-plugin
Code Issues Proposed changes

Unify create_flavor()

Browse Source 
We have many methods that create a flavor in one way or another. Unify all of
them into a single create_flavor() in the base class.

Original-review: https://review.rdoproject.org/r/#/c/18831/
Change-Id: Ie4fb414d62d0f7762b330c0f6c1bbedb7de949b1
This commit is contained in:
Artom Lifshitz 2019-07-02 15:23:06 +03:00
parent efd8235be9
commit 07c39615ae
3 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
whitebox_tempest_plugin/api/compute/base.py
View File

@ -48,10 +48,13 @@ class BaseWhiteboxComputeTest(base.BaseV2ComputeAdminTest):
return self.admin_servers_client.show_server(server['id'])['server']
def create_flavor(self, ram=64, vcpus=2, disk=1, name=None,
is_public='True', **kwargs):
# override the function to configure sane defaults
return super(BaseWhiteboxComputeTest, self).create_flavor(
is_public='True', extra_specs=None, **kwargs):
flavor = super(BaseWhiteboxComputeTest, self).create_flavor(
ram, vcpus, disk, name, is_public, **kwargs)
if extra_specs:
self.flavors_client.set_flavor_extra_spec(flavor['id'],
**extra_specs)
return flavor
def resize_server(self, server_id, new_flavor_id, **kwargs):
# override the function to return the resized server

48
whitebox_tempest_plugin/api/compute/test_cpu_pinning.py
View File

@ -39,7 +39,8 @@ CONF = config.CONF
class BasePinningTest(base.BaseWhiteboxComputeTest):
vcpus = 2
shared_cpu_policy = {'hw:cpu_policy': 'shared'}
dedicated_cpu_policy = {'hw:cpu_policy': 'dedicated'}
def get_server_cpu_pinning(self, server):
root = self.get_server_xml(server['id'])
@ -61,17 +62,9 @@ class CPUPolicyTest(BasePinningTest):
msg = "OS-FLV-EXT-DATA extension not enabled."
raise cls.skipException(msg)
def create_flavor(self, cpu_policy):
flavor = super(CPUPolicyTest, self).create_flavor(vcpus=self.vcpus)
specs = {'hw:cpu_policy': cpu_policy}
self.flavors_client.set_flavor_extra_spec(flavor['id'], **specs)
return flavor
def test_cpu_shared(self):
"""Ensure an instance with an explicit 'shared' policy work."""
flavor = self.create_flavor(cpu_policy='shared')
flavor = self.create_flavor(extra_specs=self.shared_cpu_policy)
self.create_test_server(flavor=flavor['id'])
@testtools.skipUnless(CONF.whitebox.max_compute_nodes < 2,
@ -83,7 +76,7 @@ class CPUPolicyTest(BasePinningTest):
default. However, we check specifics of that later and only assert that
things aren't overlapping here.
"""
flavor = self.create_flavor(cpu_policy='dedicated')
flavor = self.create_flavor(extra_specs=self.dedicated_cpu_policy)
server_a = self.create_test_server(flavor=flavor['id'])
server_b = self.create_test_server(flavor=flavor['id'])
cpu_pinnings_a = self.get_server_cpu_pinning(server_a)
@ -107,7 +100,7 @@ class CPUPolicyTest(BasePinningTest):
'Resize not available.')
def test_resize_pinned_server_to_unpinned(self):
"""Ensure resizing an instance to unpinned actually drops pinning."""
flavor_a = self.create_flavor(cpu_policy='dedicated')
flavor_a = self.create_flavor(extra_specs=self.dedicated_cpu_policy)
server = self.create_test_server(flavor=flavor_a['id'])
cpu_pinnings = self.get_server_cpu_pinning(server)
@ -115,7 +108,7 @@ class CPUPolicyTest(BasePinningTest):
len(cpu_pinnings), self.vcpus,
"Instance should be pinned but is unpinned")
flavor_b = self.create_flavor(cpu_policy='shared')
flavor_b = self.create_flavor(extra_specs=self.shared_cpu_policy)
server = self.resize_server(server['id'], flavor_b['id'])
cpu_pinnings = self.get_server_cpu_pinning(server)
@ -127,7 +120,7 @@ class CPUPolicyTest(BasePinningTest):
'Resize not available.')
def test_resize_unpinned_server_to_pinned(self):
"""Ensure resizing an instance to pinned actually applies pinning."""
flavor_a = self.create_flavor(cpu_policy='shared')
flavor_a = self.create_flavor(extra_specs=self.shared_cpu_policy)
server = self.create_test_server(flavor=flavor_a['id'])
cpu_pinnings = self.get_server_cpu_pinning(server)
@ -135,7 +128,7 @@ class CPUPolicyTest(BasePinningTest):
len(cpu_pinnings), 0,
"Instance should be unpinned but is pinned")
flavor_b = self.create_flavor(cpu_policy='dedicated')
flavor_b = self.create_flavor(extra_specs=self.dedicated_cpu_policy)
server = self.resize_server(server['id'], flavor_b['id'])
cpu_pinnings = self.get_server_cpu_pinning(server)
@ -145,7 +138,7 @@ class CPUPolicyTest(BasePinningTest):
def test_reboot_pinned_server(self):
"""Ensure pinning information is persisted after a reboot."""
flavor = self.create_flavor(cpu_policy='dedicated')
flavor = self.create_flavor(extra_specs=self.dedicated_cpu_policy)
server = self.create_test_server(flavor=flavor['id'])
cpu_pinnings = self.get_server_cpu_pinning(server)
@ -167,17 +160,12 @@ class CPUPolicyTest(BasePinningTest):
class CPUThreadPolicyTest(BasePinningTest):
"""Validate CPU thread policy support."""
def create_flavor(self, cpu_thread_policy):
flavor = super(CPUThreadPolicyTest, self).create_flavor(
vcpus=self.vcpus)
specs = {
'hw:cpu_policy': 'dedicated',
'hw:cpu_thread_policy': cpu_thread_policy
}
self.flavors_client.set_flavor_extra_spec(flavor['id'], **specs)
return flavor
isolate_thread_policy = {'hw:cpu_policy': 'dedicated',
'hw:cpu_thread_policy': 'isolate'}
prefer_thread_policy = {'hw:cpu_policy': 'dedicated',
'hw:cpu_thread_policy': 'prefer'}
require_thread_policy = {'hw:cpu_policy': 'dedicated',
'hw:cpu_thread_policy': 'require'}
@staticmethod
def get_siblings_list(sib):
@ -233,7 +221,7 @@ class CPUThreadPolicyTest(BasePinningTest):
def test_threads_isolate(self):
"""Ensure vCPUs *are not* placed on thread siblings."""
flavor = self.create_flavor(cpu_thread_policy='isolate')
flavor = self.create_flavor(extra_specs=self.isolate_thread_policy)
server = self.create_test_server(flavor=flavor['id'])
host = server['OS-EXT-SRV-ATTR:host']
@ -258,7 +246,7 @@ class CPUThreadPolicyTest(BasePinningTest):
For this to work, we require a host with HyperThreads. Scheduling will
pass without this, but the test will not.
"""
flavor = self.create_flavor(cpu_thread_policy='prefer')
flavor = self.create_flavor(extra_specs=self.prefer_thread_policy)
server = self.create_test_server(flavor=flavor['id'])
host = server['OS-EXT-SRV-ATTR:host']
@ -282,7 +270,7 @@ class CPUThreadPolicyTest(BasePinningTest):
For this to work, we require a host with HyperThreads. Scheduling will
fail without this.
"""
flavor = self.create_flavor(cpu_thread_policy='require')
flavor = self.create_flavor(extra_specs=self.require_thread_policy)
server = self.create_test_server(flavor=flavor['id'])
host = server['OS-EXT-SRV-ATTR:host']

2
whitebox_tempest_plugin/api/compute/test_multiqueue.py
View File

@ -30,7 +30,7 @@ class MultiqueueTest(base.BaseWhiteboxComputeTest):
def test_multiqueue(self):
image_id = self.copy_default_image(hw_vif_multiqueue_enabled='true')
flavor = self.create_flavor(vcpus=2)
flavor = self.create_flavor()
server = self.create_test_server(
flavor=flavor['id'], image_id=image_id,
networks=[{'uuid': self.get_tenant_network()['id']}])