Updated tempest plugin names

* https://review.rdoproject.org/r/#/c/11008/ marks the addition of
  python-mistral-tests-tempest by moving tempest plugin to a
  seperate repo. Let's consume it.
* https://review.rdoproject.org/r/#/c/10309/ marks the addition of
  zaqar-tempest-plugin in RDO from Queens release.

Change-Id: Ib42604b4853bcd97561769dce87179844292e173

config/general_config/featureset006.yml

@@ -62,7 +62,7 @@ tempest_whitelist_old:
 
 tempest_whitelist_new:
   # Testing zaqar doesn't work yet, but it's in progress
-  # - 'zaqar.tests.tempest_plugin.tests.v2.test_queues.TestManageQueue'
+  # - 'zaqar_tempest_plugin.tests.v2.test_queues.TestManageQueue'
   # Testing boot from volume and server connectivity
   - 'tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern'
   # Testing swift
@@ -71,7 +71,7 @@ tempest_whitelist_new:
   - 'barbican_tempest_plugin.tests.scenario.test_volume_encryption.VolumeEncryptionTest'
   # - 'telemetry_tempest_plugin.scenario.test_telemetry_integration.TestTelemetryIntegration'
   # TODO(emilien) run ec2api tests when ec2api is supported in python-tempestconf
-  # - 'ec2api.tests.functional.api.test_key_pairs.KeyPairTest'
+  # - 'ec2api_tempest_plugin.api.test_key_pairs.KeyPairTest'
 
 tempest_whitelist: >-
   {% if release not in ['newton', 'ocata', 'pike'] -%}{{ tempest_whitelist_new }}
@@ -88,8 +88,8 @@ tempest_plugins_old:
 tempest_plugins_new:
   - python-telemetry-tests-tempest
   - python-barbican-tests-tempest
-  - python-zaqar-tests
-  - python-ec2-api-tests
+  - python-zaqar-tests-tempest
+  - python-ec2api-tests-tempest
   - python-heat-tests-tempest
 tempest_plugins: >-
   {% if release not in ['newton', 'ocata', 'pike'] -%}{{ tempest_plugins_new }}

config/general_config/featureset007.yml

@@ -50,6 +50,14 @@ tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
   - 'sahara_tempest_plugin.tests.api.test_data_sources.DataSourceTest'
   - 'mistral_tempest_tests.tests.api.v2.test_actions.ActionTestsV2'
-tempest_plugins:
+tempest_plugins_old:
   - python-sahara-tests-tempest
   - python-mistral-tests
+tempest_plugins_new:
+  - python-sahara-tests-tempest
+  - python-mistral-tests-tempest
+
+tempest_plugins: >-
+  {% if release not in ['newton', 'ocata', 'pike'] -%}{{ tempest_plugins_new }}
+  {%- else -%}{{ tempest_plugins_old }}
+  {%- endif -%}

config/general_config/featureset017.yml

@@ -104,8 +104,8 @@ tempest_plugins_old:
 tempest_plugins_new:
   - python-telemetry-tests-tempest
   - python-barbican-tests-tempest
-  - python-zaqar-tests
-  - python-ec2-api-tests
+  - python-zaqar-tests-tempest
+  - python-ec2api-tests-tempest
   - python-heat-tests-tempest
 tempest_plugins: >-
   {% if release not in ['newton', 'ocata', 'pike'] -%}{{ tempest_plugins_new }}

config/general_config/featureset018.yml

@@ -83,6 +83,13 @@ tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
   - 'sahara_tempest_plugin.tests.api.test_data_sources.DataSourceTest'
   - 'mistral_tempest_tests.tests.api.v2.test_actions.ActionTestsV2'
-tempest_plugins:
+tempest_plugins_old:
   - python-sahara-tests-tempest
   - python-mistral-tests
+tempest_plugins_new:
+  - python-sahara-tests-tempest
+  - python-mistral-tests-tempest
+tempest_plugins: >-
+  {% if release not in ['newton', 'ocata', 'pike'] -%}{{ tempest_plugins_new }}
+  {%- else -%}{{ tempest_plugins_old }}
+  {%- endif -%}