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 19:07:57 +0200 |
commit | 8a0b00906640707b90fccf76766bc7dec25a0bac (patch) | |
tree | b57ab0c8e211bbd39961d7a29282f448fec46231 /functest/opnfv_tests/vnf/router/cloudify_vrouter.py | |
parent | 03ef3ebd7f2f85c6b3691bdd0ce69ab4cb9d9f85 (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
Conflicts:
docker/vnf/Dockerfile
functest/opnfv_tests/vnf/ims/cloudify_ims.yaml
Change-Id: Ib317a491e54820f4edb01fcecfca9d2a08b40c0f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 19807ef8967c21da41fe5f5566751be8de250434)
Diffstat (limited to 'functest/opnfv_tests/vnf/router/cloudify_vrouter.py')
-rw-r--r-- | functest/opnfv_tests/vnf/router/cloudify_vrouter.py | 12 |
1 files changed, 1 insertions, 11 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( |