From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 19 Jun 2017 08:56:36 +0000 (+0200)
Subject: Remove all references to /home/opnfv/repos/functest
X-Git-Tag: opnfv-6.0.0~143
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F77%2F36177%2F1;p=barometer.git

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

It completes the previous patch in Functest [1].

[1] https://gerrit.opnfv.org/gerrit/#/c/36163/

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

diff --git a/baro_tests/collectd.py b/baro_tests/collectd.py
index cd436df6..5ac3c8fe 100644
--- a/baro_tests/collectd.py
+++ b/baro_tests/collectd.py
@@ -16,19 +16,20 @@
 import requests
 from keystoneclient.v3 import client
 import os
+import pkg_resources
 import time
 import logging
 from config_server import *
 from tests import *
 from opnfv.deployment import factory
 from functest.utils import functest_utils
-from functest.utils.constants import CONST
 
 CEILOMETER_NAME = 'ceilometer'
 ID_RSA_SRC = '/root/.ssh/id_rsa'
 ID_RSA_DST_DIR = '/home/opnfv/.ssh'
 ID_RSA_DST = ID_RSA_DST_DIR + '/id_rsa'
-INSTALLER_PARAMS_YAML = os.path.join(CONST.dir_repo_functest, 'functest/ci/installer_params.yaml')
+INSTALLER_PARAMS_YAML = pkg_resources.resource_filename(
+    'functest', 'ci/installer_params.yaml')
 FUEL_IP = functest_utils.get_parameter_from_yaml('fuel.ip', INSTALLER_PARAMS_YAML)
 FUEL_USER = functest_utils.get_parameter_from_yaml('fuel.user', INSTALLER_PARAMS_YAML)
 FUEL_PW = functest_utils.get_parameter_from_yaml('fuel.password', INSTALLER_PARAMS_YAML)