aboutsummaryrefslogtreecommitdiffstats
path: root/functest/core
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-08-13 13:31:38 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-08-13 13:31:38 +0200
commit484acb3716b6f6261793b8a6a0220cce62ccb0c3 (patch)
treededeac52042d0bfb29b3284e78668c8366cd7845 /functest/core
parent46302bab610b7631d09c921a1062e794cb08c5e9 (diff)
Update all patch configs
It takes all new testcases into account. It allows running vnfs vs dpdk scenarios too. Change-Id: I789f6bb1c3df891b1a94f2a674c15085f81f2f23 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/core')
-rw-r--r--functest/core/singlevm.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/functest/core/singlevm.py b/functest/core/singlevm.py
index f6abb7427..846e19892 100644
--- a/functest/core/singlevm.py
+++ b/functest/core/singlevm.py
@@ -39,10 +39,11 @@ 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
@@ -50,7 +51,7 @@ class VmReady1(tenantnetwork.TenantNetwork1):
flavor_alt_ram = 1024
flavor_alt_vcpus = 1
flavor_alt_disk = 1
- flavor_alt_extra_specs = {}
+ flavor_alt_extra_specs = flavor_extra_specs
create_server_timeout = 180
def __init__(self, **kwargs):
@@ -108,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),