From a14016690cea1fe6f39c5ab0cd0359534c8966e0 Mon Sep 17 00:00:00 2001 From: George Paraskevopoulos Date: Thu, 16 Feb 2017 15:47:04 +0200 Subject: Get vnfd parameter file location from config.yaml Change-Id: Ide425e860ad219ec24765905666994390858cfdb Signed-off-by: George Paraskevopoulos --- sfc/lib/config.py | 2 ++ sfc/lib/utils.py | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'sfc/lib') diff --git a/sfc/lib/config.py b/sfc/lib/config.py index 3ef8514e..3a8247e3 100644 --- a/sfc/lib/config.py +++ b/sfc/lib/config.py @@ -31,6 +31,8 @@ class CommonConfig(object): self.sfc_test_dir = os.path.join( self.repo_path, "sfc", "tests", "functest") self.vnfd_dir = os.path.join(self.sfc_test_dir, "vnfd-templates") + self.vnfd_default_params_file = os.path.join( + self.sfc_test_dir, "vnfd-default-params-file") self.functest_results_dir = os.path.join( CONST.dir_results, "odl-sfc") self.config_file = os.path.join(self.sfc_test_dir, "config.yaml") diff --git a/sfc/lib/utils.py b/sfc/lib/utils.py index a7edef68..d1ae0844 100644 --- a/sfc/lib/utils.py +++ b/sfc/lib/utils.py @@ -78,10 +78,10 @@ def download_image(url, image_path): logger.info("Using old image") -def create_vnf_in_av_zone(tacker_client, vnf_name, vnfd_name, av_zone=None): - param_file = os.path.join(os.getcwd(), - 'vnfd-templates', - 'test-vnfd-default-params.yaml') +def create_vnf_in_av_zone( + tacker_client, vnf_name, vnfd_name, default_param_file, av_zone=None): + param_file = default_param_file + if av_zone is not None or av_zone != 'nova': param_file = os.path.join( '/tmp', -- cgit 1.2.3-korg