Update all patches proposed by Functest

It mostly takes into account the last changes in test case names and
new cntt-related test cases.

Change-Id: I271fd02095b57f3b19b5ff95299fb4b257163c1f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit dd92ba4d5b6d169dd52f5d43f35d84bdc6d6ab9b)

2 files changed, 250 insertions, 74 deletions

diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml
index 3e4862db5..12803a69a 100644
--- a/functest/ci/config_aarch64_patch.yaml
+++ b/functest/ci/config_aarch64_patch.yaml
@@ -2,95 +2,98 @@
 os:
     vmready1:
         image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-
     vmready2:
         image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-
     singlevm1:
         image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-
     singlevm2:
         image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-
     vping_ssh:
         image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-
     vping_userdata:
         image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-
     cinder_test:
         image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-
     tempest_smoke:
         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
-
     tempest_horizon:
         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
-
     tempest_neutron:
         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
-
     tempest_cinder:
         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
-
     tempest_keystone:
         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
-
     tempest_heat:
         image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
         image_alt:
             /home/opnfv/functest/images/Fedora-Cloud-Base-30-1.2.aarch64.qcow2
-
     tempest_telemetry:
         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
-
     rally_sanity:
         image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-
     refstack_compute:
         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
-
     refstack_object:
         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
-
     refstack_platform:
         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
-
     tempest_full:
         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
-
     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
-
     tempest_slow:
         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
-
     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
-
     tempest_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
-
     tempest_octavia:
         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
-
+    tempest_neutron_cntt:
+        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
+    tempest_cinder_cntt:
+        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
+    tempest_keystone_cntt:
+        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
+    tempest_heat_cntt:
+        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+        image_alt:
+            /home/opnfv/functest/images/Fedora-Cloud-Base-30-1.2.aarch64.qcow2
+    rally_sanity_cntt:
+        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+    tempest_full_cntt:
+        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
+    tempest_scenario_cntt:
+        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
+    tempest_slow_cntt:
+        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
     rally_full:
         image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
-
     rally_jobs:
         image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+    rally_full_cntt:
+        image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+    rally_jobs_cntt:
+        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 9268837ff..15543d642 100644
--- a/functest/ci/config_patch.yaml
+++ b/functest/ci/config_patch.yaml
@@ -4,7 +4,31 @@ gsma:
         flavor_alt_ram: 2048
         flavor_alt_vcpus: 1
         flavor_alt_disk: 40
-    neutron-tempest-plugin-api:
+    tempest_horizon:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_neutron:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_cinder:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_keystone:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_heat:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_telemetry:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    rally_sanity:
         flavor_alt_ram: 2048
         flavor_alt_vcpus: 1
         flavor_alt_disk: 40
@@ -20,43 +44,59 @@ gsma:
         flavor_alt_ram: 2048
         flavor_alt_vcpus: 1
         flavor_alt_disk: 40
+    tempest_full:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_scenario:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_slow:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
     patrole:
         flavor_alt_ram: 2048
         flavor_alt_vcpus: 1
         flavor_alt_disk: 40
-    vmtp:
-        flavor_ram: 2048
-        flavor_vcpus: 1
-        flavor_disk: 40
-    shaker:
-        flavor_ram: 2048
-        flavor_vcpus: 1
-        flavor_disk: 40
-    neutron_trunk:
+    tempest_barbican:
         flavor_alt_ram: 2048
         flavor_alt_vcpus: 1
         flavor_alt_disk: 40
-    networking-bgpvpn:
+    tempest_octavia:
         flavor_alt_ram: 2048
         flavor_alt_vcpus: 1
         flavor_alt_disk: 40
-    networking-sfc:
+    tempest_neutron_cntt:
         flavor_alt_ram: 2048
         flavor_alt_vcpus: 1
         flavor_alt_disk: 40
-    barbican:
+    tempest_cinder_cntt:
         flavor_alt_ram: 2048
         flavor_alt_vcpus: 1
         flavor_alt_disk: 40
-    tempest_full:
+    tempest_keystone_cntt:
         flavor_alt_ram: 2048
         flavor_alt_vcpus: 1
         flavor_alt_disk: 40
-    tempest_scenario:
+    tempest_heat_cntt:
         flavor_alt_ram: 2048
         flavor_alt_vcpus: 1
         flavor_alt_disk: 40
-    rally_sanity:
+    rally_sanity_cntt:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_full_cntt:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_scenario_cntt:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    tempest_slow_cntt:
         flavor_alt_ram: 2048
         flavor_alt_vcpus: 1
         flavor_alt_disk: 40
@@ -64,6 +104,26 @@ gsma:
         flavor_alt_ram: 2048
         flavor_alt_vcpus: 1
         flavor_alt_disk: 40
+    rally_jobs:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    vmtp:
+        flavor_ram: 2048
+        flavor_vcpus: 1
+        flavor_disk: 40
+    shaker:
+        flavor_ram: 2048
+        flavor_vcpus: 1
+        flavor_disk: 40
+    rally_full_cntt:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
+    rally_jobs_cntt:
+        flavor_alt_ram: 2048
+        flavor_alt_vcpus: 1
+        flavor_alt_disk: 40
     cloudify:
         flavor_ram: 4096
         flavor_vcpus: 2
@@ -111,38 +171,64 @@ fdio:
         flavor_ram: 1024
     tempest_smoke:
         flavor_ram: 1024
+    tempest_horizon:
+        flavor_ram: 1024
     tempest_neutron:
         flavor_ram: 1024
+    tempest_cinder:
+        flavor_ram: 1024
+    tempest_keystone:
+        flavor_ram: 1024
+    tempest_heat:
+        flavor_ram: 1024
+    tempest_telemetry:
+        flavor_ram: 1024
+    rally_sanity:
+        flavor_ram: 1024
     refstack_compute:
         flavor_ram: 1024
     refstack_object:
         flavor_ram: 1024
     refstack_platform:
         flavor_ram: 1024
+    tempest_full:
+        flavor_ram: 1024
+    tempest_scenario:
+        flavor_ram: 1024
+    tempest_slow:
+        flavor_ram: 1024
     patrole:
         flavor_ram: 1024
-    vmtp:
-        flavor_ram: 2048
-    shaker:
+    tempest_barbican:
         flavor_ram: 1024
-    neutron_trunk:
+    tempest_neutron_cntt:
         flavor_ram: 1024
-    networking-bgpvpn:
+    tempest_cinder_cntt:
         flavor_ram: 1024
-    networking-sfc:
+    tempest_keystone_cntt:
         flavor_ram: 1024
-    barbican:
+    tempest_heat_cntt:
         flavor_ram: 1024
-    tempest_full:
+    rally_sanity_cntt:
         flavor_ram: 1024
-    tempest_scenario:
+    tempest_full_cntt:
         flavor_ram: 1024
-    rally_sanity:
+    tempest_scenario_cntt:
+        flavor_ram: 1024
+    tempest_slow_cntt:
         flavor_ram: 1024
     rally_full:
         flavor_ram: 1024
     rally_jobs:
         flavor_ram: 1024
+    vmtp:
+        flavor_ram: 2048
+    shaker:
+        flavor_ram: 1024
+    rally_full_cntt:
+        flavor_ram: 1024
+    rally_jobs_cntt:
+        flavor_ram: 1024
 
 ovs:
     vmready1:
@@ -161,38 +247,64 @@ ovs:
         flavor_ram: 1024
     tempest_smoke:
         flavor_ram: 1024
+    tempest_horizon:
+        flavor_ram: 1024
     tempest_neutron:
         flavor_ram: 1024
+    tempest_cinder:
+        flavor_ram: 1024
+    tempest_keystone:
+        flavor_ram: 1024
+    tempest_heat:
+        flavor_ram: 1024
+    tempest_telemetry:
+        flavor_ram: 1024
+    rally_sanity:
+        flavor_ram: 1024
     refstack_compute:
         flavor_ram: 1024
     refstack_object:
         flavor_ram: 1024
     refstack_platform:
         flavor_ram: 1024
+    tempest_full:
+        flavor_ram: 1024
+    tempest_scenario:
+        flavor_ram: 1024
+    tempest_slow:
+        flavor_ram: 1024
     patrole:
         flavor_ram: 1024
-    vmtp:
-        flavor_ram: 2048
-    shaker:
+    tempest_barbican:
         flavor_ram: 1024
-    neutron_trunk:
+    tempest_neutron_cntt:
         flavor_ram: 1024
-    networking-bgpvpn:
+    tempest_cinder_cntt:
         flavor_ram: 1024
-    networking-sfc:
+    tempest_keystone_cntt:
         flavor_ram: 1024
-    barbican:
+    tempest_heat_cntt:
         flavor_ram: 1024
-    tempest_full:
+    rally_sanity_cntt:
         flavor_ram: 1024
-    tempest_scenario:
+    tempest_full_cntt:
         flavor_ram: 1024
-    rally_sanity:
+    tempest_scenario_cntt:
+        flavor_ram: 1024
+    tempest_slow_cntt:
         flavor_ram: 1024
     rally_full:
         flavor_ram: 1024
     rally_jobs:
         flavor_ram: 1024
+    vmtp:
+        flavor_ram: 2048
+    shaker:
+        flavor_ram: 1024
+    rally_full_cntt:
+        flavor_ram: 1024
+    rally_jobs_cntt:
+        flavor_ram: 1024
 
 vio:
     vmready1:
@@ -221,11 +333,40 @@ vio:
         image_format: vmdk
         image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_alt_format: vmdk
+    tempest_horizon:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt_format: vmdk
     tempest_neutron:
         image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_format: vmdk
         image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_alt_format: vmdk
+    tempest_cinder:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    tempest_keystone:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    tempest_heat:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt:
+            /home/opnfv/functest/images/Fedora-Cloud-Base-30-1.2.x86_64.vmdk
+        image_alt_format: vmdk
+    tempest_telemetry:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    rally_sanity:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
     refstack_compute:
         image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_format: vmdk
@@ -241,57 +382,89 @@ vio:
         image_format: vmdk
         image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_alt_format: vmdk
-    patrole:
+    tempest_full:
         image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_format: vmdk
         image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_alt_format: vmdk
-    vmtp:
-        image:
-            /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.vmdk
+    tempest_scenario:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_format: vmdk
-    shaker:
-        image: /home/opnfv/functest/images/shaker-image.vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    tempest_slow:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_format: vmdk
-    neutron_trunk:
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    patrole:
         image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_format: vmdk
         image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_alt_format: vmdk
-    networking-bgpvpn:
+    tempest_barbican:
         image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_format: vmdk
         image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_alt_format: vmdk
-    networking-sfc:
+    tempest_neutron_cntt:
         image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_format: vmdk
         image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_alt_format: vmdk
-    barbican:
+    tempest_cinder_cntt:
         image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_format: vmdk
         image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_alt_format: vmdk
-    tempest_full:
+    tempest_keystone_cntt:
         image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_format: vmdk
         image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_alt_format: vmdk
-    tempest_scenario:
+    tempest_heat_cntt:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt:
+            /home/opnfv/functest/images/Fedora-Cloud-Base-30-1.2.x86_64.vmdk
+        image_alt_format: vmdk
+    rally_sanity_cntt:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+    tempest_full_cntt:
         image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_format: vmdk
         image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_alt_format: vmdk
-    rally_sanity:
+    tempest_scenario_cntt:
         image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt_format: vmdk
+    tempest_slow_cntt:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+        image_alt: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_alt_format: vmdk
     rally_full:
         image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_format: vmdk
     rally_jobs:
         image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
         image_format: vmdk
+    vmtp:
+        image:
+            /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.vmdk
+        image_format: vmdk
+    shaker:
+        image: /home/opnfv/functest/images/shaker-image.vmdk
+        image_format: vmdk
+    rally_full_cntt:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
+    rally_jobs_cntt:
+        image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+        image_format: vmdk
     cloudify:
         image:
             /home/opnfv/functest/images/ubuntu-16.04-server-cloudimg-amd64-disk1.vmdk