From 8a0b00906640707b90fccf76766bc7dec25a0bac Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 11 May 2018 14:22:12 +0200 Subject: Install Cloudify descritors in functest-vnf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 19807ef8967c21da41fe5f5566751be8de250434) --- docker/vnf/Dockerfile | 11 ++++++++--- functest/opnfv_tests/vnf/ims/cloudify_ims.py | 9 +++++---- functest/opnfv_tests/vnf/ims/cloudify_ims.yaml | 4 +--- functest/opnfv_tests/vnf/router/cloudify_vrouter.py | 12 +----------- functest/opnfv_tests/vnf/router/cloudify_vrouter.yaml | 5 +++-- 5 files changed, 18 insertions(+), 23 deletions(-) diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index 06117419d..37fe364da 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -2,7 +2,9 @@ FROM opnfv/functest-core:fraser ARG BRANCH=stable/fraser ARG OPENSTACK_TAG=stable/pike -ARG VIMS_TAG=stable +ARG VIMS_TEST_TAG=stable +ARG VIMS_TAG=fraser +ARG VROUTER_TAG=fraser ARG JUJU_TAG=tags/juju-2.2.5 ARG ABOT_TAG=opnfv-fraser @@ -18,7 +20,9 @@ RUN apk --no-cache add --update \ wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ | \ > upper-constraints.txt && \ - git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test /src/vims-test && \ + git clone --depth 1 -b $VIMS_TEST_TAG https://github.com/boucherv-orange/clearwater-live-test.git /src/vims-test && \ + git clone --depth 1 -b $VIMS_TAG https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater.git /src/vims && \ + git clone --depth 1 -b $VROUTER_TAG https://github.com/oolorg/opnfv-vnf-vyos-blueprint.git /src/opnfv-vnf-vyos-blueprint && \ git clone https://github.com/RebacaInc/abot_charm.git /src/epc-requirements/abot_charm && \ (cd /src/epc-requirements/abot_charm && git checkout $ABOT_TAG) && \ python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \ @@ -30,7 +34,8 @@ RUN apk --no-cache add --update \ go install -v github.com/juju/juju/... && \ rm -rf $GOPATH/go/src/ $GOPATH/pkg && \ (cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system) && \ - rm -r upper-constraints.txt /src/vims-test/.git /src/epc-requirements/abot_charm/.git && \ + rm -r upper-constraints.txt /src/vims-test/.git /src/vims/.git /src/opnfv-vnf-vyos-blueprint/.git \ + /src/epc-requirements/abot_charm/.git && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py index c2fda6888..802e8e01b 100644 --- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py +++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py @@ -250,6 +250,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) @@ -286,6 +288,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) @@ -304,10 +307,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 49b896f28..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/fraser.zip version: '122' requirements: flavor: 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 bb62f6363..49a8eb571 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: 'fraser' + version: fraser requirements: flavor: name: m1.medium -- cgit 1.2.3-korg