From 278fde18e4ae7acf0105d78d398460601a3146b8 Mon Sep 17 00:00:00 2001
From: xudan <xudan16@huawei.com>
Date: Sun, 3 Sep 2017 23:11:40 -0400
Subject: Remove some tempest test cases that are not too common

Change-Id: I2a19b9f3e6c44bedef5d3cb20f480405e4d6d5e2
Signed-off-by: xudan <xudan16@huawei.com>
---
 dovetail/compliance/proposed_tests.yml |  1 -
 dovetail/testcase/tempest.tc004.yml    | 11 -----------
 dovetail/testcase/tempest.tc006.yml    | 16 ----------------
 3 files changed, 28 deletions(-)
 delete mode 100644 dovetail/testcase/tempest.tc006.yml

diff --git a/dovetail/compliance/proposed_tests.yml b/dovetail/compliance/proposed_tests.yml
index e2936b8d..18b8cec9 100644
--- a/dovetail/compliance/proposed_tests.yml
+++ b/dovetail/compliance/proposed_tests.yml
@@ -54,6 +54,5 @@ proposed_tests:
     - dovetail.tempest.tc003
     - dovetail.tempest.tc004
     - dovetail.tempest.tc005
-    - dovetail.tempest.tc006
     # resiliency
     - dovetail.resiliency.tc001
diff --git a/dovetail/testcase/tempest.tc004.yml b/dovetail/testcase/tempest.tc004.yml
index 0f5fdd89..c9e9c8f6 100644
--- a/dovetail/testcase/tempest.tc004.yml
+++ b/dovetail/testcase/tempest.tc004.yml
@@ -25,14 +25,3 @@ dovetail.tempest.tc004:
       - tempest.scenario.test_server_advanced_ops.TestServerAdvancedOps.test_server_sequence_suspend_resume[compute,id-949da7d5-72c8-4808-8802-e3d70df98e2c]
       - tempest.scenario.test_shelve_instance.TestShelveInstance.test_shelve_instance[compute,id-1164e700-0af0-4a4c-8792-35909a88743c,image,network]
       - tempest.scenario.test_shelve_instance.TestShelveInstance.test_shelve_volume_backed_instance[compute,id-c1b6318c-b9da-490b-9c67-9339b627271f,image,network,volume]
-      - tempest.api.compute.admin.test_live_migration.LiveAutoBlockMigrationV225TestJSON.test_iscsi_volume[id-e19c0cc6-6720-4ed8-be83-b6603ed5c812]
-      - tempest.api.compute.admin.test_live_migration.LiveAutoBlockMigrationV225TestJSON.test_live_block_migration[id-1dce86b8-eb04-4c03-a9d8-9c1dc3ee0c7b]
-      - tempest.api.compute.admin.test_live_migration.LiveAutoBlockMigrationV225TestJSON.test_live_block_migration_paused[id-1e107f21-61b2-4988-8f22-b196e938ab88]
-      - tempest.api.compute.admin.test_live_migration.LiveBlockMigrationTestJSON.test_iscsi_volume[id-e19c0cc6-6720-4ed8-be83-b6603ed5c812]
-      - tempest.api.compute.admin.test_live_migration.LiveBlockMigrationTestJSON.test_live_block_migration[id-1dce86b8-eb04-4c03-a9d8-9c1dc3ee0c7b]
-      - tempest.api.compute.admin.test_live_migration.LiveBlockMigrationTestJSON.test_live_block_migration_paused[id-1e107f21-61b2-4988-8f22-b196e938ab88]
-      - tempest.api.compute.admin.test_migrations.MigrationsAdminTest.test_cold_migration[id-4bf0be52-3b6f-4746-9a27-3143636fe30d]
-      - tempest.api.compute.admin.test_migrations.MigrationsAdminTest.test_list_migrations[id-75c0b83d-72a0-4cf8-a153-631e83e7d53f]
-      - tempest.api.compute.admin.test_migrations.MigrationsAdminTest.test_list_migrations_in_flavor_resize_situation[id-1b512062-8093-438e-b47a-37d2f597cd64]
-      - tempest.api.compute.admin.test_migrations.MigrationsAdminTest.test_resize_server_revert_deleted_flavor[id-33f1fec3-ba18-4470-8e4e-1d888e7c3593]
-      - tempest.api.compute.admin.test_migrations.MigrationsAdminTest.test_revert_cold_migration[id-caa1aa8b-f4ef-4374-be0d-95f001c2ac2d]
diff --git a/dovetail/testcase/tempest.tc006.yml b/dovetail/testcase/tempest.tc006.yml
deleted file mode 100644
index f0f57090..00000000
--- a/dovetail/testcase/tempest.tc006.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.tempest.tc006:
-  name: dovetail.tempest.tc006
-  objective: storage security
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/local/lib/python2.7/dist-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/local/lib/python2.7/dist-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_encrypted_cinder_volumes.TestEncryptedCinderVolumes.test_encrypted_cinder_volumes_cryptsetup[compute,id-cbc752ed-b716-4717-910f-956cce965722,image,volume]
-      - tempest.scenario.test_encrypted_cinder_volumes.TestEncryptedCinderVolumes.test_encrypted_cinder_volumes_luks[compute,id-79165fb4-5534-4b9d-8429-97ccffb8f86e,image,volume]
-- 
cgit