diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 2 | ||||
| -rw-r--r-- | docker/vnf/testcases.yaml | 16 |
3 files changed, 16 insertions, 8 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 0e896d6d2..d60ce53b3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,7 +17,6 @@ ARG RALLY_TAG=0.8.1 ARG ODL_TAG=release/carbon ARG OPENSTACK_TAG=stable/ocata ARG VIMS_TAG=stable -ARG VROUTER_TAG=stable ARG REPOS_DIR=/home/opnfv/repos ARG FUNCTEST_BASE_DIR=/home/opnfv/functest ARG FUNCTEST_CONF_DIR=${FUNCTEST_BASE_DIR}/conf @@ -93,11 +92,6 @@ RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/fds /src/fds # other repositories RUN git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test /src/vims-test -RUN git clone --depth 1 -b $VROUTER_TAG https://github.com/oolorg/opnfv-functest-vrouter.git ${REPOS_VNFS_DIR}/vrouter -RUN git clone --depth 1 https://github.com/wuwenbin2/OnosSystemTest.git ${REPOS_DIR}/onos - -# SFC integration -RUN /bin/bash -c ". /usr/local/lib/python2.7/dist-packages/sfc/tests/functest/setup_scripts/tacker_client_install.sh" # Install tempest venv and create symlink for running refstack-client RUN ln -s /src/tempest /src/refstack-client/.tempest \ diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml index 0af4487e2..ec9962f7a 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -54,7 +54,7 @@ tiers: module: 'functest.core.feature' class: 'BashFeature' args: - cmd: '. /home/opnfv/functest/conf/stackrc && security_scan --config /usr/local/etc/securityscanning/config.ini' + cmd: '. /home/opnfv/functest/conf/stackrc && security_scan --config /usr/etc/securityscanning/config.ini' - case_name: functest-odl-sfc diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml index 9f6533930..c0eba8225 100644 --- a/docker/vnf/testcases.yaml +++ b/docker/vnf/testcases.yaml @@ -9,7 +9,7 @@ tiers: - case_name: cloudify_ims project_name: functest - criteria: 100 + criteria: 80 blocking: false description: >- This test case deploys an OpenSource vIMS solution from Clearwater @@ -47,3 +47,17 @@ tiers: run: module: 'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims' class: 'ClearwaterImsVnf' + + - + case_name: vyos_vrouter + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case is vRouter testing. + dependencies: + installer: 'fuel' + scenario: 'nosdn-nofeature' + run: + module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter' + class: 'CloudifyVrouter' |