rename test_cases/ to test_plan/

JIRA: QTIP-131

Change-Id: I12c63b4f0ff0167073a0819bdb5d63ca0c6f06fb
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>

diff --git a/docs/userguide/_02-network.rst b/docs/userguide/_02-network.rst
index 13697ab..18f328a 100644 (file)
--- a/docs/userguide/_02-network.rst
+++ b/docs/userguide/_02-network.rst
@@ -25,7 +25,7 @@ One of the compute nodes is used as a server and the other as a client.
 The client pushes traffic to the server for a duration specified by the user in the configuration file for Iperf3.
 
 
-These files can be found in the "test_cases/{POD}/network/" directory.
+These files can be found in the "test_plan/{POD}/network/" directory.
 The bandwidth is limited by the physical link layer speed connecting the two compute nodes.
 The result file includes the b/s bandwidth and the CPU usage for both the client and server.
 

diff --git a/docs/userguide/introduction.rst b/docs/userguide/introduction.rst
index d0d9f3c..6f443fd 100644 (file)
--- a/docs/userguide/introduction.rst
+++ b/docs/userguide/introduction.rst
@@ -18,9 +18,9 @@ QTIP Directory structure
 
 The QTIP directory has been sectioned off into multiple folders to facilitate
  segmenting information into relevant categories. The folders that concern
- the end user are `test_cases/` and `benchmarks/suite/`.
+ the end user are `test_plan/` and `benchmarks/suite/`.
 
-**test_cases/:**
+**test_plan/:**
 
 This folder is used to store all the config files which are used to setup the
 environment prior to a test. This folder is further divided into opnfv pods
@@ -33,9 +33,9 @@ part of a opnfv pod,and for opnfv CI.
 The structure of the directory for the user appears as follows
 ::
 
-  test_cases/default/compute
-  test_cases/default/network
-  test_cases/default/storage
+  test_plan/default/compute
+  test_plan/default/network
+  test_plan/default/storage
 
 The benchmarks that are part of the QTIP framework are listed under these
 folders. An example of the compute folder is shown below.
@@ -315,7 +315,7 @@ Commands to run the Framework:
 ------------------------------
 
 In order to start QTIP on the default lab please use the following commands (asssuming your installer
-is 'fuel' or 'compass', you use the config files in the test_cases/default/ directory and listed the
+is 'fuel' or 'compass', you use the config files in the test_plan/default/ directory and listed the
 intended suite in the benchmarks/suite/<RELEVANT-SUITE-FILE>):
 
 First step is to export the necessary information to the environment and generate QTIP key pair.

diff --git a/func/args_handler.py b/func/args_handler.py
index 624f90c..2eb79e2 100644 (file)
--- a/func/args_handler.py
+++ b/func/args_handler.py
@@ -20,14 +20,14 @@ def get_files_in_suite(suite_name, case_type='all'):
         if case_type == 'all' else benchmark_list[case_type]
 
 
-def get_files_in_test_case(lab, suite_name, case_type='all'):
-    test_case_all = os.listdir('./test_cases/{0}/{1}'.format(lab, suite_name))
+def get_files_in_test_plan(lab, suite_name, case_type='all'):
+    test_case_all = os.listdir('./test_plan/{0}/{1}'.format(lab, suite_name))
     return test_case_all if case_type == 'all' else \
         filter(lambda x: case_type in x, test_case_all)
 
 
 def get_benchmark_path(lab, suit, benchmark):
-    return './test_cases/{0}/{1}/{2}'.format(lab, suit, benchmark)
+    return './test_plan/{0}/{1}/{2}'.format(lab, suit, benchmark)
 
 
 def check_suite(suite_name):
@@ -35,11 +35,11 @@ def check_suite(suite_name):
 
 
 def check_lab_name(lab_name):
-    return True if os.path.isdir('test_cases/' + lab_name) else False
+    return True if os.path.isdir('test_plan/' + lab_name) else False
 
 
 def check_benchmark_name(lab, file, benchmark):
-    return os.path.isfile('test_cases/' + lab + '/' + file + '/' + benchmark)
+    return os.path.isfile('test_plan/' + lab + '/' + file + '/' + benchmark)
 
 
 def _get_f_name(test_case_path):

diff --git a/func/cli.py b/func/cli.py
index c5f5d2b..17f0bde 100644 (file)
--- a/func/cli.py
+++ b/func/cli.py
@@ -23,7 +23,7 @@ class Cli:
         parser = argparse.ArgumentParser()
         parser.add_argument('-l ', '--lab', required=True, help='Name of Lab '
                             'on which being tested, These can'
-                            'be found in the test_cases/ directory. Please '
+                            'be found in the test_plan/ directory. Please '
                             'ensure that you have edited the respective files '
                             'before using them. For testing other than through Jenkins'
                             ' The user should list default after -l . all the fields in'
@@ -49,12 +49,12 @@ class Cli:
             sys.exit(1)
 
         if not args_handler.check_lab_name(args.lab):
-            logger.error("You have specified a lab that is not present under test_cases/.\
+            logger.error("You have specified a lab that is not present under test_plan/.\
                 Please enter correct file. If unsure how to proceed, use -l default.")
             sys.exit(1)
         suite = args.file
         benchmarks = args_handler.get_files_in_suite(suite)
-        test_cases = args_handler.get_files_in_test_case(args.lab, suite)
+        test_cases = args_handler.get_files_in_test_plan(args.lab, suite)
         benchmarks_list = filter(lambda x: x in test_cases, benchmarks)
 
         if args.benchmark:

diff --git a/test_cases/default/compute/dhrystone_bm.yaml b/test_plan/default/compute/dhrystone_bm.yaml
similarity index 100%
rename from test_cases/default/compute/dhrystone_bm.yaml
rename to test_plan/default/compute/dhrystone_bm.yaml

diff --git a/test_cases/default/compute/dhrystone_vm.yaml b/test_plan/default/compute/dhrystone_vm.yaml
similarity index 100%
rename from test_cases/default/compute/dhrystone_vm.yaml
rename to test_plan/default/compute/dhrystone_vm.yaml

diff --git a/test_cases/default/compute/dpi_bm.yaml b/test_plan/default/compute/dpi_bm.yaml
similarity index 100%
rename from test_cases/default/compute/dpi_bm.yaml
rename to test_plan/default/compute/dpi_bm.yaml

diff --git a/test_cases/default/compute/dpi_vm.yaml b/test_plan/default/compute/dpi_vm.yaml
similarity index 100%
rename from test_cases/default/compute/dpi_vm.yaml
rename to test_plan/default/compute/dpi_vm.yaml

diff --git a/test_cases/default/compute/ramspeed_bm.yaml b/test_plan/default/compute/ramspeed_bm.yaml
similarity index 100%
rename from test_cases/default/compute/ramspeed_bm.yaml
rename to test_plan/default/compute/ramspeed_bm.yaml

diff --git a/test_cases/default/compute/ramspeed_vm.yaml b/test_plan/default/compute/ramspeed_vm.yaml
similarity index 100%
rename from test_cases/default/compute/ramspeed_vm.yaml
rename to test_plan/default/compute/ramspeed_vm.yaml

diff --git a/test_cases/default/compute/ssl_bm.yaml b/test_plan/default/compute/ssl_bm.yaml
similarity index 100%
rename from test_cases/default/compute/ssl_bm.yaml
rename to test_plan/default/compute/ssl_bm.yaml

diff --git a/test_cases/default/compute/ssl_vm.yaml b/test_plan/default/compute/ssl_vm.yaml
similarity index 100%
rename from test_cases/default/compute/ssl_vm.yaml
rename to test_plan/default/compute/ssl_vm.yaml

diff --git a/test_cases/default/compute/whetstone_bm.yaml b/test_plan/default/compute/whetstone_bm.yaml
similarity index 100%
rename from test_cases/default/compute/whetstone_bm.yaml
rename to test_plan/default/compute/whetstone_bm.yaml

diff --git a/test_cases/default/compute/whetstone_vm.yaml b/test_plan/default/compute/whetstone_vm.yaml
similarity index 100%
rename from test_cases/default/compute/whetstone_vm.yaml
rename to test_plan/default/compute/whetstone_vm.yaml

diff --git a/test_cases/default/network/iperf_bm.yaml b/test_plan/default/network/iperf_bm.yaml
similarity index 100%
rename from test_cases/default/network/iperf_bm.yaml
rename to test_plan/default/network/iperf_bm.yaml

diff --git a/test_cases/default/network/iperf_vm.yaml b/test_plan/default/network/iperf_vm.yaml
similarity index 100%
rename from test_cases/default/network/iperf_vm.yaml
rename to test_plan/default/network/iperf_vm.yaml

diff --git a/test_cases/default/network/iperf_vm_2.yaml b/test_plan/default/network/iperf_vm_2.yaml
similarity index 100%
rename from test_cases/default/network/iperf_vm_2.yaml
rename to test_plan/default/network/iperf_vm_2.yaml

diff --git a/test_cases/default/storage/fio_bm.yaml b/test_plan/default/storage/fio_bm.yaml
similarity index 100%
rename from test_cases/default/storage/fio_bm.yaml
rename to test_plan/default/storage/fio_bm.yaml

diff --git a/test_cases/default/storage/fio_vm.yaml b/test_plan/default/storage/fio_vm.yaml
similarity index 100%
rename from test_cases/default/storage/fio_vm.yaml
rename to test_plan/default/storage/fio_vm.yaml

diff --git a/test_cases/dell-pod1/compute/dhrystone_bm.yaml b/test_plan/dell-pod1/compute/dhrystone_bm.yaml
similarity index 100%
rename from test_cases/dell-pod1/compute/dhrystone_bm.yaml
rename to test_plan/dell-pod1/compute/dhrystone_bm.yaml

diff --git a/test_cases/dell-pod1/compute/dhrystone_vm.yaml b/test_plan/dell-pod1/compute/dhrystone_vm.yaml
similarity index 100%
rename from test_cases/dell-pod1/compute/dhrystone_vm.yaml
rename to test_plan/dell-pod1/compute/dhrystone_vm.yaml

diff --git a/test_cases/dell-pod1/compute/dpi_bm.yaml b/test_plan/dell-pod1/compute/dpi_bm.yaml
similarity index 100%
rename from test_cases/dell-pod1/compute/dpi_bm.yaml
rename to test_plan/dell-pod1/compute/dpi_bm.yaml

diff --git a/test_cases/dell-pod1/compute/dpi_vm.yaml b/test_plan/dell-pod1/compute/dpi_vm.yaml
similarity index 100%
rename from test_cases/dell-pod1/compute/dpi_vm.yaml
rename to test_plan/dell-pod1/compute/dpi_vm.yaml

diff --git a/test_cases/dell-pod1/compute/ramspeed_bm.yaml b/test_plan/dell-pod1/compute/ramspeed_bm.yaml
similarity index 100%
rename from test_cases/dell-pod1/compute/ramspeed_bm.yaml
rename to test_plan/dell-pod1/compute/ramspeed_bm.yaml

diff --git a/test_cases/dell-pod1/compute/ramspeed_vm.yaml b/test_plan/dell-pod1/compute/ramspeed_vm.yaml
similarity index 100%
rename from test_cases/dell-pod1/compute/ramspeed_vm.yaml
rename to test_plan/dell-pod1/compute/ramspeed_vm.yaml

diff --git a/test_cases/dell-pod1/compute/ssl_bm.yaml b/test_plan/dell-pod1/compute/ssl_bm.yaml
similarity index 100%
rename from test_cases/dell-pod1/compute/ssl_bm.yaml
rename to test_plan/dell-pod1/compute/ssl_bm.yaml

diff --git a/test_cases/dell-pod1/compute/ssl_vm.yaml b/test_plan/dell-pod1/compute/ssl_vm.yaml
similarity index 100%
rename from test_cases/dell-pod1/compute/ssl_vm.yaml
rename to test_plan/dell-pod1/compute/ssl_vm.yaml

diff --git a/test_cases/dell-pod1/compute/whetstone_bm.yaml b/test_plan/dell-pod1/compute/whetstone_bm.yaml
similarity index 100%
rename from test_cases/dell-pod1/compute/whetstone_bm.yaml
rename to test_plan/dell-pod1/compute/whetstone_bm.yaml

diff --git a/test_cases/dell-pod1/compute/whetstone_vm.yaml b/test_plan/dell-pod1/compute/whetstone_vm.yaml
similarity index 100%
rename from test_cases/dell-pod1/compute/whetstone_vm.yaml
rename to test_plan/dell-pod1/compute/whetstone_vm.yaml

diff --git a/test_cases/dell-pod1/network/iperf_bm.yaml b/test_plan/dell-pod1/network/iperf_bm.yaml
similarity index 100%
rename from test_cases/dell-pod1/network/iperf_bm.yaml
rename to test_plan/dell-pod1/network/iperf_bm.yaml

diff --git a/test_cases/dell-pod1/network/iperf_vm.yaml b/test_plan/dell-pod1/network/iperf_vm.yaml
similarity index 100%
rename from test_cases/dell-pod1/network/iperf_vm.yaml
rename to test_plan/dell-pod1/network/iperf_vm.yaml

diff --git a/test_cases/dell-pod1/network/iperf_vm_2.yaml b/test_plan/dell-pod1/network/iperf_vm_2.yaml
similarity index 100%
rename from test_cases/dell-pod1/network/iperf_vm_2.yaml
rename to test_plan/dell-pod1/network/iperf_vm_2.yaml

diff --git a/test_cases/dell-pod1/network/netperf.yaml b/test_plan/dell-pod1/network/netperf.yaml
similarity index 100%
rename from test_cases/dell-pod1/network/netperf.yaml
rename to test_plan/dell-pod1/network/netperf.yaml

diff --git a/test_cases/dell-pod1/storage/fio_bm.yaml b/test_plan/dell-pod1/storage/fio_bm.yaml
similarity index 100%
rename from test_cases/dell-pod1/storage/fio_bm.yaml
rename to test_plan/dell-pod1/storage/fio_bm.yaml

diff --git a/test_cases/dell-pod1/storage/fio_vm.yaml b/test_plan/dell-pod1/storage/fio_vm.yaml
similarity index 100%
rename from test_cases/dell-pod1/storage/fio_vm.yaml
rename to test_plan/dell-pod1/storage/fio_vm.yaml

diff --git a/test_cases/dell-us-deploying-bm3/compute/dhrystone_bm.yaml b/test_plan/dell-us-deploying-bm3/compute/dhrystone_bm.yaml
similarity index 100%
rename from test_cases/dell-us-deploying-bm3/compute/dhrystone_bm.yaml
rename to test_plan/dell-us-deploying-bm3/compute/dhrystone_bm.yaml

diff --git a/test_cases/dell-us-deploying-bm3/compute/dhrystone_vm.yaml b/test_plan/dell-us-deploying-bm3/compute/dhrystone_vm.yaml
similarity index 100%
rename from test_cases/dell-us-deploying-bm3/compute/dhrystone_vm.yaml
rename to test_plan/dell-us-deploying-bm3/compute/dhrystone_vm.yaml

diff --git a/test_cases/dell-us-deploying-bm3/compute/dpi_bm.yaml b/test_plan/dell-us-deploying-bm3/compute/dpi_bm.yaml
similarity index 100%
rename from test_cases/dell-us-deploying-bm3/compute/dpi_bm.yaml
rename to test_plan/dell-us-deploying-bm3/compute/dpi_bm.yaml

diff --git a/test_cases/dell-us-deploying-bm3/compute/dpi_vm.yaml b/test_plan/dell-us-deploying-bm3/compute/dpi_vm.yaml
similarity index 100%
rename from test_cases/dell-us-deploying-bm3/compute/dpi_vm.yaml
rename to test_plan/dell-us-deploying-bm3/compute/dpi_vm.yaml

diff --git a/test_cases/dell-us-deploying-bm3/compute/ramspeed_bm.yaml b/test_plan/dell-us-deploying-bm3/compute/ramspeed_bm.yaml
similarity index 100%
rename from test_cases/dell-us-deploying-bm3/compute/ramspeed_bm.yaml
rename to test_plan/dell-us-deploying-bm3/compute/ramspeed_bm.yaml

diff --git a/test_cases/dell-us-deploying-bm3/compute/ramspeed_vm.yaml b/test_plan/dell-us-deploying-bm3/compute/ramspeed_vm.yaml
similarity index 100%
rename from test_cases/dell-us-deploying-bm3/compute/ramspeed_vm.yaml
rename to test_plan/dell-us-deploying-bm3/compute/ramspeed_vm.yaml

diff --git a/test_cases/dell-us-deploying-bm3/compute/ssl_bm.yaml b/test_plan/dell-us-deploying-bm3/compute/ssl_bm.yaml
similarity index 100%
rename from test_cases/dell-us-deploying-bm3/compute/ssl_bm.yaml
rename to test_plan/dell-us-deploying-bm3/compute/ssl_bm.yaml

diff --git a/test_cases/dell-us-deploying-bm3/compute/ssl_vm.yaml b/test_plan/dell-us-deploying-bm3/compute/ssl_vm.yaml
similarity index 100%
rename from test_cases/dell-us-deploying-bm3/compute/ssl_vm.yaml
rename to test_plan/dell-us-deploying-bm3/compute/ssl_vm.yaml

diff --git a/test_cases/dell-us-deploying-bm3/compute/whetstone_bm.yaml b/test_plan/dell-us-deploying-bm3/compute/whetstone_bm.yaml
similarity index 100%
rename from test_cases/dell-us-deploying-bm3/compute/whetstone_bm.yaml
rename to test_plan/dell-us-deploying-bm3/compute/whetstone_bm.yaml

diff --git a/test_cases/dell-us-deploying-bm3/compute/whetstone_vm.yaml b/test_plan/dell-us-deploying-bm3/compute/whetstone_vm.yaml
similarity index 100%
rename from test_cases/dell-us-deploying-bm3/compute/whetstone_vm.yaml
rename to test_plan/dell-us-deploying-bm3/compute/whetstone_vm.yaml

diff --git a/test_cases/dell-us-deploying-bm3/network/iperf_bm.yaml b/test_plan/dell-us-deploying-bm3/network/iperf_bm.yaml
similarity index 100%
rename from test_cases/dell-us-deploying-bm3/network/iperf_bm.yaml
rename to test_plan/dell-us-deploying-bm3/network/iperf_bm.yaml

diff --git a/test_cases/dell-us-deploying-bm3/network/iperf_vm.yaml b/test_plan/dell-us-deploying-bm3/network/iperf_vm.yaml
similarity index 100%
rename from test_cases/dell-us-deploying-bm3/network/iperf_vm.yaml
rename to test_plan/dell-us-deploying-bm3/network/iperf_vm.yaml

diff --git a/test_cases/dell-us-deploying-bm3/network/iperf_vm_2.yaml b/test_plan/dell-us-deploying-bm3/network/iperf_vm_2.yaml
similarity index 100%
rename from test_cases/dell-us-deploying-bm3/network/iperf_vm_2.yaml
rename to test_plan/dell-us-deploying-bm3/network/iperf_vm_2.yaml

diff --git a/test_cases/dell-us-deploying-bm3/network/netperf.yaml b/test_plan/dell-us-deploying-bm3/network/netperf.yaml
similarity index 100%
rename from test_cases/dell-us-deploying-bm3/network/netperf.yaml
rename to test_plan/dell-us-deploying-bm3/network/netperf.yaml

diff --git a/test_cases/dell-us-deploying-bm3/storage/fio_bm.yaml b/test_plan/dell-us-deploying-bm3/storage/fio_bm.yaml
similarity index 100%
rename from test_cases/dell-us-deploying-bm3/storage/fio_bm.yaml
rename to test_plan/dell-us-deploying-bm3/storage/fio_bm.yaml

diff --git a/test_cases/dell-us-deploying-bm3/storage/fio_vm.yaml b/test_plan/dell-us-deploying-bm3/storage/fio_vm.yaml
similarity index 100%
rename from test_cases/dell-us-deploying-bm3/storage/fio_vm.yaml
rename to test_plan/dell-us-deploying-bm3/storage/fio_vm.yaml

diff --git a/tests/args_handler_test.py b/tests/args_handler_test.py
index e650086..a5c2223 100644 (file)
--- a/tests/args_handler_test.py
+++ b/tests/args_handler_test.py
@@ -13,7 +13,7 @@ import func.args_handler
 
 class TestClass:
     @pytest.mark.parametrize("test_input, expected", [
-        (['fuel', '/home', './test_cases/default/network/iperf_bm.yaml'],
+        (['fuel', '/home', './test_plan/default/network/iperf_bm.yaml'],
          ['fuel', '/home', "iperf",
           [('1-server', ['10.20.0.23']), ('2-host', ['10.20.0.24'])],
           "iperf_bm.yaml",

diff --git a/tests/cli_test.py b/tests/cli_test.py
index e47d99a..d558329 100644 (file)
--- a/tests/cli_test.py
+++ b/tests/cli_test.py
@@ -9,7 +9,7 @@ class TestClass:
         (['-l',
           'zte',
           '-f',
-          'compute'], "You have specified a lab that is not present in test_cases"),
+          'compute'], "You have specified a lab that is not present in test_plan"),
         (['-l',
           'default',
           '-f',
@@ -28,8 +28,8 @@ class TestClass:
         (['-l',
           'default',
           '-f',
-          'storage'], [('fuel', '/home', './test_cases/default/storage/fio_bm.yaml'),
-                       ('fuel', '/home', './test_cases/default/storage/fio_vm.yaml')])
+          'storage'], [('fuel', '/home', './test_plan/default/storage/fio_bm.yaml'),
+                       ('fuel', '/home', './test_plan/default/storage/fio_vm.yaml')])
     ])
     @mock.patch('func.cli.args_handler.prepare_and_run_benchmark')
     def test_cli_successful(self, mock_args_handler, test_input, expected):