From 86a239dba6e5c2abced2b1de53e57aba3c04b82c Mon Sep 17 00:00:00 2001 From: Valentin Boucher Date: Tue, 7 Aug 2018 12:30:50 -0400 Subject: Test OpenStack vGPU feature XCI will be able to deploy this feature on top of pharos lab with GPU so we have test it This test can be improved in the future with OpenCL tests etc | DEPLOY_SCENARIO | os-nosdn-vgpu-ha | +-------------------+-------------------+------------------+----------------+ | TEST CASE | PROJECT | DURATION | RESULT | +-------------------+-------------------+------------------+----------------+ | vgpu | functest | 01:00 | PASS | +-------------------+-------------------+------------------+----------------+ Change-Id: I50618f47097a0257b1834b3966054d20458715df Signed-off-by: Valentin Boucher --- functest/core/singlevm.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'functest/core') diff --git a/functest/core/singlevm.py b/functest/core/singlevm.py index 1de355e0d..f6abb7427 100644 --- a/functest/core/singlevm.py +++ b/functest/core/singlevm.py @@ -46,9 +46,11 @@ class VmReady1(tenantnetwork.TenantNetwork1): flavor_ram = 512 flavor_vcpus = 1 flavor_disk = 1 + flavor_extra_specs = {} flavor_alt_ram = 1024 flavor_alt_vcpus = 1 flavor_alt_disk = 1 + flavor_alt_extra_specs = {} create_server_timeout = 180 def __init__(self, **kwargs): @@ -138,8 +140,11 @@ class VmReady1(tenantnetwork.TenantNetwork1): getattr(config.CONF, '{}_flavor_disk'.format(self.case_name), self.flavor_disk)) self.__logger.debug("flavor: %s", flavor) - self.orig_cloud.set_flavor_specs( - flavor.id, getattr(config.CONF, 'flavor_extra_specs', {})) + flavor_extra_specs_updated = self.flavor_extra_specs.copy() + flavor_extra_specs_updated.update( + getattr(config.CONF, + '{}_flavor_extra_specs'.format(self.case_name), {})) + self.orig_cloud.set_flavor_specs(flavor.id, flavor_extra_specs_updated) return flavor def create_flavor_alt(self, name=None): @@ -163,8 +168,12 @@ class VmReady1(tenantnetwork.TenantNetwork1): getattr(config.CONF, '{}_flavor_alt_disk'.format(self.case_name), self.flavor_alt_disk)) self.__logger.debug("flavor: %s", flavor) + flavor_alt_extra_specs_updated = self.flavor_alt_extra_specs.copy() + flavor_alt_extra_specs_updated.update( + getattr(config.CONF, + '{}_flavor_alt_extra_specs'.format(self.case_name), {})) self.orig_cloud.set_flavor_specs( - flavor.id, getattr(config.CONF, 'flavor_extra_specs', {})) + flavor.id, flavor_alt_extra_specs_updated) return flavor def boot_vm(self, name=None, **kwargs): -- cgit 1.2.3-korg