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/ims | |
| 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/ims')
| -rw-r--r-- | functest/opnfv_tests/vnf/ims/cloudify_ims.py | 9 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/ims/cloudify_ims.yaml | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py index 6180e2c8f..c8a3498a9 100644 --- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py +++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py @@ -251,6 +251,8 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase): retry = 10 while str(cfy_status) != 'running' and retry: try: + self.__logger.debug( + "status %s", cfy_client.manager.get_status()) cfy_status = cfy_client.manager.get_status()['status'] self.__logger.info( "The current manager status is %s", cfy_status) @@ -287,6 +289,7 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase): cmd = "sudo yum install -y gcc python-devel" self.run_blocking_ssh_command( ssh, cmd, "Unable to install packages on manager") + self.run_blocking_ssh_command(ssh, 'cfy status') self.details['orchestrator'].update(status='PASS', duration=duration) @@ -305,10 +308,8 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase): self.__logger.info("Upload VNFD") cfy_client = self.orchestrator['object'] descriptor = self.vnf['descriptor'] - cfy_client.blueprints.publish_archive(descriptor.get('url'), - descriptor.get('name'), - descriptor.get('file_name')) - + cfy_client.blueprints.upload( + descriptor.get('file_name'), descriptor.get('name')) self.__logger.info("Get or create flavor for all clearwater vm") flavor_settings = FlavorConfig( name=self.vnf['requirements']['flavor']['name'], diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml b/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml index 4586dfd33..3d4969242 100644 --- a/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml +++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml @@ -16,10 +16,8 @@ vnf: name: clearwater version: '107' descriptor: - file_name: openstack-blueprint.yaml + file_name: /src/vims/openstack-blueprint.yaml name: clearwater-opnfv - url: - https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater/archive/master.zip version: '122' requirements: flavor: |