diff options
| author |   Manuel Buil <mbuil@suse.com> | 2017-02-21 17:28:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-21 17:28:23 +0000 |
| commit | 22c1691bd56de2d8c82f7013ea7a16a8caa19a12 (patch) | |
| tree | c98857431c2722755061048e086a6a33cbd11fea /sfc/lib | |
| parent | 32cc637c69580b18112e1e347830b6ee194b1b60 (diff) | |
| parent | a14016690cea1fe6f39c5ab0cd0359534c8966e0 (diff) | |
Merge "Get vnfd parameter file location from config.yaml"
Diffstat (limited to 'sfc/lib')
| -rw-r--r-- | sfc/lib/config.py | 2 | ||||
| -rw-r--r-- | sfc/lib/utils.py | 8 |
2 files changed, 6 insertions, 4 deletions
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 c8641dd0..b4807cc2 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', |