aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2017-08-29 07:42:08 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-29 07:42:08 +0000
commit540f46cc10b42df1c3fe7822e1d533b57adb9e34 (patch)
tree8a3d023b4a597f12d5fe4c0bca4193d5bb593ee1 /docker
parent85ed13e38245eee2c957e76cd6834aa6668d6293 (diff)
parent0a56dfd7f42d6a6d849e5cf3f82b0863c8a62ffe (diff)
Merge "Refactor the vyos_vrouter to adopt VNF abstraction"
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile2
-rw-r--r--docker/vnf/testcases.yaml14
2 files changed, 14 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5687b31e..d60ce53b 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,7 +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
# Install tempest venv and create symlink for running refstack-client
RUN ln -s /src/tempest /src/refstack-client/.tempest \
diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index 9f653393..8aa2c795 100644
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -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'