Re-enable orchestra tests (VNF)

"Marketplace is now running on port 8080. In addition, we have extended the
marketplace backend in order to return the last modified header so that images
are not re-downloaded all the time tests are executed. It should be done by
Monday EOB" [1]

[1]: https://jira.opnfv.org/browse/ORCHESTRA-17?jql=project%20%3D%20ORCHESTRA

JIRA: ORCHESTRA-17

Change-Id: I17f6316003be9c2c3131ed640e6a32e482d1a174
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>

diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index dea4a1e..c0eba82 100644 (file)
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -23,7 +23,6 @@ tiers:
             -
                 case_name: orchestra_openims
                 project_name: functest
-                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
@@ -38,7 +37,6 @@ tiers:
             -
                 case_name: orchestra_clearwaterims
                 project_name: functest
-                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-

diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh
index 236b763..09a3284 100644 (file)
--- a/functest/ci/download_images.sh
+++ b/functest/ci/download_images.sh
@@ -18,6 +18,7 @@ http://download.cirros-cloud.net/daily/20161201/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
+http://marketplace.openbaton.org:8080/api/v1/images/52e2ccc0-1dce-4663-894d-28aab49323aa/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 191786c..8b5cb6f 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -449,7 +449,6 @@ tiers:
             -
                 case_name: orchestra_openims
                 project_name: functest
-                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
@@ -464,7 +463,6 @@ tiers:
             -
                 case_name: orchestra_clearwaterims
                 project_name: functest
-                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-

diff --git a/functest/opnfv_tests/vnf/ims/orchestra.yaml b/functest/opnfv_tests/vnf/ims/orchestra.yaml
index 4cd18e7..457ca90 100644 (file)
--- a/functest/opnfv_tests/vnf/ims/orchestra.yaml
+++ b/functest/opnfv_tests/vnf/ims/orchestra.yaml
@@ -29,7 +29,7 @@ mano:
 orchestra_openims:
     name: OpenIMS
     descriptor:
-        url: http://marketplace.openbaton.org:8082/api/v1/nsds/fokus/OpenImsCore/3.2.0/json
+        url: http://marketplace.openbaton.org:8080/api/v1/nsds/fokus/OpenImsCore/3.2.0/json
     requirements:
         flavor:
           name: m1.small
@@ -51,7 +51,7 @@ orchestra_openims:
 orchestra_clearwaterims:
     name: Clearwater IMS
     descriptor:
-        url: http://marketplace.openbaton.org:8082/api/v1/nsds/fokus/ClearwaterIMS/3.2.0/json
+        url: http://marketplace.openbaton.org:8080/api/v1/nsds/fokus/ClearwaterIMS/3.2.0/json
     requirements:
         flavor:
           name: m1.small