Clean all OpenStack related modules

Xtesting is only focused on the framework and entry points.

Change-Id: I1a4146ed8519438b13810a20ddf1140c35bb6ecd
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

29 files changed, 0 insertions, 3183 deletions

diff --git a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-ceilometer.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-ceilometer.yaml
deleted file mode 100644
index 7efb5a83..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-ceilometer.yaml
+++ /dev/null
@@ -1,458 +0,0 @@
-  CeilometerMeters.list_meters:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        ceilometer:
-          counter_name: "benchmark_meter"
-          counter_type: "gauge"
-          counter_unit: "%"
-          counter_volume: 100
-          resources_per_tenant: 100
-          samples_per_resource: 100
-          timestamp_interval: 10
-          metadata_list:
-            -
-              status: "active"
-              name: "rally benchmark on"
-              deleted: "false"
-            -
-              status: "terminated"
-              name: "rally benchmark off"
-              deleted: "true"
-        {% endcall %}
-      args:
-        limit: 50
-        metadata_query:
-          status: "terminated"
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerResource.list_resources:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        ceilometer:
-          counter_name: "benchmark_meter"
-          counter_type: "gauge"
-          counter_unit: "%"
-          counter_volume: 100
-          resources_per_tenant: 100
-          samples_per_resource: 100
-          timestamp_interval: 10
-          metadata_list:
-            -
-              status: "active"
-              name: "rally benchmark on"
-              deleted: "false"
-            -
-              status: "terminated"
-              name: "rally benchmark off"
-              deleted: "true"
-        {% endcall %}
-      args:
-        limit: 50
-        metadata_query:
-          status: "terminated"
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerAlarms.create_alarm_and_get_history:
-    -
-      args:
-        meter_name: "ram_util"
-        threshold: 10.0
-        type: "threshold"
-        state: "ok"
-        statistic: "avg"
-        alarm_actions: ["http://localhost:8776/alarm"]
-        ok_actions: ["http://localhost:8776/ok"]
-        insufficient_data_actions: ["http://localhost:8776/notok"]
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerAlarms.create_and_delete_alarm:
-    -
-      args:
-        meter_name: "ram_util"
-        threshold: 10.0
-        type: "threshold"
-        statistic: "avg"
-        alarm_actions: ["http://localhost:8776/alarm"]
-        ok_actions: ["http://localhost:8776/ok"]
-        insufficient_data_actions: ["http://localhost:8776/notok"]
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerAlarms.create_and_get_alarm:
-    -
-      args:
-        meter_name: "ram_util"
-        threshold: 10.0
-        type: "threshold"
-        statistic: "avg"
-        alarm_actions: ["http://localhost:8776/alarm"]
-        ok_actions: ["http://localhost:8776/ok"]
-        insufficient_data_actions: ["http://localhost:8776/notok"]
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerAlarms.create_and_list_alarm:
-    -
-      args:
-        meter_name: "ram_util"
-        threshold: 10.0
-        type: "threshold"
-        statistic: "avg"
-        alarm_actions: ["http://localhost:8776/alarm"]
-        ok_actions: ["http://localhost:8776/ok"]
-        insufficient_data_actions: ["http://localhost:8776/notok"]
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerQueries.create_and_query_alarm_history:
-    -
-      args:
-        orderby: !!null
-        limit: !!null
-        meter_name: "ram_util"
-        threshold: 10.0
-        type: "threshold"
-        statistic: "avg"
-        alarm_actions: ["http://localhost:8776/alarm"]
-        ok_actions: ["http://localhost:8776/ok"]
-        insufficient_data_actions: ["http://localhost:8776/notok"]
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerQueries.create_and_query_alarms:
-    -
-      args:
-        filter: {"and": [{"!=": {"state": "dummy_state"}},{"=": {"type": "threshold"}}]}
-        orderby: !!null
-        limit: 10
-        meter_name: "ram_util"
-        threshold: 10.0
-        type: "threshold"
-        statistic: "avg"
-        alarm_actions: ["http://localhost:8776/alarm"]
-        ok_actions: ["http://localhost:8776/ok"]
-        insufficient_data_actions: ["http://localhost:8776/notok"]
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerQueries.create_and_query_samples:
-    -
-      args:
-        filter: {"=": {"counter_unit": "instance"}}
-        orderby: !!null
-        limit: 10
-        counter_name: "cpu_util"
-        counter_type: "gauge"
-        counter_unit: "instance"
-        counter_volume: 1.0
-        resource_id: "resource_id"
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerAlarms.create_and_update_alarm:
-    -
-      args:
-        meter_name: "ram_util"
-        threshold: 10.0
-        type: "threshold"
-        statistic: "avg"
-        alarm_actions: ["http://localhost:8776/alarm"]
-        ok_actions: ["http://localhost:8776/ok"]
-        insufficient_data_actions: ["http://localhost:8776/notok"]
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerStats.create_meter_and_get_stats:
-    -
-      args:
-        user_id: "user-id"
-        resource_id: "resource-id"
-        counter_volume: 1.0
-        counter_unit: ""
-        counter_type: "cumulative"
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerEvents.create_user_and_get_event:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerEvents.create_user_and_list_events:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerEvents.create_user_and_list_event_types:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerTraits.create_user_and_list_trait_descriptions:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerTraits.create_user_and_list_traits:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerStats.get_stats:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        ceilometer:
-          counter_name: "benchmark_meter"
-          counter_type: "gauge"
-          counter_unit: "%"
-          counter_volume: 100
-          resources_per_tenant: 100
-          samples_per_resource: 100
-          timestamp_interval: 10
-          metadata_list:
-            -
-              status: "active"
-              name: "rally benchmark on"
-              deleted: "false"
-            -
-              status: "terminated"
-              name: "rally benchmark off"
-              deleted: "true"
-        {% endcall %}
-      args:
-        meter_name: "benchmark_meter"
-        filter_by_user_id: true
-        filter_by_project_id: true
-        filter_by_resource_id: true
-        metadata_query:
-          status: "terminated"
-        period: 300
-        groupby: "resource_id"
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerResource.get_tenant_resources:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        ceilometer:
-          counter_name: "cpu_util"
-          counter_type: "gauge"
-          counter_volume: 1.0
-          counter_unit: "instance"
-        {% endcall %}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerAlarms.list_alarms:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerSamples.list_matched_samples:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        ceilometer:
-          counter_name: "cpu_util"
-          counter_type: "gauge"
-          counter_unit: "instance"
-          counter_volume: 1.0
-          resources_per_tenant: 100
-          samples_per_resource: 100
-          timestamp_interval: 60
-          metadata_list:
-            -  status: "active"
-               name: "fake_resource"
-               deleted: "False"
-               created_at: "2015-09-04T12:34:19.000000"
-            -  status: "not_active"
-               name: "fake_resource_1"
-               deleted: "False"
-               created_at: "2015-09-10T06:55:12.000000"
-        {% endcall %}
-      args:
-        limit: 50
-        filter_by_user_id: true
-        filter_by_project_id: true
-        filter_by_resource_id: true
-        metadata_query:
-          status: "not_active"
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerMeters.list_matched_meters:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        ceilometer:
-          counter_name: "benchmark_meter"
-          counter_type: "gauge"
-          counter_unit: "%"
-          counter_volume: 100
-          resources_per_tenant: 100
-          samples_per_resource: 100
-          timestamp_interval: 10
-          metadata_list:
-            -
-              status: "active"
-              name: "rally benchmark on"
-              deleted: "false"
-            -
-              status: "terminated"
-              name: "rally benchmark off"
-              deleted: "true"
-        {% endcall %}
-      args:
-        limit: 50
-        filter_by_user_id: true
-        filter_by_project_id: true
-        filter_by_resource_id: true
-        metadata_query:
-          status: "terminated"
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerResource.list_matched_resources:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        ceilometer:
-          counter_name: "benchmark_meter"
-          counter_type: "gauge"
-          counter_unit: "%"
-          counter_volume: 100
-          resources_per_tenant: 100
-          samples_per_resource: 100
-          timestamp_interval: 10
-          metadata_list:
-            -
-              status: "active"
-              name: "rally benchmark on"
-              deleted: "false"
-            -
-              status: "terminated"
-              name: "rally benchmark off"
-              deleted: "true"
-        {% endcall %}
-      args:
-        limit: 50
-        filter_by_user_id: true
-        filter_by_project_id: true
-        metadata_query:
-          status: "terminated"
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerSamples.list_samples:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        ceilometer:
-          counter_name: "cpu_util"
-          counter_type: "gauge"
-          counter_unit: "instance"
-          counter_volume: 1.0
-          resources_per_tenant: 100
-          samples_per_resource: 100
-          timestamp_interval: 60
-          metadata_list:
-            -  status: "active"
-               name: "fake_resource"
-               deleted: "False"
-               created_at: "2015-09-04T12:34:19.000000"
-            -  status: "not_active"
-               name: "fake_resource_1"
-               deleted: "False"
-               created_at: "2015-09-10T06:55:12.000000"
-          batch_size: 5
-        {% endcall %}
-      args:
-        limit: 50
-        metadata_query:
-          status: "not_active"
-      sla:
-        {{ no_failures_sla() }}
-
diff --git a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml
deleted file mode 100644
index f36d0b2d..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml
+++ /dev/null
@@ -1,345 +0,0 @@
-  CinderVolumes.create_and_attach_volume:
-    -
-      args:
-        {{ vm_params(image_name,flavor_name,1) }}
-        nics:
-          - net-id: {{ netid }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumes.create_and_list_snapshots:
-    -
-      args:
-        detailed: true
-        force: false
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        {{ volumes() }}
-        {% 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) }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-    -
-      args:
-        detailed: true
-        size: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        {% endcall %}
-      runner:
-        {{ 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) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumes.create_nested_snapshots_and_attach_volume:
-    -
-      args:
-        {{ vm_params(image_name,flavor_name) }}
-        nested_level: 1
-        size:
-          max: 1
-          min: 1
-        create_vm_params:
-            nics:
-              - net-id: {{ netid }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumes.create_snapshot_and_attach_volume:
-    -
-      args:
-        {{ vm_params(image_name,flavor_name) }}
-        size:
-          min: 1
-          max: 5
-        create_vm_params:
-            nics:
-              - net-id: {{ netid }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumes.create_volume:
-    -
-      args:
-        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() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumes.list_volumes:
-    -
-      args:
-        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_and_delete_snapshot:
-    -
-      args:
-        force: false
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        {{ volumes() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumes.create_and_delete_volume:
-    -
-      args:
-        size:
-          max: 1
-          min: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-    -
-      args:
-        {{ vm_params(image_name,none,1) }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-    -
-      args:
-        size: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumes.create_and_extend_volume:
-    -
-      args:
-        new_size: 2
-        size: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumes.create_from_volume_and_delete_volume:
-    -
-      args:
-        size: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        {{ volumes() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderQos.create_and_get_qos:
-    -
-      args:
-        consumer: "both"
-        write_iops_sec: "10"
-        read_iops_sec: "1000"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderQos.create_and_list_qos:
-    -
-      args:
-        consumer: "both"
-        write_iops_sec: "10"
-        read_iops_sec: "1000"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderQos.create_and_set_qos:
-    -
-      args:
-        consumer: "back-end"
-        write_iops_sec: "10"
-        read_iops_sec: "1000"
-        set_consumer: "both"
-        set_write_iops_sec: "11"
-        set_read_iops_sec: "1001"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumeTypes.create_and_get_volume_type:
-    -
-      args:
-        description: "rally tests creating types"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumeTypes.create_and_list_volume_types:
-    -
-      args:
-        description: "rally tests creating types"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumeTypes.create_and_update_volume_type:
-    -
-      args:
-        description: "test"
-        update_description: "test update"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumeTypes.create_volume_type_and_encryption_type:
-    -
-      args:
-        description: "rally tests creating types"
-        provider: "LuksEncryptor"
-        cipher: "aes-xts-plain64"
-        key_size: 512
-        control_location: "front-end"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumeTypes.create_volume_type_add_and_list_type_access:
-    -
-      args:
-        description: "rally tests creating types"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
diff --git a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-glance.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-glance.yaml
deleted file mode 100644
index dfc1fc15..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-glance.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-  GlanceImages.create_and_delete_image:
-    -
-      args:
-        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  GlanceImages.create_and_list_image:
-    -
-      args:
-        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  GlanceImages.list_images:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  GlanceImages.create_image_and_boot_instances:
-    -
-      args:
-        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
-        flavor:
-            name: {{ flavor_name }}
-        number_instances: 2
-        nics:
-          - net-id: {{ netid }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-        quotas:
-          {{ unlimited_nova() }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  GlanceImages.create_and_deactivate_image:
-    -
-      args:
-        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  GlanceImages.create_and_download_image:
-    -
-      args:
-        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  GlanceImages.create_and_get_image:
-    -
-      args:
-        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  GlanceImages.create_and_update_image:
-    -
-      args:
-        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
diff --git a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-heat.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-heat.yaml
deleted file mode 100644
index 3adf8f7f..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-heat.yaml
+++ /dev/null
@@ -1,166 +0,0 @@
-  HeatStacks.create_and_delete_stack:
-    -
-      args:
-        template_path: "{{ tmpl_dir }}/default.yaml.template"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-        roles:
-          - "heat_stack_owner"
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-    -
-      args:
-        template_path: "{{ tmpl_dir }}/server_with_ports.yaml.template"
-        parameters:
-          public_net: {{ floating_network }}
-          image: {{ image_name }}
-          flavor: {{ flavor_name }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-        roles:
-          - "heat_stack_owner"
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-    -
-      args:
-        template_path: "{{ tmpl_dir }}/server_with_volume.yaml.template"
-        parameters:
-          image: {{ image_name }}
-          flavor: {{ flavor_name }}
-          network_id: {{ netid }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-        roles:
-          - "heat_stack_owner"
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  HeatStacks.create_and_list_stack:
-    -
-      args:
-        template_path: "{{ tmpl_dir }}/default.yaml.template"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-        roles:
-          - "heat_stack_owner"
-      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"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-        roles:
-          - "heat_stack_owner"
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-    -
-      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) }}
-        roles:
-          - "heat_stack_owner"
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-    -
-      args:
-        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) }}
-        roles:
-          - "heat_stack_owner"
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-    -
-      args:
-        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) }}
-        roles:
-          - "heat_stack_owner"
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-    -
-      args:
-        template_path: "{{ tmpl_dir }}/resource_group.yaml.template"
-        updated_template_path: "{{ tmpl_dir }}/updated_resource_group_reduce.yaml.template"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-        roles:
-          - "heat_stack_owner"
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ 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) }}
-        roles:
-          - "heat_stack_owner"
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  HeatStacks.create_check_delete_stack:
-    -
-      args:
-        template_path: "{{ tmpl_dir }}/random_strings.yaml.template"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-        roles:
-          - "heat_stack_owner"
-      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"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-        roles:
-          - "heat_stack_owner"
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  HeatStacks.list_stacks_and_resources:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-        roles:
-          - "heat_stack_owner"
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
diff --git a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-neutron.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-neutron.yaml
deleted file mode 100644
index 2951e953..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-neutron.yaml
+++ /dev/null
@@ -1,362 +0,0 @@
-  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:
-          neutron:
-            network: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  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) %}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            port: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  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
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            subnet: -1
-            port: -1
-            router: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.create_and_update_subnets:
-    -
-      args:
-        network_create_args: {}
-        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) %}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            subnet: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.create_and_delete_networks:
-    -
-      args:
-        network_create_args: {}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          neutron:
-            network: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.create_and_delete_ports:
-    -
-      args:
-        network_create_args: {}
-        port_create_args: {}
-        ports_per_network: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            port: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.create_and_delete_routers:
-    -
-      args:
-        network_create_args: {}
-        router_create_args: {}
-        subnet_cidr_start: "1.1.0.0/30"
-        subnet_create_args: {}
-        subnets_per_network: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            subnet: -1
-            port: -1
-            router: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.create_and_delete_subnets:
-    -
-      args:
-        network_create_args: {}
-        subnet_cidr_start: "1.1.0.0/30"
-        subnet_create_args: {}
-        subnets_per_network: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            subnet: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.create_and_list_networks:
-    -
-      args:
-        network_create_args: {}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          neutron:
-            network: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.create_and_list_ports:
-    -
-      args:
-        network_create_args: {}
-        port_create_args: {}
-        ports_per_network: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            port: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.create_and_list_routers:
-    -
-      args:
-        network_create_args: {}
-        router_create_args: {}
-        subnet_cidr_start: "1.1.0.0/30"
-        subnet_create_args: {}
-        subnets_per_network: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            subnet: -1
-            router: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.create_and_list_subnets:
-    -
-      args:
-        network_create_args: {}
-        subnet_cidr_start: "1.1.0.0/30"
-        subnet_create_args: {}
-        subnets_per_network: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            subnet: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronSecurityGroup.create_and_delete_security_groups:
-    -
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          neutron:
-            security_group: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronSecurityGroup.create_and_delete_security_group_rule:
-    -
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          neutron:
-            security_group: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronSecurityGroup.create_and_list_security_group_rules:
-    -
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          neutron:
-            security_group: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronSecurityGroup.create_and_show_security_group:
-    -
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          neutron:
-            security_group: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.set_and_clear_router_gateway:
-    -
-      args:
-        network_create_args:
-          router:external: True
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          neutron:
-            network: -1
-            router: -1
-        roles:
-          - "admin"
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.create_and_show_ports:
-    -
-      args:
-        ports_per_network: 2
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            router: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.create_and_show_routers:
-    -
-      args:
-        subnets_per_network: 2
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            subnet: -1
-            router: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.create_and_show_subnets:
-    -
-      args:
-        subnets_per_network: 2
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            subnet: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
diff --git a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml
deleted file mode 100644
index 512448fd..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml
+++ /dev/null
@@ -1,416 +0,0 @@
-  NovaKeypair.create_and_delete_keypair:
-    -
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_nova(keypairs=true) }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NovaKeypair.create_and_list_keypairs:
-    -
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_nova(keypairs=true) }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NovaServers.boot_and_bounce_server:
-    -
-      args:
-        actions:
-          -
-            hard_reboot: 1
-          -
-            soft_reboot: 1
-          -
-            stop_start: 1
-          -
-            rescue_unrescue: 1
-        {{ vm_params(image_name, flavor_name) }}
-        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.boot_and_delete_server:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        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.boot_and_list_server:
-    -
-      args:
-        detailed: true
-        {{ vm_params(image_name, flavor_name) }}
-        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.boot_and_rebuild_server:
-    -
-      args:
-        {{ vm_params(flavor=flavor_name) }}
-        from_image:
-          name: {{ image_name }}
-        to_image:
-          name: {{ image_name }}
-        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:
-        {{ vm_params(image_name, flavor_name) }}
-        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.boot_server_from_volume:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        volume_size: 10
-        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:
-    -
-      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.list_servers:
-    -
-      args:
-        detailed: True
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        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() }}
-
-  NovaServers.resize_server:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        to_flavor:
-          name: {{ flavor_alt_name }}
-        confirm: true
-        force_delete: false
-        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_and_live_migrate_server:
-    - args:
-        {{ vm_params(image_name, flavor_name) }}
-        block_migration: false
-        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_attach_created_volume_and_live_migrate:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        size: 10
-        block_migration: false
-        boot_server_kwargs:
-            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_and_live_migrate:
-    - args:
-        {{ vm_params(image_name, flavor_name) }}
-        block_migration: false
-        volume_size: 10
-        force_delete: false
-        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() }}
-
-  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() }}
-
-  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_and_list_interfaces:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        auto_assign_nic: true
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NovaServers.boot_and_get_console_url:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        console_type: "novnc"
-        auto_assign_nic: true
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NovaServers.boot_server_and_attach_interface:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        network_create_args: {}
-        subnet_create_args: {}
-        boot_server_args:
-          auto_assign_nic: true
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NovaServers.boot_server_attach_volume_and_list_attachments:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        volume_size: 1
-        volume_num: 1
-        create_volume_kwargs: {}
-        boot_server_kwargs:
-          auto_assign_nic: true
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NovaServerGroups.create_and_delete_server_group:
-    -
-      args:
-        policies: ["affinity"]
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NovaServerGroups.create_and_get_server_group:
-    -
-      args:
-        policies: ["affinity"]
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NovaServerGroups.create_and_list_server_groups:
-    -
-      args:
-        policies: ["affinity"]
-        all_projects: false
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
diff --git a/functest/opnfv_tests/openstack/rally/scenario/opnfv-authenticate.yaml b/functest/opnfv_tests/openstack/rally/scenario/opnfv-authenticate.yaml
deleted file mode 100644
index a04e4c1c..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/opnfv-authenticate.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-  Authenticate.keystone:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  Authenticate.validate_cinder:
-    -
-      args:
-        repetitions: 2
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  Authenticate.validate_glance:
-    -
-      args:
-        repetitions: 2
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  Authenticate.validate_heat:
-    -
-      args:
-        repetitions: 2
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  Authenticate.validate_neutron:
-    -
-      args:
-        repetitions: 2
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  Authenticate.validate_nova:
-    -
-      args:
-        repetitions: 2
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
diff --git a/functest/opnfv_tests/openstack/rally/scenario/opnfv-keystone.yaml b/functest/opnfv_tests/openstack/rally/scenario/opnfv-keystone.yaml
deleted file mode 100644
index bfc9948b..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/opnfv-keystone.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-  KeystoneBasic.add_and_remove_user_role:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.create_add_and_list_user_roles:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.create_and_list_tenants:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.create_and_delete_role:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.create_and_delete_service:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.get_entities:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.create_update_and_delete_tenant:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.create_user:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.create_tenant:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.create_and_list_users:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.create_tenant_with_users:
-    -
-      args:
-        users_per_tenant: 10
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
diff --git a/functest/opnfv_tests/openstack/rally/scenario/opnfv-quotas.yaml b/functest/opnfv_tests/openstack/rally/scenario/opnfv-quotas.yaml
deleted file mode 100644
index a0682acc..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/opnfv-quotas.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-  Quotas.cinder_update_and_delete:
-    -
-      args:
-        max_quota: 1024
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  Quotas.cinder_update:
-    -
-      args:
-        max_quota: 1024
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  Quotas.neutron_update:
-    -
-      args:
-        max_quota: 1024
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  Quotas.nova_update_and_delete:
-    -
-      args:
-        max_quota: 1024
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  Quotas.nova_update:
-    -
-      args:
-        max_quota: 1024
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
diff --git a/functest/opnfv_tests/openstack/rally/scenario/opnfv-vm.yaml b/functest/opnfv_tests/openstack/rally/scenario/opnfv-vm.yaml
deleted file mode 100644
index 74f50992..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/opnfv-vm.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-  VMTasks.boot_runcommand_delete:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        floating_network: {{ floating_network }}
-        force_delete: false
-        command:
-          interpreter: /bin/sh
-          script_file: {{ sup_dir }}/instance_dd_test.sh
-        username: cirros
-        nics:
-          - net-id: {{ netid }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        fixed_network: private
-        floating_network: {{ floating_network }}
-        force_delete: false
-        command:
-          interpreter: /bin/sh
-          script_file: {{ sup_dir }}/instance_dd_test.sh
-        use_floatingip: true
-        username: cirros
-        nics:
-          - net-id: {{ netid }}
-        volume_args:
-          size: 2
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
diff --git a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-ceilometer.yaml b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-ceilometer.yaml
deleted file mode 100644
index bb070cd3..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-ceilometer.yaml
+++ /dev/null
@@ -1,247 +0,0 @@
-  CeilometerAlarms.create_alarm_and_get_history:
-    -
-      args:
-        meter_name: "ram_util"
-        threshold: 10.0
-        type: "threshold"
-        state: "ok"
-        statistic: "avg"
-        alarm_actions: ["http://localhost:8776/alarm"]
-        ok_actions: ["http://localhost:8776/ok"]
-        insufficient_data_actions: ["http://localhost:8776/notok"]
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerAlarms.create_and_delete_alarm:
-    -
-      args:
-        meter_name: "ram_util"
-        threshold: 10.0
-        type: "threshold"
-        statistic: "avg"
-        alarm_actions: ["http://localhost:8776/alarm"]
-        ok_actions: ["http://localhost:8776/ok"]
-        insufficient_data_actions: ["http://localhost:8776/notok"]
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerAlarms.create_and_get_alarm:
-    -
-      args:
-        meter_name: "ram_util"
-        threshold: 10.0
-        type: "threshold"
-        statistic: "avg"
-        alarm_actions: ["http://localhost:8776/alarm"]
-        ok_actions: ["http://localhost:8776/ok"]
-        insufficient_data_actions: ["http://localhost:8776/notok"]
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerAlarms.create_and_list_alarm:
-    -
-      args:
-        meter_name: "ram_util"
-        threshold: 10.0
-        type: "threshold"
-        statistic: "avg"
-        alarm_actions: ["http://localhost:8776/alarm"]
-        ok_actions: ["http://localhost:8776/ok"]
-        insufficient_data_actions: ["http://localhost:8776/notok"]
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerQueries.create_and_query_alarm_history:
-    -
-      args:
-        orderby: !!null
-        limit: !!null
-        meter_name: "ram_util"
-        threshold: 10.0
-        type: "threshold"
-        statistic: "avg"
-        alarm_actions: ["http://localhost:8776/alarm"]
-        ok_actions: ["http://localhost:8776/ok"]
-        insufficient_data_actions: ["http://localhost:8776/notok"]
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerQueries.create_and_query_alarms:
-    -
-      args:
-        filter: {"and": [{"!=": {"state": "dummy_state"}},{"=": {"type": "threshold"}}]}
-        orderby: !!null
-        limit: 10
-        meter_name: "ram_util"
-        threshold: 10.0
-        type: "threshold"
-        statistic: "avg"
-        alarm_actions: ["http://localhost:8776/alarm"]
-        ok_actions: ["http://localhost:8776/ok"]
-        insufficient_data_actions: ["http://localhost:8776/notok"]
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerQueries.create_and_query_samples:
-    -
-      args:
-        filter: {"=": {"counter_unit": "instance"}}
-        orderby: !!null
-        limit: 10
-        counter_name: "cpu_util"
-        counter_type: "gauge"
-        counter_unit: "instance"
-        counter_volume: 1.0
-        resource_id: "resource_id"
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerAlarms.create_and_update_alarm:
-    -
-      args:
-        meter_name: "ram_util"
-        threshold: 10.0
-        type: "threshold"
-        statistic: "avg"
-        alarm_actions: ["http://localhost:8776/alarm"]
-        ok_actions: ["http://localhost:8776/ok"]
-        insufficient_data_actions: ["http://localhost:8776/notok"]
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerEvents.create_user_and_get_event:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerEvents.create_user_and_list_events:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerEvents.create_user_and_list_event_types:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerTraits.create_user_and_list_trait_descriptions:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerTraits.create_user_and_list_traits:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerStats.get_stats:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        ceilometer:
-          counter_name: "benchmark_meter"
-          counter_type: "gauge"
-          counter_unit: "%"
-          counter_volume: 100
-          resources_per_tenant: 100
-          samples_per_resource: 100
-          timestamp_interval: 10
-          metadata_list:
-            -
-              status: "active"
-              name: "rally benchmark on"
-              deleted: "false"
-            -
-              status: "terminated"
-              name: "rally benchmark off"
-              deleted: "true"
-        {% endcall %}
-      args:
-        meter_name: "benchmark_meter"
-        filter_by_user_id: true
-        filter_by_project_id: true
-        filter_by_resource_id: true
-        metadata_query:
-          status: "terminated"
-        period: 300
-        groupby: "resource_id"
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerResource.get_tenant_resources:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        ceilometer:
-          counter_name: "cpu_util"
-          counter_type: "gauge"
-          counter_volume: 1.0
-          counter_unit: "instance"
-        {% endcall %}
-      sla:
-        {{ no_failures_sla() }}
-
-  CeilometerAlarms.list_alarms:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      sla:
-        {{ no_failures_sla() }}
diff --git a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-cinder.yaml b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-cinder.yaml
deleted file mode 100644
index 83235807..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-cinder.yaml
+++ /dev/null
@@ -1,139 +0,0 @@
-  CinderVolumes.create_and_delete_snapshot:
-    -
-      args:
-        force: false
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        {{ volumes() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumes.create_and_delete_volume:
-    -
-      args:
-        size:
-          max: 1
-          min: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-    -
-      args:
-        {{ vm_params(image_name,none,1) }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-    -
-      args:
-        size: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumes.create_and_extend_volume:
-    -
-      args:
-        new_size: 2
-        size: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumes.create_from_volume_and_delete_volume:
-    -
-      args:
-        size: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        {{ volumes() }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderQos.create_and_list_qos:
-    -
-      args:
-        consumer: "both"
-        write_iops_sec: "10"
-        read_iops_sec: "1000"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderQos.create_and_set_qos:
-    -
-      args:
-        consumer: "back-end"
-        write_iops_sec: "10"
-        read_iops_sec: "1000"
-        set_consumer: "both"
-        set_write_iops_sec: "11"
-        set_read_iops_sec: "1001"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumeTypes.create_and_list_volume_types:
-    -
-      args:
-        description: "rally tests creating types"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumeTypes.create_volume_type_and_encryption_type:
-    -
-      args:
-        description: "rally tests creating types"
-        provider: "LuksEncryptor"
-        cipher: "aes-xts-plain64"
-        key_size: 512
-        control_location: "front-end"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
diff --git a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-glance.yaml b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-glance.yaml
deleted file mode 100644
index 1b61762f..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-glance.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-  GlanceImages.create_and_delete_image:
-    -
-      args:
-        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  GlanceImages.create_and_list_image:
-    -
-      args:
-        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  GlanceImages.list_images:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  GlanceImages.create_image_and_boot_instances:
-    -
-      args:
-        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
-        flavor:
-            name: {{ flavor_name }}
-        number_instances: 2
-        nics:
-          - net-id: {{ netid }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-        quotas:
-          {{ unlimited_nova() }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
diff --git a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-heat.yaml b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-heat.yaml
deleted file mode 100644
index 5df49aaa..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-heat.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-  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:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-        roles:
-          - "heat_stack_owner"
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  HeatStacks.create_check_delete_stack:
-    -
-      args:
-        template_path: "{{ tmpl_dir }}/random_strings.yaml.template"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-        roles:
-          - "heat_stack_owner"
-      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"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-        roles:
-          - "heat_stack_owner"
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  HeatStacks.list_stacks_and_resources:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-        roles:
-          - "heat_stack_owner"
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
diff --git a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-neutron.yaml b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-neutron.yaml
deleted file mode 100644
index da99a48b..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-neutron.yaml
+++ /dev/null
@@ -1,197 +0,0 @@
-  NeutronNetworks.create_and_delete_networks:
-    -
-      args:
-        network_create_args: {}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          neutron:
-            network: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.create_and_delete_ports:
-    -
-      args:
-        network_create_args: {}
-        port_create_args: {}
-        ports_per_network: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            port: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.create_and_delete_routers:
-    -
-      args:
-        network_create_args: {}
-        router_create_args: {}
-        subnet_cidr_start: "1.1.0.0/30"
-        subnet_create_args: {}
-        subnets_per_network: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            subnet: -1
-            port: -1
-            router: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.create_and_delete_subnets:
-    -
-      args:
-        network_create_args: {}
-        subnet_cidr_start: "1.1.0.0/30"
-        subnet_create_args: {}
-        subnets_per_network: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            subnet: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.create_and_list_networks:
-    -
-      args:
-        network_create_args: {}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          neutron:
-            network: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.create_and_list_ports:
-    -
-      args:
-        network_create_args: {}
-        port_create_args: {}
-        ports_per_network: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            port: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.create_and_list_routers:
-    -
-      args:
-        network_create_args: {}
-        router_create_args: {}
-        subnet_cidr_start: "1.1.0.0/30"
-        subnet_create_args: {}
-        subnets_per_network: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            subnet: -1
-            router: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.create_and_list_subnets:
-    -
-      args:
-        network_create_args: {}
-        subnet_cidr_start: "1.1.0.0/30"
-        subnet_create_args: {}
-        subnets_per_network: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            subnet: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronSecurityGroup.create_and_delete_security_groups:
-    -
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          neutron:
-            security_group: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronSecurityGroup.create_and_delete_security_group_rule:
-    -
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          neutron:
-            security_group: -1
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NeutronNetworks.set_and_clear_router_gateway:
-    -
-      args:
-        network_create_args:
-          router:external: True
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          neutron:
-            network: -1
-            router: -1
-        roles:
-          - "admin"
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
diff --git a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml
deleted file mode 100644
index 801938c4..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml
+++ /dev/null
@@ -1,144 +0,0 @@
-  NovaServers.boot_and_live_migrate_server:
-    - args:
-        {{ vm_params(image_name, flavor_name) }}
-        block_migration: false
-        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_attach_created_volume_and_live_migrate:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        size: 10
-        block_migration: false
-        boot_server_kwargs:
-            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_and_live_migrate:
-    - args:
-        {{ vm_params(image_name, flavor_name) }}
-        block_migration: false
-        volume_size: 10
-        force_delete: false
-        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() }}
-
-  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() }}
-
-  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_and_list_interfaces:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        auto_assign_nic: true
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NovaServerGroups.create_and_delete_server_group:
-    -
-      args:
-        policies: ["affinity"]
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
diff --git a/functest/opnfv_tests/openstack/rally/scenario/support/instance_dd_test.sh b/functest/opnfv_tests/openstack/rally/scenario/support/instance_dd_test.sh
deleted file mode 100644
index e3bf2340..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/support/instance_dd_test.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-time_seconds(){ (time -p $1 ) 2>&1 |awk '/real/{print $2}'; }
-file=/tmp/test.img
-c=${1:-$SIZE}
-c=${c:-1000} #default is 1GB
-write_seq=$(time_seconds "dd if=/dev/zero of=$file bs=1M count=$c")
-read_seq=$(time_seconds "dd if=$file of=/dev/null bs=1M count=$c")
-[ -f $file ] && rm $file
-
-echo "{
-    \"write_seq_${c}m\": $write_seq,
-    \"read_seq_${c}m\": $read_seq
-    }"
diff --git a/functest/opnfv_tests/openstack/rally/scenario/templates/autoscaling_policy.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/autoscaling_policy.yaml.template
deleted file mode 100644
index a22487e3..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/templates/autoscaling_policy.yaml.template
+++ /dev/null
@@ -1,17 +0,0 @@
-heat_template_version: 2013-05-23
-
-resources:
-  test_group:
-    type: OS::Heat::AutoScalingGroup
-    properties:
-      desired_capacity: 0
-      max_size: 0
-      min_size: 0
-      resource:
-        type: OS::Heat::RandomString
-  test_policy:
-    type: OS::Heat::ScalingPolicy
-    properties:
-      adjustment_type: change_in_capacity
-      auto_scaling_group_id: { get_resource: test_group }
-      scaling_adjustment: 1
\ No newline at end of file
diff --git a/functest/opnfv_tests/openstack/rally/scenario/templates/default.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/default.yaml.template
deleted file mode 100644
index eb4f2f2d..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/templates/default.yaml.template
+++ /dev/null
@@ -1 +0,0 @@
-heat_template_version: 2014-10-16
\ No newline at end of file
diff --git a/functest/opnfv_tests/openstack/rally/scenario/templates/random_strings.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/random_strings.yaml.template
deleted file mode 100644
index 2dd676c1..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/templates/random_strings.yaml.template
+++ /dev/null
@@ -1,13 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: Test template for rally create-update-delete scenario
-
-resources:
-  test_string_one:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
-  test_string_two:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
\ No newline at end of file
diff --git a/functest/opnfv_tests/openstack/rally/scenario/templates/resource_group.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/resource_group.yaml.template
deleted file mode 100644
index b3f505fa..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/templates/resource_group.yaml.template
+++ /dev/null
@@ -1,13 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: Test template for rally create-update-delete scenario
-
-resources:
-  test_group:
-    type: OS::Heat::ResourceGroup
-    properties:
-      count: 2
-      resource_def:
-        type: OS::Heat::RandomString
-        properties:
-          length: 20
\ No newline at end of file
diff --git a/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_ports.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_ports.yaml.template
deleted file mode 100644
index 35b10783..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_ports.yaml.template
+++ /dev/null
@@ -1,64 +0,0 @@
-heat_template_version: 2013-05-23
-
-parameters:
-  # set all correct defaults for parameters before launch test
-  public_net:
-    type: string
-    default: public
-  image:
-    type: string
-    default: cirros-0.4.0-x86_64-uec
-  flavor:
-    type: string
-    default: m1.tiny
-  cidr:
-    type: string
-    default: 11.11.11.0/24
-
-resources:
-  server:
-    type: OS::Nova::Server
-    properties:
-      image: {get_param: image}
-      flavor: {get_param: flavor}
-      networks:
-        - port: { get_resource: server_port }
-
-  router:
-    type: OS::Neutron::Router
-    properties:
-      external_gateway_info:
-        network: {get_param: public_net}
-
-  router_interface:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router_id: { get_resource: router }
-      subnet_id: { get_resource: private_subnet }
-
-  private_net:
-    type: OS::Neutron::Net
-
-  private_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      network: { get_resource: private_net }
-      cidr: {get_param: cidr}
-
-  port_security_group:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name: default_port_security_group
-      description: >
-        Default security group assigned to port. The neutron default group is not
-        used because neutron creates several groups with the same name=default and
-        nova cannot chooses which one should it use.
-
-  server_port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_resource: private_net}
-      fixed_ips:
-        - subnet: { get_resource: private_subnet }
-      security_groups:
-        - { get_resource: port_security_group }
diff --git a/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template
deleted file mode 100644
index 5c9a86b7..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/templates/server_with_volume.yaml.template
+++ /dev/null
@@ -1,43 +0,0 @@
-heat_template_version: 2013-05-23
-
-parameters:
-  # set all correct defaults for parameters before launch test
-  image:
-    type: string
-    default: cirros-0.4.0-x86_64-uec
-  flavor:
-    type: string
-    default: m1.tiny
-  availability_zone:
-    type: string
-    description: The Availability Zone to launch the instance.
-    default: nova
-  volume_size:
-    type: number
-    description: Size of the volume to be created.
-    default: 1
-    constraints:
-      - range: { min: 1, max: 1024 }
-        description: must be between 1 and 1024 Gb.
-  network_id:
-    type: string
-
-resources:
-  server:
-    type: OS::Nova::Server
-    properties:
-      image: {get_param: image}
-      flavor: {get_param: flavor}
-      networks:
-        - network: { get_param: network_id }
-  cinder_volume:
-    type: OS::Cinder::Volume
-    properties:
-      size: { get_param: volume_size }
-      availability_zone: { get_param: availability_zone }
-  volume_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_resource: cinder_volume }
-      instance_uuid: { get_resource: server}
-      mountpoint: /dev/vdc
diff --git a/functest/opnfv_tests/openstack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template
deleted file mode 100644
index cf34879c..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template
+++ /dev/null
@@ -1,23 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  Test template for create-update-delete-stack scenario in rally.
-  The template updates resource parameters without resource re-creation(replacement)
-  in the stack defined by autoscaling_policy.yaml.template. It allows to measure
-  performance of "pure" resource update operation only.
-
-resources:
-  test_group:
-    type: OS::Heat::AutoScalingGroup
-    properties:
-      desired_capacity: 0
-      max_size: 0
-      min_size: 0
-      resource:
-        type: OS::Heat::RandomString
-  test_policy:
-    type: OS::Heat::ScalingPolicy
-    properties:
-      adjustment_type: change_in_capacity
-      auto_scaling_group_id: { get_resource: test_group }
-      scaling_adjustment: -1
\ No newline at end of file
diff --git a/functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_add.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_add.yaml.template
deleted file mode 100644
index e06d42e0..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_add.yaml.template
+++ /dev/null
@@ -1,19 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: >
-  Test template for create-update-delete-stack scenario in rally.
-  The template updates the stack defined by random_strings.yaml.template with additional resource.
-
-resources:
-  test_string_one:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
-  test_string_two:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
-  test_string_three:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
\ No newline at end of file
diff --git a/functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_delete.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_delete.yaml.template
deleted file mode 100644
index d02593e3..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_delete.yaml.template
+++ /dev/null
@@ -1,11 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: >
-  Test template for create-update-delete-stack scenario in rally.
-  The template deletes one resource from the stack defined by random_strings.yaml.template.
-
-resources:
-  test_string_one:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
\ No newline at end of file
diff --git a/functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_replace.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_replace.yaml.template
deleted file mode 100644
index 46d8bff4..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/templates/updated_random_strings_replace.yaml.template
+++ /dev/null
@@ -1,19 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: >
-  Test template for create-update-delete-stack scenario in rally.
-  The template deletes one resource from the stack defined by
-  random_strings.yaml.template and re-creates it with the updated parameters
-  (so-called update-replace). That happens because some parameters cannot be
-  changed without resource re-creation. The template allows to measure performance
-  of update-replace operation.
-
-resources:
-  test_string_one:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
-  test_string_two:
-    type: OS::Heat::RandomString
-    properties:
-      length: 40
\ No newline at end of file
diff --git a/functest/opnfv_tests/openstack/rally/scenario/templates/updated_resource_group_increase.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/updated_resource_group_increase.yaml.template
deleted file mode 100644
index 891074eb..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/templates/updated_resource_group_increase.yaml.template
+++ /dev/null
@@ -1,16 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: >
-  Test template for create-update-delete-stack scenario in rally.
-  The template updates one resource from the stack defined by resource_group.yaml.template
-  and adds children resources to that resource.
-
-resources:
-  test_group:
-    type: OS::Heat::ResourceGroup
-    properties:
-      count: 3
-      resource_def:
-        type: OS::Heat::RandomString
-        properties:
-          length: 20
\ No newline at end of file
diff --git a/functest/opnfv_tests/openstack/rally/scenario/templates/updated_resource_group_reduce.yaml.template b/functest/opnfv_tests/openstack/rally/scenario/templates/updated_resource_group_reduce.yaml.template
deleted file mode 100644
index b4d1d173..00000000
--- a/functest/opnfv_tests/openstack/rally/scenario/templates/updated_resource_group_reduce.yaml.template
+++ /dev/null
@@ -1,16 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: >
-  Test template for create-update-delete-stack scenario in rally.
-  The template updates one resource from the stack defined by resource_group.yaml.template
-  and deletes children resources from that resource.
-
-resources:
-  test_group:
-    type: OS::Heat::ResourceGroup
-    properties:
-      count: 1
-      resource_def:
-        type: OS::Heat::RandomString
-        properties:
-          length: 20
\ No newline at end of file