From fdbfe10922d09ee3dad407b10be0205082dddce3 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 21 Feb 2018 11:33:39 +0100 Subject: Use constants for Functest config file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit env_file can't be defined in a config file simply because it's an entry point (Jenkins jobs, end users) Change-Id: Ie23c0ef90efc839d60f0f3a9754c58746b1f3a00 Signed-off-by: Cédric Ollivier --- functest/core/vnf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'functest/core') diff --git a/functest/core/vnf.py b/functest/core/vnf.py index 05baf432..cf20492b 100644 --- a/functest/core/vnf.py +++ b/functest/core/vnf.py @@ -20,6 +20,7 @@ from snaps.openstack.create_project import OpenStackProject from snaps.openstack.tests import openstack_tests from functest.core import testcase +from functest.utils import constants __author__ = ("Morgan Richomme , " "Valentin Boucher ") @@ -46,7 +47,6 @@ class VnfOnBoarding(testcase.TestCase): """Base model for VNF test cases.""" __logger = logging.getLogger(__name__) - env_file = "/home/opnfv/functest/conf/env_file" def __init__(self, **kwargs): super(VnfOnBoarding, self).__init__(**kwargs) @@ -110,7 +110,7 @@ class VnfOnBoarding(testcase.TestCase): "Prepare VNF: %s, description: %s", self.case_name, self.tenant_description) snaps_creds = openstack_tests.get_credentials( - os_env_file=self.env_file) + os_env_file=constants.ENV_FILE) self.os_project = OpenStackProject( snaps_creds, -- cgit 1.2.3-korg