diff options
Diffstat (limited to 'functest/core/singlevm.py')
| -rw-r--r-- | functest/core/singlevm.py | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/functest/core/singlevm.py b/functest/core/singlevm.py index 1de355e0d..846e19892 100644 --- a/functest/core/singlevm.py +++ b/functest/core/singlevm.py @@ -39,16 +39,19 @@ class VmReady1(tenantnetwork.TenantNetwork1): __logger = logging.getLogger(__name__) filename = '/home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img' image_format = 'qcow2' - filename_alt = None + extra_properties = None + filename_alt = filename image_alt_format = image_format + extra_alt_properties = extra_properties visibility = 'private' - extra_properties = None 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 = flavor_extra_specs create_server_timeout = 180 def __init__(self, **kwargs): @@ -106,7 +109,7 @@ class VmReady1(tenantnetwork.TenantNetwork1): config.CONF, '{}_image_alt'.format(self.case_name), self.filename_alt), meta=getattr( - config.CONF, '{}_extra_properties'.format(self.case_name), + config.CONF, '{}_extra_alt_properties'.format(self.case_name), self.extra_properties), disk_format=getattr( config.CONF, '{}_image_alt_format'.format(self.case_name), @@ -138,8 +141,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 +169,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): |