Merge "refactor vping using new constants provider"

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 11ff7fd..b6dde11 100755 (executable)
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -1,7 +1,7 @@
 general:
-    directories:
+    dir:
         # Relative to the path where the repo is cloned:
-        dir_vping:         functest/opnfv_tests/openstack/vping
+        vping:         functest/opnfv_tests/openstack/vping
         dir_odl:           functest/opnfv_tests/sdn/odl
         dir_rally:         functest/opnfv_tests/openstack/rally
         dir_tempest_cases: functest/opnfv_tests/openstack/tempest/custom_tests
@@ -12,7 +12,7 @@ general:
         # Absolute path
         dir_home:           /home/opnfv
         dir_repos:          /home/opnfv/repos
-        dir_repo_functest:  /home/opnfv/repos/functest
+        repo_functest:  /home/opnfv/repos/functest
         dir_repo_rally:     /home/opnfv/repos/rally
         dir_repo_tempest:   /home/opnfv/repos/tempest
         dir_repo_releng:    /home/opnfv/repos/releng
@@ -27,11 +27,11 @@ general:
         dir_repo_parser:    /home/opnfv/repos/parser
         dir_repo_domino:    /home/opnfv/repos/domino
         dir_repo_snaps:     /home/opnfv/repos/snaps
-        dir_functest:       /home/opnfv/functest
-        dir_functest_test:  /home/opnfv/repos/functest/functest/opnfv_tests
-        dir_results:        /home/opnfv/functest/results
-        dir_functest_conf:  /home/opnfv/functest/conf
-        dir_functest_data:  /home/opnfv/functest/data
+        functest:       /home/opnfv/functest
+        functest_test:  /home/opnfv/repos/functest/functest/opnfv_tests
+        results:        /home/opnfv/functest/results
+        functest_conf:  /home/opnfv/functest/conf
+        functest_data:  /home/opnfv/functest/data
         dir_vIMS_data:      /home/opnfv/functest/data/vIMS/
         dir_rally_inst:     /home/opnfv/.rally
 
@@ -75,12 +75,12 @@ vping:
     vm_name_1: opnfv-vping-1
     vm_name_2: opnfv-vping-2
     image_name: functest-vping
-    vping_private_net_name: vping-net
-    vping_private_subnet_name: vping-subnet
-    vping_private_subnet_cidr: 192.168.130.0/24
-    vping_router_name: vping-router
-    vping_sg_name: vPing-sg
-    vping_sg_descr: Security group for vPing test case
+    private_net_name: vping-net
+    private_subnet_name: vping-subnet
+    private_subnet_cidr: 192.168.130.0/24
+    router_name: vping-router
+    sg_name: vPing-sg
+    sg_desc: Security group for vPing test case
 
 onos_sfc:
     image_base_url: http://artifacts.opnfv.org/sfc/demo

diff --git a/functest/core/feature_base.py b/functest/core/feature_base.py
index 01a27f3..780170d 100644 (file)
--- a/functest/core/feature_base.py
+++ b/functest/core/feature_base.py
@@ -11,7 +11,7 @@ class FeatureBase(base.TestcaseBase):
         self.project_name = project
         self.case_name = case
         self.cmd = cmd
-        self.repo = self.get_conf('general.directories.{}'.format(repo))
+        self.repo = self.get_conf('general.dir.{}'.format(repo))
         self.result_file = self.get_result_file()
         self.logger = ft_logger.Logger(project).getLogger()
 
@@ -44,7 +44,7 @@ class FeatureBase(base.TestcaseBase):
         return exit_code
 
     def get_result_file(self):
-        dir = self.get_conf('general.directories.dir_results')
+        dir = self.get_conf('general.dir.results')
         return "{}/{}.log".format(dir, self.project_name)
 
     def log_results(self):

diff --git a/functest/opnfv_tests/openstack/snaps/smoke.py b/functest/opnfv_tests/openstack/snaps/smoke.py
index f66c17f..691f813 100644 (file)
--- a/functest/opnfv_tests/openstack/snaps/smoke.py
+++ b/functest/opnfv_tests/openstack/snaps/smoke.py
@@ -33,7 +33,7 @@ class SnapsSmoke(PyTestSuiteRunner):
         # SNAPS repository and are found relative to that path
         if use_fip:
             snaps_dir = ft_utils.get_functest_config(
-                'general.directories.dir_repo_snaps') + '/snaps'
+                'general.dir.dir_repo_snaps') + '/snaps'
             os.chdir(snaps_dir)
 
         test_suite_builder.add_openstack_integration_tests(

diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py
index e467dd9..a5309bd 100755 (executable)
--- a/functest/opnfv_tests/openstack/vping/vping_base.py
+++ b/functest/opnfv_tests/openstack/vping/vping_base.py
@@ -12,43 +12,38 @@ import pprint
 import time
 from datetime import datetime
 
-import functest.utils.functest_utils as ft_utils
-import functest.utils.functest_constants as ft_constants
-import functest.utils.openstack_utils as os_utils
 import functest.core.testcase_base as testcase_base
+import functest.utils.openstack_utils as os_utils
+from functest.utils.constants import CONST
 
 
 class VPingBase(testcase_base.TestcaseBase):
     def __init__(self):
-        def get_conf(parameter):
-            return ft_utils.get_functest_config(parameter)
-
         super(VPingBase, self).__init__()
         self.logger = None
-        self.functest_repo = ft_constants.FUNCTEST_REPO_DIR
-        self.repo = get_conf('general.directories.dir_vping')
-        self.vm1_name = get_conf('vping.vm_name_1')
-        self.vm2_name = get_conf('vping.vm_name_2')
+        self.functest_repo = CONST.dir_repo_functest
+        self.repo = CONST.dir_vping
+        self.vm1_name = CONST.vping_vm_name_1
+        self.vm2_name = CONST.vping_vm_name_2
         self.vm_boot_timeout = 180
         self.vm_delete_timeout = 100
-        self.ping_timeout = get_conf('vping.ping_timeout')
+        self.ping_timeout = CONST.vping_ping_timeout
 
-        self.image_name = get_conf('vping.image_name')
-        self.image_filename = get_conf('general.openstack.image_file_name')
-        self.image_format = get_conf('general.openstack.image_disk_format')
-        self.image_path = ("%s/%s" %
-                           (get_conf('general.directories.dir_functest_data'),
-                            self.image_filename))
+        self.image_name = CONST.vping_image_name
+        self.image_filename = CONST.openstack_image_file_name
+        self.image_format = CONST.openstack_image_disk_format
+        self.image_path = os.path.join(CONST.dir_functest_data,
+                                       self.image_filename)
 
-        self.flavor_name = get_conf('vping.vm_flavor')
+        self.flavor_name = CONST.vping_vm_flavor
 
         # NEUTRON Private Network parameters
-        self.private_net_name = get_conf('vping.vping_private_net_name')
-        self.private_subnet_name = get_conf('vping.vping_private_subnet_name')
-        self.private_subnet_cidr = get_conf('vping.vping_private_subnet_cidr')
-        self.router_name = get_conf('vping.vping_router_name')
-        self.sg_name = get_conf('vping.vping_sg_name')
-        self.sg_desc = get_conf('vping.vping_sg_descr')
+        self.private_net_name = CONST.vping_private_net_name
+        self.private_subnet_name = CONST.vping_private_subnet_name
+        self.private_subnet_cidr = CONST.vping_private_subnet_cidr
+        self.router_name = CONST.vping_router_name
+        self.sg_name = CONST.vping_sg_name
+        self.sg_desc = CONST.vping_sg_desc
         self.neutron_client = os_utils.get_neutron_client()
         self.glance_client = os_utils.get_glance_client()
         self.nova_client = os_utils.get_nova_client()

diff --git a/functest/utils/functest_constants.py b/functest/utils/functest_constants.py
index 2664ace..a39d33a 100644 (file)
--- a/functest/utils/functest_constants.py
+++ b/functest/utils/functest_constants.py
@@ -60,25 +60,25 @@ def get_value(functest_config_key, env_variable):
             return constant
 
 
-HOME = get_value('general.directories.dir_home', 'HOME')
-REPOS_DIR = get_value('general.directories.dir_repos', 'REPOS_DIR')
-FUNCTEST_BASE_DIR = get_value('general.directories.dir_functest',
+HOME = get_value('general.dir.dir_home', 'HOME')
+REPOS_DIR = get_value('general.dir.dir_repos', 'REPOS_DIR')
+FUNCTEST_BASE_DIR = get_value('general.dir.functest',
                               'FUNCTEST_BASE_DIR')
-FUNCTEST_REPO_DIR = get_value('general.directories.dir_repo_functest',
+FUNCTEST_REPO_DIR = get_value('general.dir.repo_functest',
                               'FUNCTEST_REPO_DIR')
-FUNCTEST_TEST_DIR = get_value('general.directories.dir_functest_test',
+FUNCTEST_TEST_DIR = get_value('general.dir.functest_test',
                               'FUNCTEST_TEST_DIR')
-FUNCTEST_CONF_DIR = get_value('general.directories.dir_functest_conf',
+FUNCTEST_CONF_DIR = get_value('general.dir.functest_conf',
                               'FUNCTEST_CONF_DIR')
-FUNCTEST_DATA_DIR = get_value('general.directories.dir_functest_data',
+FUNCTEST_DATA_DIR = get_value('general.dir.functest_data',
                               'FUNCTEST_DATA_DIR')
-FUNCTEST_RESULTS_DIR = get_value('general.directories.dir_results',
+FUNCTEST_RESULTS_DIR = get_value('general.dir.results',
                                  'FUNCTEST_RESULTS_DIR')
 FUNCTEST_TESTCASES_YAML = get_value('general.functest.testcases_yaml',
                                     'FUNCTEST_TESTCASES_YAML')
 RALLY_DEPLOYMENT_NAME = get_value('rally.deployment_name',
                                   'RALLY_DEPLOYMENT_NAME')
-TEMPEST_REPO_DIR = get_value('general.directories.dir_repo_tempest',
+TEMPEST_REPO_DIR = get_value('general.dir.dir_repo_tempest',
                              'TEMPEST_REPO_DIR')
 
 ENV_FILE = os.path.join(FUNCTEST_CONF_DIR, "env_active")
@@ -87,22 +87,22 @@ OPENSTACK_CREDS = get_value('general.openstack.creds', 'creds')
 OPENSTACK_SNAPSHOT_FILE = get_value('general.openstack.snapshot_file',
                                     'OPENSTACK_SNAPSHOT_FILE')
 
-DOMINO_REPO_DIR = get_value('general.directories.dir_repo_domino',
+DOMINO_REPO_DIR = get_value('general.dir.dir_repo_domino',
                             'DOMINO_REPO_DIR')
-SDNVPN_REPO_DIR = get_value('general.directories.dir_repo_sdnvpn',
+SDNVPN_REPO_DIR = get_value('general.dir.dir_repo_sdnvpn',
                             'SDNVPN_REPO_DIR')
-SFC_REPO_DIR = get_value('general.directories.dir_repo_sfc',
+SFC_REPO_DIR = get_value('general.dir.dir_repo_sfc',
                          'SFC_REPO_DIR')
 
 ONOS_SFC_IMAGE_NAME = get_value('onos_sfc.image_name',
                                 'ONOS_SFC_IMAGE_NAME')
 ONOS_SFC_IMAGE_FILENAME = get_value('onos_sfc.image_file_name',
                                     'ONOS_SFC_IMAGE_FILENAME')
-ONOS_SFC_RELATIVE_PATH = get_value('general.directories.dir_onos_sfc',
+ONOS_SFC_RELATIVE_PATH = get_value('general.dir.dir_onos_sfc',
                                    'ONOS_SFC_RELATIVE_PATH')
 ONOS_SFC_IMAGE_BASE_URL = get_value('onos_sfc.image_base_url',
                                     'ONOS_SFC_IMAGE_BASE_URL')
-RALLY_RELATIVE_PATH = get_value('general.directories.dir_rally',
+RALLY_RELATIVE_PATH = get_value('general.dir.dir_rally',
                                 'RALLY_RELATIVE_PATH')
 RALLY_PRIVATE_NET_NAME = get_value('rally.network_name',
                                    'RALLY_PRIVATE_NET_NAME')
@@ -111,7 +111,7 @@ RALLY_PRIVATE_SUBNET_NAME = get_value('rally.subnet_name',
 RALLY_PRIVATE_SUBNET_CIDR = get_value('rally.subnet_cidr',
                                       'RALLY_PRIVATE_SUBNET_CIDR')
 RALLY_ROUTER_NAME = get_value('rally.router_name', 'RALLY_ROUTER_NAME')
-RALLY_INSTALLATION_DIR = get_value('general.directories.dir_rally_inst',
+RALLY_INSTALLATION_DIR = get_value('general.dir.dir_rally_inst',
                                    'RALLY_INSTALLATION_DIR')
 GLANCE_IMAGE_NAME = get_value('general.openstack.image_name',
                               'GLANCE_IMAGE_NAME')
@@ -149,24 +149,24 @@ TEMPEST_USE_CUSTOM_IMAGES = get_value('tempest.use_custom_images',
                                       'TEMPEST_USE_CUSTOM_IMAGES')
 TEMPEST_USE_CUSTOM_FLAVORS = get_value('tempest.use_custom_flavors',
                                        'TEMPEST_USE_CUSTOM_FLAVORS')
-TEMPEST_TEST_LIST_DIR = get_value('general.directories.dir_tempest_cases',
+TEMPEST_TEST_LIST_DIR = get_value('general.dir.dir_tempest_cases',
                                   'TEMPEST_TEST_LIST_DIR')
 NAME_VM_1 = get_value('vping.vm_name_1', 'NAME_VM_1')
 NAME_VM_2 = get_value('vping.vm_name_2', 'NAME_VM_2')
 PING_TIMEOUT = get_value('vping.ping_timeout', 'PING_TIMEOUT')
 VPING__IMAGE_NAME = get_value('vping.image_name', 'VPING__IMAGE_NAME')
 VPING_VM_FLAVOR = get_value('vping.vm_flavor', 'VPING_VM_FLAVOR')
-VPING_PRIVATE_NET_NAME = get_value('vping.vping_private_net_name',
+VPING_PRIVATE_NET_NAME = get_value('vping.private_net_name',
                                    'VPING_PRIVATE_NET_NAME')
-VPING_PRIVATE_SUBNET_NAME = get_value('vping.vping_private_subnet_name',
+VPING_PRIVATE_SUBNET_NAME = get_value('vping.private_subnet_name',
                                       'VPING_PRIVATE_SUBNET_NAME')
-VPING_PRIVATE_SUBNET_CIDR = get_value('vping.vping_private_subnet_cidr',
+VPING_PRIVATE_SUBNET_CIDR = get_value('vping.private_subnet_cidr',
                                       'VPING_PRIVATE_SUBNET_CIDR')
-VPING_ROUTER_NAME = get_value('vping.vping_router_name',
+VPING_ROUTER_NAME = get_value('vping.router_name',
                               'VPING_ROUTER_NAME')
-VPING_SECGROUP_NAME = get_value('vping.vping_sg_name',
+VPING_SECGROUP_NAME = get_value('vping.sg_name',
                                 'VPING_SECGROUP_NAME')
-VPING_SECGROUP_DESCR = get_value('vping.vping_sg_descr',
+VPING_SECGROUP_DESCR = get_value('vping.sg_desc',
                                  'VPING_SECGROUP_DESCR')
 ONOSBENCH_USERNAME = get_value('ONOS.general.onosbench_username',
                                'ONOSBENCH_USERNAME')
@@ -192,7 +192,7 @@ ONOS_INSTALLER_MASTER_USERNAME = get_value(
 ONOS_INSTALLER_MASTER_PASSWORD = get_value(
     'ONOS.environment.installer_master_password',
     'ONOS_INSTALLER_MASTER_PASSWORD')
-PROMISE_REPO_DIR = get_value('general.directories.dir_repo_promise',
+PROMISE_REPO_DIR = get_value('general.dir.dir_repo_promise',
                              'PROMISE_REPO_DIR')
 PROMISE_TENANT_NAME = get_value('promise.tenant_name',
                                 'PROMISE_TENANT_NAME')
@@ -217,9 +217,9 @@ PROMISE_SUBNET_CIDR = get_value('promise.subnet_cidr',
                                 'PROMISE_SUBNET_CIDR')
 PROMISE_ROUTER_NAME = get_value('promise.router_name',
                                 'PROMISE_ROUTER_NAME')
-DOCTOR_REPO_DIR = get_value('general.directories.dir_repo_doctor',
+DOCTOR_REPO_DIR = get_value('general.dir.dir_repo_doctor',
                             'DOCTOR_REPO_DIR')
-COPPER_REPO_DIR = get_value('general.directories.dir_repo_copper',
+COPPER_REPO_DIR = get_value('general.dir.dir_repo_copper',
                             'COPPER_REPO_DIR')
 EXAMPLE_INSTANCE_NAME = get_value('example.example_vm_name',
                                   'EXAMPLE_INSTANCE_NAME')
@@ -240,9 +240,9 @@ EXAMPLE_SECGROUP_NAME = get_value('example.example_sg_name',
                                   'EXAMPLE_SECGROUP_NAME')
 EXAMPLE_SECGROUP_DESCR = get_value('example.example_sg_descr',
                                    'EXAMPLE_SECGROUP_DESCR')
-VIMS_DATA_DIR = get_value('general.directories.dir_vIMS_data',
+VIMS_DATA_DIR = get_value('general.dir.dir_vIMS_data',
                           'VIMS_DATA_DIR')
-VIMS_TEST_DIR = get_value('general.directories.dir_repo_vims_test',
+VIMS_TEST_DIR = get_value('general.dir.dir_repo_vims_test',
                           'VIMS_TEST_DIR')
 VIMS_TENANT_NAME = get_value('vIMS.general.tenant_name',
                              'VIMS_TENANT_NAME')
@@ -260,5 +260,5 @@ CW_DEPLOYMENT_NAME = get_value('vIMS.clearwater.deployment-name',
 CW_INPUTS = get_value('vIMS.clearwater.inputs', 'CW_INPUTS')
 CW_REQUIERMENTS = get_value('vIMS.clearwater.requierments',
                             'CW_REQUIERMENTS')
-PARSER_REPO_DIR = get_value('general.directories.dir_repo_parser',
+PARSER_REPO_DIR = get_value('general.dir.dir_repo_parser',
                             'PARSER_REPO_DIR')

diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py
index b1e4d3c..e4845c6 100644 (file)
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -326,7 +326,7 @@ def get_deployment_dir():
     Returns current Rally deployment directory
     """
     deployment_name = get_functest_config('rally.deployment_name')
-    rally_dir = get_functest_config('general.directories.dir_rally_inst')
+    rally_dir = get_functest_config('general.dir.dir_rally_inst')
     cmd = ("rally deployment list | awk '/" + deployment_name +
            "/ {print $2}'")
     p = subprocess.Popen(cmd, shell=True,