From: Linda Wang <wangwulin@huawei.com>
Date: Fri, 30 Jun 2017 04:16:27 +0000 (+0000)
Subject: Fix the wrong path of sdnvpn
X-Git-Tag: opnfv-5.0.RC1~21
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=74db571092ab8650d8059430ea4e4033d2269527;p=sdnvpn.git

Fix the wrong path of sdnvpn

The new path should be /usr/local/lib/python2.7/dist-packages/sdnvpn,
rather than /home/opnfv/repos/sdnvpn

Change-Id: I22e019226e7bffe233b52c1a3ec6171b835e4bd3
Signed-off-by: Linda Wang <wangwulin@huawei.com>
---

diff --git a/sdnvpn/lib/config.py b/sdnvpn/lib/config.py
index f845f72..c3f6b22 100644
--- a/sdnvpn/lib/config.py
+++ b/sdnvpn/lib/config.py
@@ -9,7 +9,7 @@
 
 import yaml
 import logging
-import os
+import pkg_resources
 
 from functest.utils.constants import CONST
 import functest.utils.functest_utils as ft_utils
@@ -22,15 +22,13 @@ class CommonConfig(object):
     Common configuration parameters across testcases
     """
     def __init__(self):
-        self.repo_path = CONST.dir_repo_sdnvpn
-        self.config_file = os.path.join(self.repo_path,
-                                        'sdnvpn/test/functest/config.yaml')
-        self.keyfile_path = os.path.join(self.repo_path,
-                                         'sdnvpn/artifacts/id_rsa')
+        self.config_file = pkg_resources.resource_filename(
+            'sdnvpn', 'test/functest/config.yaml')
+        self.keyfile_path = pkg_resources.resource_filename(
+            'sdnvpn', 'artifacts/id_rsa')
         self.test_db = CONST.results_test_db_url
-        self.quagga_setup_script_path = os.path.join(
-            self.repo_path,
-            "sdnvpn/artifacts/quagga_setup.sh")
+        self.quagga_setup_script_path = pkg_resources.resource_filename(
+            'sdnvpn', 'artifacts/quagga_setup.sh')
         self.line_length = 90  # length for the summary table
         self.vm_boot_timeout = 180
         self.default_flavor = ft_utils.get_parameter_from_yaml(