diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-05-11 14:22:12 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-05-11 14:26:39 +0200 |
| commit | 19807ef8967c21da41fe5f5566751be8de250434 (patch) | |
| tree | 598cfa2472e72f2183b98d8c6fc103d3d064f142 /functest/opnfv_tests/vnf/router | |
| parent | 1aaeab75130345ae9198de23d013f9840044c8b5 (diff) | |
Install Cloudify descritors in functest-vnf
It completes [1] to fix gates [2] and stops getting thirdparty vnf
master (dependencies).
It also prints data to ease debugging.
[1] https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater/commit/abd39d772c77317a25745feaaf312165e7588346
[2] https://build.opnfv.org/ci/view/functest/job/functest-apex-baremetal-daily-fraser/110/console
Change-Id: Ib317a491e54820f4edb01fcecfca9d2a08b40c0f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/vnf/router')
| -rw-r--r-- | functest/opnfv_tests/vnf/router/cloudify_vrouter.py | 12 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/router/cloudify_vrouter.yaml | 5 |
2 files changed, 4 insertions, 13 deletions
diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py index 9f6327b78..769c2a4cf 100644 --- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py +++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py @@ -27,8 +27,6 @@ from functest.utils import config from functest.utils import env from functest.utils import functest_utils -from git import Repo - from snaps.config.flavor import FlavorConfig from snaps.config.image import ImageConfig from snaps.config.keypair import KeypairConfig @@ -304,16 +302,8 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase): descriptor = self.vnf['descriptor'] self.deployment_name = descriptor.get('name') - vrouter_blueprint_dir = os.path.join( - self.data_dir, self.util.blueprint_dir) - if not os.path.exists(vrouter_blueprint_dir): - Repo.clone_from( - descriptor.get('url'), vrouter_blueprint_dir, - branch=descriptor.get('version')) - cfy_client.blueprints.upload( - vrouter_blueprint_dir + self.util.blueprint_file_name, - descriptor.get('name')) + descriptor.get('file_name'), descriptor.get('name')) self.__logger.info("Get or create flavor for vrouter") flavor_settings = FlavorConfig( diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.yaml b/functest/opnfv_tests/vnf/router/cloudify_vrouter.yaml index 58bdb66a3..2bc525895 100644 --- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.yaml +++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.yaml @@ -18,9 +18,10 @@ vnf: name: vyos1.1.7 version: '1.1.7' descriptor: - url: https://github.com/oolorg/opnfv-vnf-vyos-blueprint/ + file_name: + /src/opnfv-vnf-vyos-blueprint/function-test-openstack-blueprint.yaml name: vrouter-opnfv - version: 'master' + version: fraser requirements: flavor: name: m1.medium |