From 60b6e49ed40d124668993c04d48443dbcba9e6df Mon Sep 17 00:00:00 2001
From: Ade Lee <alee@redhat.com>
Date: Fri, 8 Dec 2017 16:41:42 -0500
Subject: [PATCH] Change volume encryption test to use barbican_tempest test

The original volume encryption tests create images using
images that are not signed.  These images are not booted when
image signing is enabled, causing the tests to fail.

The new tests are more current, and are maintained by the Barbican
team.

Change-Id: I159ca055db5e5279a70c43998f46773318406922
Depends-On: I2cad0b81eeab07785dfd4bb66e582d359504b0aa
---
 config/general_config/featureset006.yml | 2 +-
 config/general_config/featureset017.yml | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/config/general_config/featureset006.yml b/config/general_config/featureset006.yml
index c0c536863..71197f6ff 100644
--- a/config/general_config/featureset006.yml
+++ b/config/general_config/featureset006.yml
@@ -53,7 +53,7 @@ tempest_whitelist:
   # Testing swift
   - 'tempest.api.object_storage.test_object_services.ObjectTest'
   # Testing cinder volumes encrypted by barbican:
-  - 'tempest.scenario.test_encrypted_cinder_volumes.TestEncryptedCinderVolumes'
+  - 'barbican_tempest_plugin.tests.scenario.test_volume_encryption.VolumeEncryptionTest'
   # TODO(emilien) run autoscaling tests when telemetry works in python-tempestconf
   # - 'ceilometer.tests.tempest.scenario.test_telemetry_integration.TestTelemetryIntegration'
   # TODO(emilien) run ec2api tests when ec2api is supported in python-tempestconf
diff --git a/config/general_config/featureset017.yml b/config/general_config/featureset017.yml
index 0aa46d26c..c7ee02796 100644
--- a/config/general_config/featureset017.yml
+++ b/config/general_config/featureset017.yml
@@ -78,14 +78,17 @@ run_tempest: >-
   {%- endif -%}
 
 test_regex: ''
-
 # TODO(emilien) run ec2api tests when ec2api is supported in python-tempestconf
 # 'ec2api.tests.functional.api.test_key_pairs.KeyPairTest'
 tempest_whitelist: >-
     {% if release not in ['newton', 'ocata', 'pike'] -%}
-    ["tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern", "tempest.api.object_storage.test_object_services.ObjectTest", "tempest.scenario.test_encrypted_cinder_volumes.TestEncryptedCinderVolumes", "ceilometer.tests.tempest.scenario.test_telemetry_integration.TestTelemetryIntegration"]
+    ["tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern",
+     "tempest.api.object_storage.test_object_services.ObjectTest",
+     "barbican_tempest_plugin.tests.scenario.test_volume_encryption.VolumeEncryptionTest",
+     "ceilometer.tests.tempest.scenario.test_telemetry_integration.TestTelemetryIntegration"]
     {%- else -%}
-    ["tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern", "tempest.api.object_storage.test_object_services.ObjectTest"]
+    ["tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern",
+     "tempest.api.object_storage.test_object_services.ObjectTest"]
     {%- endif -%}
 
 tempest_plugins: