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>
(cherry picked from commit 484acb3716b6f6261793b8a6a0220cce62ccb0c3)

diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml
index 4d79e4a..cd96d79 100644 (file)
--- a/functest/ci/config_aarch64_patch.yaml
+++ b/functest/ci/config_aarch64_patch.yaml
@@ -32,43 +32,73 @@ os:
 
     functest_smoke_serial:
         image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
         extra_properties:
             hw_firmware_type: 'uefi'
             hw_video_model: 'vga'
             hw_disk_bus: 'scsi'
             hw_scsi_model: 'virtio-scsi'
+        extra_alt_properties:
+            hw_firmware_type: 'uefi'
+            hw_video_model: 'vga'
+            hw_disk_bus: 'scsi'
+            hw_scsi_model: 'virtio-scsi'
 
     refstack_defcore:
         image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
         extra_properties:
             hw_firmware_type: 'uefi'
             hw_video_model: 'vga'
             hw_disk_bus: 'scsi'
             hw_scsi_model: 'virtio-scsi'
+        extra_alt_properties:
+            hw_firmware_type: 'uefi'
+            hw_video_model: 'vga'
+            hw_disk_bus: 'scsi'
+            hw_scsi_model: 'virtio-scsi'
 
     patrole:
         image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
         extra_properties:
             hw_firmware_type: 'uefi'
             hw_video_model: 'vga'
             hw_disk_bus: 'scsi'
             hw_scsi_model: 'virtio-scsi'
+        extra_alt_properties:
+            hw_firmware_type: 'uefi'
+            hw_video_model: 'vga'
+            hw_disk_bus: 'scsi'
+            hw_scsi_model: 'virtio-scsi'
 
     neutron_trunk:
         image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
         extra_properties:
             hw_firmware_type: 'uefi'
             hw_video_model: 'vga'
             hw_disk_bus: 'scsi'
             hw_scsi_model: 'virtio-scsi'
+        extra_alt_properties:
+            hw_firmware_type: 'uefi'
+            hw_video_model: 'vga'
+            hw_disk_bus: 'scsi'
+            hw_scsi_model: 'virtio-scsi'
 
     tempest_full_parallel:
         image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
         extra_properties:
             hw_firmware_type: 'uefi'
             hw_video_model: 'vga'
             hw_disk_bus: 'scsi'
             hw_scsi_model: 'virtio-scsi'
+        extra_alt_properties:
+            hw_firmware_type: 'uefi'
+            hw_video_model: 'vga'
+            hw_disk_bus: 'scsi'
+            hw_scsi_model: 'virtio-scsi'
 
     rally_sanity:
         image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img

diff --git a/functest/ci/config_patch.yaml b/functest/ci/config_patch.yaml
index 326ae97..b21996f 100644 (file)
--- a/functest/ci/config_patch.yaml
+++ b/functest/ci/config_patch.yaml
@@ -24,32 +24,59 @@ fdio:
         flavor_ram: 1024
     tempest_smoke_serial:
         flavor_extra_specs: {'hw:mem_page_size':'large'}
+        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
         extra_properties: {'hw_mem_page_size':'large'}
+        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     refstack_defcore:
         flavor_extra_specs: {'hw:mem_page_size':'large'}
+        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
         extra_properties: {'hw_mem_page_size':'large'}
+        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     patrole:
         flavor_extra_specs: {'hw:mem_page_size':'large'}
+        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
         extra_properties: {'hw_mem_page_size':'large'}
+        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     neutron_trunk:
         flavor_extra_specs: {'hw:mem_page_size':'large'}
+        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
         extra_properties: {'hw_mem_page_size':'large'}
+        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     tempest_full_parallel:
         flavor_extra_specs: {'hw:mem_page_size':'large'}
+        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
         extra_properties: {'hw_mem_page_size':'large'}
+        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     rally_sanity:
         flavor_extra_specs: {'hw:mem_page_size':'large'}
+        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
         extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     rally_full:
         flavor_extra_specs: {'hw:mem_page_size':'large'}
+        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
         extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
+    cloudify_ims:
+        flavor_extra_specs: {'hw:mem_page_size':'large'}
+        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
+        extra_properties: {'hw_mem_page_size':'large'}
+        extra_alt_properties: {'hw_mem_page_size':'large'}
+    vyos_vrouter:
+        flavor_extra_specs: {'hw:mem_page_size':'large'}
+        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
+        extra_properties: {'hw_mem_page_size':'large'}
+        extra_alt_properties: {'hw_mem_page_size':'large'}
+    juju_epc:
+        flavor_extra_specs: {'hw:mem_page_size':'large'}
+        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
+        extra_properties: {'hw_mem_page_size':'large'}
+        extra_alt_properties: {'hw_mem_page_size':'large'}
 
 ovs:
     general:
@@ -69,22 +96,33 @@ ovs:
         flavor_ram: 1024
     tempest_smoke_serial:
         flavor_extra_specs: {'hw:mem_page_size':'large'}
+        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
         extra_properties: {'hw_mem_page_size':'large'}
+        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     refstack_defcore:
         flavor_extra_specs: {'hw:mem_page_size':'large'}
+        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
         extra_properties: {'hw_mem_page_size':'large'}
+        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     patrole:
         flavor_extra_specs: {'hw:mem_page_size':'large'}
+        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
         extra_properties: {'hw_mem_page_size':'large'}
+        extra_alt_properties: {'hw_mem_page_size':'large'}
+        flavor_ram: 1024
     neutron_trunk:
         flavor_extra_specs: {'hw:mem_page_size':'large'}
+        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
         extra_properties: {'hw_mem_page_size':'large'}
+        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     tempest_full_parallel:
         flavor_extra_specs: {'hw:mem_page_size':'large'}
+        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
         extra_properties: {'hw_mem_page_size':'large'}
+        extra_alt_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
     rally_sanity:
         flavor_extra_specs: {'hw:mem_page_size':'large'}
@@ -94,3 +132,18 @@ ovs:
         flavor_extra_specs: {'hw:mem_page_size':'large'}
         extra_properties: {'hw_mem_page_size':'large'}
         flavor_ram: 1024
+    cloudify_ims:
+        flavor_extra_specs: {'hw:mem_page_size':'large'}
+        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
+        extra_properties: {'hw_mem_page_size':'large'}
+        extra_alt_properties: {'hw_mem_page_size':'large'}
+    vyos_vrouter:
+        flavor_extra_specs: {'hw:mem_page_size':'large'}
+        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
+        extra_properties: {'hw_mem_page_size':'large'}
+        extra_alt_properties: {'hw_mem_page_size':'large'}
+    juju_epc:
+        flavor_extra_specs: {'hw:mem_page_size':'large'}
+        flavor_alt_extra_specs: {'hw:mem_page_size':'large'}
+        extra_properties: {'hw_mem_page_size':'large'}
+        extra_alt_properties: {'hw_mem_page_size':'large'}

diff --git a/functest/core/singlevm.py b/functest/core/singlevm.py
index 1de355e..846e198 100644 (file)
--- 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):