diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-08-29 07:42:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-29 07:42:08 +0000 |
| commit | 540f46cc10b42df1c3fe7822e1d533b57adb9e34 (patch) | |
| tree | 8a3d023b4a597f12d5fe4c0bca4193d5bb593ee1 /functest/ci | |
| parent | 85ed13e38245eee2c957e76cd6834aa6668d6293 (diff) | |
| parent | 0a56dfd7f42d6a6d849e5cf3f82b0863c8a62ffe (diff) | |
Merge "Refactor the vyos_vrouter to adopt VNF abstraction"
Diffstat (limited to 'functest/ci')
| -rw-r--r-- | functest/ci/config_functest.yaml | 6 | ||||
| -rw-r--r-- | functest/ci/download_images.sh | 1 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index a04a5996..5ff5c824 100644 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -11,12 +11,12 @@ general: repo_odl_test: /src/odl_test repo_fds: /src/fds repo_securityscan: /home/opnfv/repos/securityscanning - repo_vrouter: /home/opnfv/repos/vnfs/vrouter functest: /home/opnfv/functest results: /home/opnfv/functest/results functest_conf: /home/opnfv/functest/conf functest_data: /home/opnfv/functest/data ims_data: /home/opnfv/functest/data/ims/ + router_data: /home/opnfv/functest/data/router/ functest_images: /home/opnfv/functest/images rally_inst: /root/.rally @@ -153,6 +153,10 @@ vnf: tenant_name: orchestra_clearwaterims tenant_description: Clearwater IMS deployed with Open Baton config: orchestra.yaml + vyos_vrouter: + tenant_name: vrouter + tenant_description: vRouter + config: cloudify_vrouter.yaml promise: tenant_name: promise diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh index 47c8f867..2f7a207d 100644 --- a/functest/ci/download_images.sh +++ b/functest/ci/download_images.sh @@ -18,6 +18,7 @@ http://artifacts.opnfv.org/functest/images/cirros-d161201-aarch64-initramfs http://artifacts.opnfv.org/functest/images/cirros-d161201-aarch64-kernel https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-arm64-uefi1.img http://cloud.centos.org/altarch/7/images/aarch64/CentOS-7-aarch64-GenericCloud.qcow2.xz +https://sourceforge.net/projects/ool-opnfv/files/vyos-1.1.7.img EOF xz --decompress --force --keep ${1:-/home/opnfv/functest/images}/CentOS-7-aarch64-GenericCloud.qcow2.xz diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 64ca1f48..9f9e402a 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -476,7 +476,6 @@ tiers: - case_name: vyos_vrouter - enabled: false project_name: functest criteria: 100 blocking: false @@ -486,5 +485,5 @@ tiers: installer: 'fuel' scenario: 'nosdn-nofeature' run: - module: 'functest.opnfv_tests.vnf.router.vyos_vrouter' - class: 'VrouterVnf' + module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter' + class: 'CloudifyVrouter' |