Adjust folder structure

Note: this patchset may break existing features, but it will help
to accelerate the refactoring work.

JIRA: QTIP-131

Change-Id: Ie0cd9d185e6b02316878daef905e26f4e533a66b
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>

2 files changed, 0 insertions, 83 deletions

diff --git a/test_plan/dell-us-deploying-bm3/storage/fio_bm.yaml b/test_plan/dell-us-deploying-bm3/storage/fio_bm.yaml
deleted file mode 100644
index 12be8c17..00000000
--- a/test_plan/dell-us-deploying-bm3/storage/fio_bm.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-Scenario:
-  benchmark: fio
-  host: machine_1, machine_2
-  server: blakc
-
-Context:
-  Host_Machines:
-    machine_1:
-      ip: 10.20.0.4
-      pw: r00tme
-      role: host
-    machine_2:
-      ip: 10.20.0.5
-      pw: r00tme
-      role: host
-
-
-  Virtual_Machines:
-
-
-Test_Description:
-  Test_category: "Storage"
-  Benchmark: "FIO"
-  Overview: >
-        '''This test will run the FIO  benchmark in parallel on host machines "machine_1" and "machine_2".\n
-         The fio job specifications can be found in qtip/benchmarks/fio_jobs/test_job.
-         The job conists of an fio load of:
-          1.50% rand read 50% rand write
-          2.Asynch engine
-          3.Direct IO.
-          4.Queing depth of 2
-
-         if you wish to add another  machine add the following information under the Host_Machines tag
-         machine_3:
-         ip: 172.18.0.16
-         pw: Op3nStack
-         role: host
-         '''
-
diff --git a/test_plan/dell-us-deploying-bm3/storage/fio_vm.yaml b/test_plan/dell-us-deploying-bm3/storage/fio_vm.yaml
deleted file mode 100644
index 5ae90d2c..00000000
--- a/test_plan/dell-us-deploying-bm3/storage/fio_vm.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-Scenario:
-  benchmark: fio
-  host: machine_1, machine_2
-  server: blakc
-
-Context:
-  Host_Machines:
-
-  Virtual_Machines:
-    virtualmachine_1:
-      availability_zone: compute1
-      public_network: 'net04_ext'
-      OS_image: QTIP_CentOS
-      flavor: m1.large
-      role: host
-    virtualmachine_2:
-      availability_zone: compute2
-      public_network: 'net04_ext'
-      OS_image: QTIP_CentOS
-      flavor: m1.large
-      role: host
-
-Test_Description:
-  Test_category: "Storage"
-  Benchmark: "FIO"
-  Overview: >
-        '''This test will run the FIO  benchmark in parallel on virtualmachine_1 and virtualmachine_2.\n
-         The fio job specifications can be found in qtip/benchmarks/fio_jobs/test_job.
-         The job conists of an fio load of:
-          1.50% rand read 50% rand write
-          2.Asynch engine
-          3.Direct IO.
-          4.Queing depth of 2
-
-         if you wish to add a virtual machine add the following information under the Virtual_Machine tag
-
-        virtualmachine_3:
-          availability_zone:
-          public_network:
-          OS_image:
-          flavor:
-          role:
-        '''
-