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, 6 insertions, 6 deletions

diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py
index 856d5f220..714606769 100644
--- a/functest/opnfv_tests/openstack/vping/vping_base.py
+++ b/functest/opnfv_tests/openstack/vping/vping_base.py
@@ -10,6 +10,7 @@
 from datetime import datetime
 import logging
 import os
+import pkg_resources
 import time
 import uuid
 
@@ -37,7 +38,8 @@ class VPingBase(testcase.OSGCTestCase):
 
         self.logger = logging.getLogger(self.__class__.__name__)
 
-        self.functest_repo = CONST.__getattribute__('dir_repo_functest')
+        self.functest_repo = pkg_resources.resource_filename(
+            'functest', '..')
         self.guid = ''
         if CONST.__getattribute__('vping_unique_names'):
             self.guid = '-' + str(uuid.uuid4())
@@ -45,8 +47,6 @@ class VPingBase(testcase.OSGCTestCase):
         self.os_creds = openstack_tests.get_credentials(
             os_env_file=CONST.__getattribute__('openstack_creds'))
 
-        self.repo = CONST.__getattribute__('dir_vping')
-
         self.creators = list()
         self.image_creator = None
         self.network_creator = None
diff --git a/functest/opnfv_tests/openstack/vping/vping_ssh.py b/functest/opnfv_tests/openstack/vping/vping_ssh.py
index 6ac0d6764..1f663307c 100755
--- a/functest/opnfv_tests/openstack/vping/vping_ssh.py
+++ b/functest/opnfv_tests/openstack/vping/vping_ssh.py
@@ -8,7 +8,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 
 import argparse
-import os
+import pkg_resources
 from scp import SCPClient
 import sys
 import time
@@ -156,8 +156,8 @@ class VPingSSH(vping_base.VPingBase):
         """
         self.logger.info("Trying to transfer ping.sh")
         scp = SCPClient(ssh.get_transport())
-        local_path = self.functest_repo + "/" + self.repo
-        ping_script = os.path.join(local_path, "ping.sh")
+        ping_script = pkg_resources.resource_filename(
+            'functest', 'opnfv_tests/openstack/vping/ping.sh')
         try:
             scp.put(ping_script, "~/")
         except: