Introduce a sanity test mode for Rally test

In a sanity test mode the number of iterations is reduced and only
a subset of tests is executed.

JIRA: FUNCTEST-220

Change-Id: I722f12b8cc6df29bfcb81b8798d8d0802b207d94
Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>

5 files changed, 251 insertions, 206 deletions

diff --git a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
index 41c359cc7..562c2e58e 100755
--- a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
+++ b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
@@ -60,6 +60,9 @@ parser.add_argument("-v", "--verbose",
 parser.add_argument("-n", "--noclean",
                     help="Don't clean the created resources for this test.",
                     action="store_true")
+parser.add_argument("-z", "--sanity",
+                    help="Sanity test mode, execute only a subset of tests",
+                    action="store_true")
 
 args = parser.parse_args()
 
@@ -107,7 +110,6 @@ TENANTS_AMOUNT = 3
 ITERATIONS_AMOUNT = 10
 CONCURRENCY = 4
 
-###
 RESULTS_DIR = functest_yaml.get("general").get("directories"). \
     get("dir_rally_res")
 TEMPEST_CONF_FILE = functest_yaml.get("general").get("directories"). \
@@ -196,7 +198,6 @@ def live_migration_supported():
 
 def build_task_args(test_file_name):
     task_args = {'service_list': [test_file_name]}
-    task_args['smoke'] = args.smoke
     task_args['image_name'] = GLANCE_IMAGE_NAME
     task_args['flavor_name'] = FLAVOR_NAME
     task_args['glance_image_location'] = GLANCE_IMAGE_PATH
@@ -207,6 +208,13 @@ def build_task_args(test_file_name):
     task_args['iterations'] = ITERATIONS_AMOUNT
     task_args['concurrency'] = CONCURRENCY
 
+    if args.sanity:
+        task_args['full_mode'] = False
+        task_args['smoke'] = True
+    else:
+        task_args['full_mode'] = True
+        task_args['smoke'] = args.smoke
+
     ext_net = openstack_utils.get_external_net(client_dict['neutron'])
     if ext_net:
         task_args['floating_network'] = str(ext_net)
diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-cinder.yaml b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-cinder.yaml
index b128ffb7f..cb28ee84e 100644
--- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-cinder.yaml
+++ b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-cinder.yaml
@@ -1,3 +1,7 @@
+{# all scenarios included only in full mode #}
+
+{% if full_mode %}
+
   CinderVolumes.create_and_attach_volume:
     -
       args:
@@ -14,9 +18,10 @@
       sla:
         {{ no_failures_sla() }}
 
-  CinderVolumes.create_and_delete_snapshot:
+  CinderVolumes.create_and_list_snapshots:
     -
       args:
+        detailed: true
         force: false
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
@@ -29,12 +34,11 @@
       sla:
         {{ no_failures_sla() }}
 
-  CinderVolumes.create_and_delete_volume:
+  CinderVolumes.create_and_list_volume:
     -
       args:
-        size:
-          max: 1
-          min: 1
+        detailed: true
+        {{ vm_params(image_name,none,1) }}
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
@@ -46,7 +50,8 @@
         {{ no_failures_sla() }}
     -
       args:
-        {{ vm_params(image_name,none,1) }}
+        detailed: true
+        size: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
@@ -56,8 +61,14 @@
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
+
+  CinderVolumes.create_and_upload_volume_to_image:
     -
       args:
+        container_format: "bare"
+        disk_format: "raw"
+        do_delete: true
+        force: false
         size: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
@@ -69,56 +80,84 @@
       sla:
         {{ no_failures_sla() }}
 
-  CinderVolumes.create_and_extend_volume:
+  CinderVolumes.create_nested_snapshots_and_attach_volume:
     -
       args:
-        new_size: 2
-        size: 1
+        nested_level: 1
+        size:
+          max: 1
+          min: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        servers:
+          {{ vm_params(image_name,flavor_name,none)|indent(2,true) }}
+          servers_per_tenant: 1
+          auto_assign_nic: true
+        network: {}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
 
-  CinderVolumes.create_and_list_snapshots:
+  CinderVolumes.create_snapshot_and_attach_volume:
     -
       args:
-        detailed: true
-        force: false
+        volume_type: false
+        size:
+          min: 1
+          max: 5
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
-        {{ volumes() }}
+        servers:
+          {{ vm_params(image_name,flavor_name,none)|indent(2,true) }}
+          servers_per_tenant: 2
+          auto_assign_nic: true
+        network: {}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
-
-  CinderVolumes.create_and_list_volume:
     -
       args:
-        detailed: true
-        {{ vm_params(image_name,none,1) }}
+          volume_type: true
+          size:
+              min: 1
+              max: 5
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        servers:
+          {{ vm_params(image_name,flavor_name,none)|indent(2,true) }}
+          servers_per_tenant: 2
+          auto_assign_nic: true
+        network: {}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
+
+  CinderVolumes.create_volume:
     -
       args:
-        detailed: true
         size: 1
       context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+    -
+      args:
+        size:
+          min: 1
+          max: 5
+      context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
@@ -128,28 +167,29 @@
       sla:
         {{ no_failures_sla() }}
 
-  CinderVolumes.create_and_upload_volume_to_image:
+  CinderVolumes.list_volumes:
     -
       args:
-        container_format: "bare"
-        disk_format: "raw"
-        do_delete: true
-        force: false
-        size: 1
+        detailed: True
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        volumes:
+          size: 1
+          volumes_per_tenant: 4
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
 
-  CinderVolumes.create_from_volume_and_delete_volume:
+{% endif %}
+
+  CinderVolumes.create_and_delete_snapshot:
     -
       args:
-        size: 1
+        force: false
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
@@ -161,10 +201,9 @@
       sla:
         {{ no_failures_sla() }}
 
-  CinderVolumes.create_nested_snapshots_and_attach_volume:
+  CinderVolumes.create_and_delete_volume:
     -
       args:
-        nested_level: 1
         size:
           max: 1
           min: 1
@@ -172,33 +211,18 @@
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
-        servers:
-          {{ vm_params(image_name,flavor_name,none)|indent(2,true) }}
-          servers_per_tenant: 1
-          auto_assign_nic: true
-        network: {}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
-
-  CinderVolumes.create_snapshot_and_attach_volume:
     -
       args:
-        volume_type: false
-        size:
-          min: 1
-          max: 5
+        {{ vm_params(image_name,none,1) }}
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
-        servers:
-          {{ vm_params(image_name,flavor_name,none)|indent(2,true) }}
-          servers_per_tenant: 2
-          auto_assign_nic: true
-        network: {}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
@@ -206,39 +230,23 @@
         {{ no_failures_sla() }}
     -
       args:
-          volume_type: true
-          size:
-              min: 1
-              max: 5
+        size: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
-        servers:
-          {{ vm_params(image_name,flavor_name,none)|indent(2,true) }}
-          servers_per_tenant: 2
-          auto_assign_nic: true
-        network: {}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
 
-  CinderVolumes.create_volume:
+  CinderVolumes.create_and_extend_volume:
     -
       args:
+        new_size: 2
         size: 1
       context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-    -
-      args:
-        size:
-          min: 1
-          max: 5
-      context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
@@ -248,17 +256,15 @@
       sla:
         {{ no_failures_sla() }}
 
-  CinderVolumes.list_volumes:
+  CinderVolumes.create_from_volume_and_delete_volume:
     -
       args:
-        detailed: True
+        size: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
-        volumes:
-          size: 1
-          volumes_per_tenant: 4
+        {{ volumes() }}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-heat.yaml b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-heat.yaml
index a854bcc2e..534d796ea 100644
--- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-heat.yaml
+++ b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-heat.yaml
@@ -1,3 +1,7 @@
+{# all scenarios included only in full mode #}
+
+{% if full_mode %}
+
   HeatStacks.create_and_delete_stack:
     -
       args:
@@ -46,33 +50,31 @@
       sla:
         {{ no_failures_sla() }}
 
-  HeatStacks.create_check_delete_stack:
+  HeatStacks.create_update_delete_stack:
     -
       args:
         template_path: "{{ tmpl_dir }}/random_strings.yaml.template"
+        updated_template_path: "{{ tmpl_dir }}/updated_random_strings_add.yaml.template"
       context:
         {{ user_context(tenants_amount, users_amount, use_existing_users) }}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
-
-  HeatStacks.create_suspend_resume_delete_stack:
     -
       args:
         template_path: "{{ tmpl_dir }}/random_strings.yaml.template"
+        updated_template_path: "{{ tmpl_dir }}/updated_random_strings_delete.yaml.template"
       context:
         {{ user_context(tenants_amount, users_amount, use_existing_users) }}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
-
-  HeatStacks.create_update_delete_stack:
     -
       args:
-        template_path: "{{ tmpl_dir }}/random_strings.yaml.template"
-        updated_template_path: "{{ tmpl_dir }}/updated_random_strings_add.yaml.template"
+        template_path: "{{ tmpl_dir }}/resource_group.yaml.template"
+        updated_template_path: "{{ tmpl_dir }}/updated_resource_group_increase.yaml.template"
       context:
         {{ user_context(tenants_amount, users_amount, use_existing_users) }}
       runner:
@@ -81,8 +83,8 @@
         {{ no_failures_sla() }}
     -
       args:
-        template_path: "{{ tmpl_dir }}/random_strings.yaml.template"
-        updated_template_path: "{{ tmpl_dir }}/updated_random_strings_delete.yaml.template"
+        template_path: "{{ tmpl_dir }}/autoscaling_policy.yaml.template"
+        updated_template_path: "{{ tmpl_dir }}/updated_autoscaling_policy_inplace.yaml.template"
       context:
         {{ user_context(tenants_amount, users_amount, use_existing_users) }}
       runner:
@@ -92,7 +94,7 @@
     -
       args:
         template_path: "{{ tmpl_dir }}/resource_group.yaml.template"
-        updated_template_path: "{{ tmpl_dir }}/updated_resource_group_increase.yaml.template"
+        updated_template_path: "{{ tmpl_dir }}/updated_resource_group_reduce.yaml.template"
       context:
         {{ user_context(tenants_amount, users_amount, use_existing_users) }}
       runner:
@@ -101,6 +103,20 @@
         {{ no_failures_sla() }}
     -
       args:
+        template_path: "{{ tmpl_dir }}/random_strings.yaml.template"
+        updated_template_path: "{{ tmpl_dir }}/updated_random_strings_replace.yaml.template"
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+{% else %}
+
+  HeatStacks.create_update_delete_stack:
+    -
+      args:
         template_path: "{{ tmpl_dir }}/autoscaling_policy.yaml.template"
         updated_template_path: "{{ tmpl_dir }}/updated_autoscaling_policy_inplace.yaml.template"
       context:
@@ -109,20 +125,24 @@
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
+
+{% endif %}
+
+  HeatStacks.create_check_delete_stack:
     -
       args:
-        template_path: "{{ tmpl_dir }}/resource_group.yaml.template"
-        updated_template_path: "{{ tmpl_dir }}/updated_resource_group_reduce.yaml.template"
+        template_path: "{{ tmpl_dir }}/random_strings.yaml.template"
       context:
         {{ user_context(tenants_amount, users_amount, use_existing_users) }}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
+
+  HeatStacks.create_suspend_resume_delete_stack:
     -
       args:
         template_path: "{{ tmpl_dir }}/random_strings.yaml.template"
-        updated_template_path: "{{ tmpl_dir }}/updated_random_strings_replace.yaml.template"
       context:
         {{ user_context(tenants_amount, users_amount, use_existing_users) }}
       runner:
@@ -138,4 +158,3 @@
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
-
diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-neutron.yaml b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-neutron.yaml
index 3cdba95c7..3804d2589 100644
--- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-neutron.yaml
+++ b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-neutron.yaml
@@ -1,7 +1,13 @@
-  NeutronNetworks.create_and_delete_networks:
+{# all scenarios included only in full mode #}
+
+{% if full_mode %}
+
+  NeutronNetworks.create_and_update_networks:
     -
       args:
         network_create_args: {}
+        network_update_args:
+          admin_state_up: false
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
@@ -13,11 +19,15 @@
       sla:
         {{ no_failures_sla() }}
 
-  NeutronNetworks.create_and_delete_ports:
+  NeutronNetworks.create_and_update_ports:
     -
       args:
         network_create_args: {}
         port_create_args: {}
+        port_update_args:
+          admin_state_up: false
+          device_id: "dummy_id"
+          device_owner: "dummy_owner"
         ports_per_network: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
@@ -32,11 +42,13 @@
       sla:
         {{ no_failures_sla() }}
 
-  NeutronNetworks.create_and_delete_routers:
+  NeutronNetworks.create_and_update_routers:
     -
       args:
         network_create_args: {}
         router_create_args: {}
+        router_update_args:
+          admin_state_up: false
         subnet_cidr_start: "1.1.0.0/30"
         subnet_create_args: {}
         subnets_per_network: 1
@@ -55,12 +67,14 @@
       sla:
         {{ no_failures_sla() }}
 
-  NeutronNetworks.create_and_delete_subnets:
+  NeutronNetworks.create_and_update_subnets:
     -
       args:
         network_create_args: {}
-        subnet_cidr_start: "1.1.0.0/30"
+        subnet_cidr_start: "1.4.0.0/16"
         subnet_create_args: {}
+        subnet_update_args:
+          enable_dhcp: false
         subnets_per_network: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
@@ -75,7 +89,9 @@
       sla:
         {{ no_failures_sla() }}
 
-  NeutronNetworks.create_and_list_networks:
+{% endif %}
+
+  NeutronNetworks.create_and_delete_networks:
     -
       args:
         network_create_args: {}
@@ -90,7 +106,7 @@
       sla:
         {{ no_failures_sla() }}
 
-  NeutronNetworks.create_and_list_ports:
+  NeutronNetworks.create_and_delete_ports:
     -
       args:
         network_create_args: {}
@@ -109,7 +125,7 @@
       sla:
         {{ no_failures_sla() }}
 
-  NeutronNetworks.create_and_list_routers:
+  NeutronNetworks.create_and_delete_routers:
     -
       args:
         network_create_args: {}
@@ -124,6 +140,7 @@
           neutron:
             network: -1
             subnet: -1
+            port: -1
             router: -1
         {% endcall %}
       runner:
@@ -131,7 +148,7 @@
       sla:
         {{ no_failures_sla() }}
 
-  NeutronNetworks.create_and_list_subnets:
+  NeutronNetworks.create_and_delete_subnets:
     -
       args:
         network_create_args: {}
@@ -151,12 +168,10 @@
       sla:
         {{ no_failures_sla() }}
 
-  NeutronNetworks.create_and_update_networks:
+  NeutronNetworks.create_and_list_networks:
     -
       args:
         network_create_args: {}
-        network_update_args:
-          admin_state_up: false
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
@@ -168,15 +183,11 @@
       sla:
         {{ no_failures_sla() }}
 
-  NeutronNetworks.create_and_update_ports:
+  NeutronNetworks.create_and_list_ports:
     -
       args:
         network_create_args: {}
         port_create_args: {}
-        port_update_args:
-          admin_state_up: false
-          device_id: "dummy_id"
-          device_owner: "dummy_owner"
         ports_per_network: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
@@ -191,13 +202,11 @@
       sla:
         {{ no_failures_sla() }}
 
-  NeutronNetworks.create_and_update_routers:
+  NeutronNetworks.create_and_list_routers:
     -
       args:
         network_create_args: {}
         router_create_args: {}
-        router_update_args:
-          admin_state_up: false
         subnet_cidr_start: "1.1.0.0/30"
         subnet_create_args: {}
         subnets_per_network: 1
@@ -208,7 +217,6 @@
           neutron:
             network: -1
             subnet: -1
-            port: -1
             router: -1
         {% endcall %}
       runner:
@@ -216,14 +224,12 @@
       sla:
         {{ no_failures_sla() }}
 
-  NeutronNetworks.create_and_update_subnets:
+  NeutronNetworks.create_and_list_subnets:
     -
       args:
         network_create_args: {}
-        subnet_cidr_start: "1.4.0.0/16"
+        subnet_cidr_start: "1.1.0.0/30"
         subnet_create_args: {}
-        subnet_update_args:
-          enable_dhcp: false
         subnets_per_network: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
@@ -237,4 +243,3 @@
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
-
diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-nova.yaml b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-nova.yaml
index 823cd44bc..f0fed8ef4 100644
--- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-nova.yaml
+++ b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-nova.yaml
@@ -1,23 +1,6 @@
-  NovaKeypair.boot_and_delete_server_with_keypair:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        server_kwargs:
-            nics:
-              - net-id: {{ netid }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network:
-          networks_per_tenant: 1
-          start_cidr: "100.1.0.0/25"
-        quotas:
-          {{ unlimited_neutron() }}
-          {{ unlimited_nova(keypairs=true) }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
+{# all scenarios included only in full mode #}
+
+{% if full_mode %}
 
   NovaKeypair.create_and_delete_keypair:
     -
@@ -137,49 +120,6 @@
       sla:
         {{ no_failures_sla() }}
 
-  NovaServers.boot_server_from_volume_and_delete:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        volume_size: 5
-        nics:
-          - net-id: {{ netid }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network:
-          networks_per_tenant: 1
-          start_cidr: "100.1.0.0/25"
-        quotas:
-          {{ unlimited_volumes() }}
-          {{ unlimited_neutron() }}
-          {{ unlimited_nova() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NovaServers.pause_and_unpause_server:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        force_delete: false
-        nics:
-          - net-id: {{ netid }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network:
-          networks_per_tenant: 1
-          start_cidr: "100.1.0.0/25"
-        quotas:
-          {{ unlimited_neutron() }}
-          {{ unlimited_nova() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
   NovaServers.snapshot_server:
     -
       args:
@@ -200,39 +140,6 @@
       sla:
         {{ no_failures_sla() }}
 
-  NovaSecGroup.boot_and_delete_server_with_secgroups:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        security_group_count: 10
-        rules_per_security_group: 10
-        nics:
-          - net-id: {{ netid }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network:
-          start_cidr: "100.1.0.0/25"
-        quotas:
-          {{ unlimited_nova() }}
-          {{ unlimited_neutron(secgroups=true) }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NovaServers.boot_and_migrate_server:
-    - args:
-        {{ vm_params(image_name, flavor_name) }}
-        nics:
-          - net-id: {{ netid }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
   NovaServers.boot_server_from_volume:
     -
       args:
@@ -325,6 +232,7 @@
         {{ no_failures_sla() }}
 
 {% if live_migration %}
+
   NovaServers.boot_and_live_migrate_server:
     - args:
         {{ vm_params(image_name, flavor_name) }}
@@ -368,4 +276,103 @@
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
+
 {% endif %}
+{% endif %}
+
+  NovaKeypair.boot_and_delete_server_with_keypair:
+    -
+      args:
+        {{ vm_params(image_name, flavor_name) }}
+        server_kwargs:
+            nics:
+              - net-id: {{ netid }}
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        network:
+          networks_per_tenant: 1
+          start_cidr: "100.1.0.0/25"
+        quotas:
+          {{ unlimited_neutron() }}
+          {{ unlimited_nova(keypairs=true) }}
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  NovaServers.boot_server_from_volume_and_delete:
+    -
+      args:
+        {{ vm_params(image_name, flavor_name) }}
+        volume_size: 5
+        nics:
+          - net-id: {{ netid }}
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        network:
+          networks_per_tenant: 1
+          start_cidr: "100.1.0.0/25"
+        quotas:
+          {{ unlimited_volumes() }}
+          {{ unlimited_neutron() }}
+          {{ unlimited_nova() }}
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  NovaServers.pause_and_unpause_server:
+    -
+      args:
+        {{ vm_params(image_name, flavor_name) }}
+        force_delete: false
+        nics:
+          - net-id: {{ netid }}
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        network:
+          networks_per_tenant: 1
+          start_cidr: "100.1.0.0/25"
+        quotas:
+          {{ unlimited_neutron() }}
+          {{ unlimited_nova() }}
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  NovaSecGroup.boot_and_delete_server_with_secgroups:
+    -
+      args:
+        {{ vm_params(image_name, flavor_name) }}
+        security_group_count: 10
+        rules_per_security_group: 10
+        nics:
+          - net-id: {{ netid }}
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        network:
+          start_cidr: "100.1.0.0/25"
+        quotas:
+          {{ unlimited_nova() }}
+          {{ unlimited_neutron(secgroups=true) }}
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  NovaServers.boot_and_migrate_server:
+    - args:
+        {{ vm_params(image_name, flavor_name) }}
+        nics:
+          - net-id: {{ netid }}
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}