Merge "Support different user/project domain values"

[functest.git] / functest / core / vnf.py

diff --git a/functest/core/vnf.py b/functest/core/vnf.py
index 15065f7..412e131 100644 (file)
--- a/functest/core/vnf.py
+++ b/functest/core/vnf.py
@@ -21,6 +21,7 @@ from snaps.openstack.utils import keystone_utils
 from snaps.openstack.tests import openstack_tests
 
 from functest.core import testcase
+from functest.utils import constants
 
 __author__ = ("Morgan Richomme <morgan.richomme@orange.com>, "
               "Valentin Boucher <valentin.boucher@orange.com>")
@@ -47,7 +48,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)
@@ -111,7 +111,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,