diff options
| -rw-r--r-- | functest/ci/config_aarch64_patch.yaml | 62 | ||||
| -rw-r--r-- | functest/ci/config_patch.yaml | 132 | ||||
| -rw-r--r-- | functest/core/singlevm.py | 9 |
3 files changed, 195 insertions, 8 deletions
diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml index 0926e361a..a4b0cd497 100644 --- a/functest/ci/config_aarch64_patch.yaml +++ b/functest/ci/config_aarch64_patch.yaml @@ -60,18 +60,39 @@ os: extra_properties: hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' + extra_alt_properties: + hw_disk_bus: 'scsi' + hw_scsi_model: 'virtio-scsi' + + neutron-tempest-plugin-api: + 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_disk_bus: 'scsi' + hw_scsi_model: 'virtio-scsi' + extra_alt_properties: + 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_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' + extra_alt_properties: + 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_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' + extra_alt_properties: + hw_disk_bus: 'scsi' + hw_scsi_model: 'virtio-scsi' vmtp: image: @@ -88,15 +109,43 @@ os: 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_disk_bus: 'scsi' + hw_scsi_model: 'virtio-scsi' + extra_alt_properties: + hw_disk_bus: 'scsi' + hw_scsi_model: 'virtio-scsi' + + networking-bgpvpn: + 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_disk_bus: 'scsi' + hw_scsi_model: 'virtio-scsi' + extra_alt_properties: + hw_disk_bus: 'scsi' + hw_scsi_model: 'virtio-scsi' + + networking-sfc: + 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_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' + extra_alt_properties: + hw_disk_bus: 'scsi' + hw_scsi_model: 'virtio-scsi' barbican: 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_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' + extra_alt_properties: + hw_disk_bus: 'scsi' + hw_scsi_model: 'virtio-scsi' tempest_full: image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img @@ -104,6 +153,19 @@ os: extra_properties: hw_disk_bus: 'scsi' hw_scsi_model: 'virtio-scsi' + extra_alt_properties: + hw_disk_bus: 'scsi' + hw_scsi_model: 'virtio-scsi' + + tempest_scenario: + 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_disk_bus: 'scsi' + hw_scsi_model: 'virtio-scsi' + extra_alt_properties: + 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 c2bfe33e7..39ab946a8 100644 --- a/functest/ci/config_patch.yaml +++ b/functest/ci/config_patch.yaml @@ -42,17 +42,29 @@ fdio: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} flavor_ram: 1024 - tempest_smoke_serial: + tempest_smoke: 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-tempest-plugin-api: + 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 vmtp: flavor_extra_specs: {'hw:mem_page_size':'large'} @@ -64,24 +76,75 @@ fdio: 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 + networking-bgpvpn: + 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 + networking-sfc: + 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 barbican: 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: + 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: + tempest_scenario: 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: + 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'} + 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'} + heat_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: @@ -119,17 +182,29 @@ ovs: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} flavor_ram: 1024 - tempest_smoke_serial: + tempest_smoke: 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-tempest-plugin-api: + 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 vmtp: flavor_extra_specs: {'hw:mem_page_size':'large'} @@ -141,15 +216,39 @@ ovs: 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 + networking-bgpvpn: + 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 + networking-sfc: + 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 barbican: 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: + 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: + tempest_scenario: 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'} @@ -159,3 +258,28 @@ ovs: flavor_extra_specs: {'hw:mem_page_size':'large'} extra_properties: {'hw_mem_page_size':'large'} flavor_ram: 1024 + cloudify: + 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'} + 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'} + heat_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 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), |