Remove all references to /home/opnfv/repos/functest

It also removes relative (and incomplete) references which could be
defined in modules instead of this global configuration.

Change-Id: Ie20dc3547e49b6224aa8100cd380d37b87ece5a9
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

2 files changed, 20 insertions, 12 deletions

diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
index b2a215337..30d1cf089 100755
--- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
+++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
@@ -12,6 +12,7 @@ from __future__ import division
 import argparse
 import logging
 import os
+import pkg_resources
 import re
 import sys
 import subprocess
@@ -33,13 +34,16 @@ class RefstackClient(testcase.OSGCTestCase):
         if "case_name" not in kwargs:
             kwargs["case_name"] = "refstack_defcore"
         super(RefstackClient, self).__init__(**kwargs)
-        self.FUNCTEST_TEST = CONST.__getattribute__('dir_functest_test')
-        self.CONF_PATH = CONST.__getattribute__('refstack_tempest_conf_path')
-        self.DEFCORE_LIST = CONST.__getattribute__('refstack_defcore_list')
+        self.CONF_PATH = pkg_resources.resource_filename(
+            'functest',
+            'opnfv_tests/openstack/refstack_client/refstack_tempest.conf')
+        self.FUNCTEST_TEST = pkg_resources.resource_filename(
+            'functest', 'opnfv_tests')
+        self.DEFCORE_LIST = 'openstack/refstack_client/defcore.txt'
         self.confpath = os.path.join(self.FUNCTEST_TEST,
                                      self.CONF_PATH)
-        self.defcorelist = os.path.join(self.FUNCTEST_TEST,
-                                        self.DEFCORE_LIST)
+        self.defcorelist = pkg_resources.resource_filename(
+            'functest', 'opnfv_tests/openstack/refstack_client/defcore.txt')
 
     def source_venv(self):
 
@@ -202,9 +206,13 @@ class RefstackClient(testcase.OSGCTestCase):
 class RefstackClientParser(object):
 
     def __init__(self):
-        self.FUNCTEST_TEST = CONST.__getattribute__('dir_functest_test')
-        self.CONF_PATH = CONST.__getattribute__('refstack_tempest_conf_path')
-        self.DEFCORE_LIST = CONST.__getattribute__('refstack_defcore_list')
+        self.FUNCTEST_TEST = pkg_resources.resource_filename(
+            'functest', 'opnfv_tests')
+        self.CONF_PATH = pkg_resources.resource_filename(
+            'functest',
+            'opnfv_tests/openstack/refstack_client/refstack_tempest.conf')
+        self.DEFCORE_LIST = pkg_resources.resource_filename(
+            'functest', 'opnfv_tests/openstack/refstack_client/defcore.txt')
         self.confpath = os.path.join(self.FUNCTEST_TEST,
                                      self.CONF_PATH)
         self.defcorelist = os.path.join(self.FUNCTEST_TEST,
diff --git a/functest/opnfv_tests/openstack/refstack_client/tempest_conf.py b/functest/opnfv_tests/openstack/refstack_client/tempest_conf.py
index fbaad589e..5d429e7c2 100755
--- a/functest/opnfv_tests/openstack/refstack_client/tempest_conf.py
+++ b/functest/opnfv_tests/openstack/refstack_client/tempest_conf.py
@@ -6,7 +6,7 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 import logging
-import os
+import pkg_resources
 
 from functest.opnfv_tests.openstack.tempest import conf_utils
 from functest.utils import openstack_utils
@@ -24,9 +24,9 @@ class TempestConf(object):
         self.DEPLOYMENT_ID = conf_utils.get_verifier_deployment_id()
         self.DEPLOYMENT_DIR = conf_utils.get_verifier_deployment_dir(
             self.VERIFIER_ID, self.DEPLOYMENT_ID)
-        self.confpath = os.path.join(
-            CONST.__getattribute__('dir_functest_test'),
-            CONST.__getattribute__('refstack_tempest_conf_path'))
+        self.confpath = pkg_resources.resource_filename(
+            'functest',
+            'opnfv_tests/openstack/refstack_client/refstack_tempest.conf')
 
     def generate_tempestconf(self):
         try: