Merge "Wait for refstack-client to finish"

diff --git a/docker/Dockerfile b/docker/Dockerfile
index accbf5e..924da68 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -97,8 +97,6 @@ RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwat
 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
 
-RUN add_images.sh
-
 RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
 RUN curl -L https://get.rvm.io | bash -s stable
 

diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index abd4d1a..66a73d9 100644 (file)
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -93,8 +93,6 @@ RUN git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integr
 RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test ${REPOS_VNFS_DIR}/vims-test
 RUN git clone --depth 1 https://github.com/wuwenbin2/OnosSystemTest.git ${REPOS_DIR}/onos
 
-RUN add_images.sh
-
 RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
 RUN curl -L https://get.rvm.io | bash -s stable
 

diff --git a/docker/add_images.sh b/docker/add_images.sh
deleted file mode 100644 (file)
index 93afbd2..0000000
--- a/docker/add_images.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-#
-# This script downloads the images that are used for testing
-# and places them in the functest docker image
-set -e
-
-FUNCTEST_IMAGES_DIR=${FUNCTEST_IMAGES_DIR:-/home/opnfv/functest/images}
-
-CIRROS_REPO_URL=https://download.cirros-cloud.net
-CIRROS_AARCH64_TAG=161201
-CIRROS_X86_64_TAG=0.3.5
-
-wget ${CIRROS_REPO_URL}/${CIRROS_X86_64_TAG}/cirros-${CIRROS_X86_64_TAG}-x86_64-disk.img -P ${FUNCTEST_IMAGES_DIR}
-wget ${CIRROS_REPO_URL}/${CIRROS_X86_64_TAG}/cirros-${CIRROS_X86_64_TAG}-x86_64-lxc.tar.gz -P ${FUNCTEST_IMAGES_DIR}
-wget http://artifacts.opnfv.org/onosfw/images/firewall_block_image.img -P ${FUNCTEST_IMAGES_DIR}
-
-# Add the 3-part image for aarch64, since functest can be run from an x86 machine to test an aarch64 POD
-wget ${CIRROS_REPO_URL}/daily/20${CIRROS_AARCH64_TAG}/cirros-d${CIRROS_AARCH64_TAG}-aarch64-disk.img -P ${FUNCTEST_IMAGES_DIR}
-wget ${CIRROS_REPO_URL}/daily/20${CIRROS_AARCH64_TAG}/cirros-d${CIRROS_AARCH64_TAG}-aarch64-initramfs -P ${FUNCTEST_IMAGES_DIR}
-wget ${CIRROS_REPO_URL}/daily/20${CIRROS_AARCH64_TAG}/cirros-d${CIRROS_AARCH64_TAG}-aarch64-kernel -P ${FUNCTEST_IMAGES_DIR}

diff --git a/docs/release/release-notes/functest-release.rst b/docs/release/release-notes/functest-release.rst
index fe49657..1ddaf70 100644 (file)
--- a/docs/release/release-notes/functest-release.rst
+++ b/docs/release/release-notes/functest-release.rst
@@ -30,16 +30,24 @@ Version history
 | **Date**   | **Ver.** | **Author**       | **Comment**            |
 |            |          |                  |                        |
 +------------+----------+------------------+------------------------+
-| 2016-08-17 | 1.0.0    | Morgan Richomme  | Functest for Colorado  |
-|            |          | (Orange)         | release                |
+| 2016-08-17 | 1.0.0    | Morgan Richomme  | Functest for           |
+|            |          | (Orange)         | Colorado.1.0 release   |
 +------------+----------+------------------+------------------------+
-| 2017-03-29 | 4.0.0    | Jose Lausuch     | Functest for Danube    |
-|            |          | (Ericsson)       | release                |
+| 2016-10-24 | 2.0.0    | Morgan Richomme  | Functest for           |
+|            |          | (Orange)         | Colorado.2.0 release   |
 +------------+----------+------------------+------------------------+
-| 2017-05-04 | 5.0.0    | Jose Lausuch     | Functest for Danube.2.0|
-|            |          | (Ericsson)       | release                |
+| 2016-08-17 | 3.0.0    | Morgan Richomme  | Functest for           |
+|            |          | (Orange)         | Colorado.3.0 release   |
++------------+----------+------------------+------------------------+
+| 2017-03-29 | 4.0.0    | Jose Lausuch     | Functest for           |
+|            |          | (Ericsson)       | Danube.1.0 release     |
++------------+----------+------------------+------------------------+
+| 2017-05-04 | 5.0.0    | Jose Lausuch     | Functest for           |
+|            |          | (Ericsson)       | Danube.2.0 release     |
++------------+----------+------------------+------------------------+
+| 2017-07-12 | 6.0.0    | Jose Lausuch     | Functest for           |
+|            |          | (Ericsson)       | Danube.3.0 release     |
 +------------+----------+------------------+------------------------+
-
 
 OPNFV Danube Release
 ======================
@@ -96,16 +104,16 @@ Release Data
 | **Project**                          | functest                             |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Repo/tag**                         | danube.2.0                           |
+| **Repo/tag**                         | danube.3.0                           |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 | **Release designation**              | Danube service release               |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release date**                     | May 4st 2017                         |
+| **Release date**                     | July 14th 2017                       |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Purpose of the delivery**          | Danube second release                |
+| **Purpose of the delivery**          | Danube third release                 |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 
@@ -115,87 +123,42 @@ Deliverables
 Software
 --------
 
- - The Functest Docker image: https://hub.docker.com/r/opnfv/functest (tag: danube.2.0)
+ - The Functest Docker image: https://hub.docker.com/r/opnfv/functest (tag: danube.3.0)
 
- - The TestAPI Docker image: https://hub.docker.com/r/opnfv/testapi (tag:danube.2.0)
+ - The TestAPI Docker image: https://hub.docker.com/r/opnfv/testapi (tag:danube.3.0)
 
 
 Documents
 ---------
 
- - Installation/configuration guide: http://docs.opnfv.org/en/latest/submodules/functest/docs/testing/user/configguide/index.html
+ - Installation/configuration guide: http://docs.opnfv.org/en/stable-danube/submodules/functest/docs/testing/user/configguide/index.html
 
- - User Guide: http://docs.opnfv.org/en/latest/submodules/functest/docs/testing/user/userguide/index.html
+ - User Guide: http://docs.opnfv.org/en/stable-danube/submodules/functest/docs/testing/user/userguide/index.html
 
- - Developer Guide: http://docs.opnfv.org/en/latest/submodules/functest/docs/testing/developer/devguide/index.html
+ - Developer Guide: http://docs.opnfv.org/en/stable-danube/submodules/functest/docs/testing/developer/devguide/index.html
 
 
 Version change
 ==============
 
-Feature evolution
------------------
 
-- Adoption of SNAPS as middleware in 4 new test cases (connection_check, api_check,
-   snaps_health_check and snaps_smoke)
+- Bugfixes in refstack client
 
-- Introduction of refstack suite
+- Fixed vIMS onboarding and ims deployment
 
-- Support new odl suites (odl-netvirt, fds)
+- Increased timeout of OpenBaton installation
 
-- Introduction of VNF onboarding capabilities
+- Switched to mitaka-eol in openstack repositories, as stable/mitake is not longer existing
 
-- Support of new feature projects (fds, netready, barometer, orchestra, vyos_vrouter)
-
-
-
-Framework
----------
+- Minor fixes in logging and test cases
 
- - Harmonization of the naming, better adoption of OpenStack coding conventions
-
- - Enhanced code to be more Object Oriented, removed bash scripts
-
- - Introduction of abstraction classes to ease and harmonize the integration of
-    test cases (internal or from feature projects)
-
- - New management of logger, env variables and configuration files
-
- - Creation of unit tests on the whole framework to ensure stability
-
- - Creation or ARM Functest docker
-
-
-Test API
----------
-
-- Automatic documentation (html & pdf)
-
-- Full dockerization and automation of the deployment on testresults.opnfv.org
-
-- Automation of test database backup on artifact
-
-
-New internal tests cases
-------------------------
-
-- connection_check
-
-- api_check
-
-- snaps_health_check (replacing shell script healtcheck)
-
-- refstack_defcore
-
-- snaps_smoke
-
-- vyos_vrouter
+- 3 scenarios have been successfully executed on aarch64 architectures on Fuel deployments (nosdn, odl_l2 and odl_l3)
 
 
 Scenario Matrix
 ===============
 
-For Danube 2.0, Functest was tested on the following HA scenarios (new
+For Danube 3.0, Functest was tested on the following HA scenarios (new
 dabube scenarios in bold):
 
 +---------------------+---------+---------+---------+---------+
@@ -314,23 +277,23 @@ Apex
 |  Scenario        | Scoring | Success |    Results      |
 |                  |         | rate    |                 |
 +==================+=========+=========+=================+
-| nosdn            |  30/33  |    91%  | `apex-res-1`_   |
+| nosdn            |  20/30  |    67%  | `apex-res-1`_   |
 +------------------+---------+---------+-----------------+
-| odl_l3           |  23/33  |    70%  | `apex-res-2`_   |
+| odl_l3           |  16/30  |    53%  | `apex-res-2`_   |
 +------------------+---------+---------+-----------------+
-| odl-bgpvpn       |  16/36  |    44%  | `apex-res-3`_   |
+| odl-bgpvpn       |  18/33  |    56%  | `apex-res-3`_   |
 +------------------+---------+---------+-----------------+
-| odl-gluon        |  18/36  |    50%  | `apex-res-4`_   |
+| odl-gluon        |  20/33  |    61%  | `apex-res-4`_   |
 +------------------+---------+---------+-----------------+
-| kvm              |  30/33  |    91%  | `apex-res-5`_   |
+| kvm              |  20/30  |    67%  | `apex-res-5`_   |
 +------------------+---------+---------+-----------------+
-| odl_l2-fdio      |  30/36  |    83%  | `apex-res-6`_   |
+| odl_l2-fdio      |  25/33  |    76%  | `apex-res-6`_   |
 +------------------+---------+---------+-----------------+
-| odl_l2-fdio-noha |  29/36  |    81%  | `apex-res-7`_   |
+| odl_l2-fdio-noha |  24/33  |    73%  |   local push    |
 +------------------+---------+---------+-----------------+
-| odl_l3-fdio-noha |  23/30  |    77%  | `apex-res-8`_   |
+| odl_l3-fdio-noha |  18/30  |    60%  |   local push    |
 +------------------+---------+---------+-----------------+
-| fdio             |   6/30  |    20%  | `apex-res-9`_   |
+| fdio             |  25/27  |    93%  |   local push    |
 +------------------+---------+---------+-----------------+
 
 Compass
@@ -344,13 +307,11 @@ Compass
 +------------------+---------+---------+------------------+
 | odl_l2           |  29/33  |    88%  | `compass-res-2`_ |
 +------------------+---------+---------+------------------+
-| odl_l3           |  25/30  |    83%  | `compass-res-3`_ |
-+------------------+---------+---------+------------------+
-| onos             |  28/33  |    84%  | `compass-res-4`_ |
+| odl_l3           |  23/30  |    77%  | `compass-res-3`_ |
 +------------------+---------+---------+------------------+
-| openo            |  29/30  |    97%  | `compass-res-5`_ |
+| onos             |  29/30  |    97%  | `compass-res-4`_ |
 +------------------+---------+---------+------------------+
-| ocl              |   3/30  |    10%  | `compass-res-6`_ |
+| onos-sfc         |  20/36  |    56%  | `compass-res-5`_ |
 +------------------+---------+---------+------------------+
 
 Note: all the Compass tests for Danube have been executed on virtual
@@ -364,7 +325,7 @@ Fuel
 |  Scenario            | Scoring | Success |  Results       |
 |                      |         | rate    |                |
 +======================+=========+=========+================+
-| nosdn                |  38/39  |   97%   | `fuel-res-1`_  |
+| nosdn                |  39/39  |  100%   | `fuel-res-1`_  |
 +----------------------+---------+---------+----------------+
 | nosdn-noha           |  36/36  |  100%   | `fuel-res-2`_  |
 +----------------------+---------+---------+----------------+
@@ -376,25 +337,25 @@ Fuel
 +----------------------+---------+---------+----------------+
 | nosdn-ovs-noha       |  36/36  |  100%   | `fuel-res-6`_  |
 +----------------------+---------+---------+----------------+
-| odl_l2               |  40/42  |   95%   | `fuel-res-7`_  |
+| odl_l2               |  42/42  |  100%   | `fuel-res-7`_  |
 +----------------------+---------+---------+----------------+
-| odl_l2-noha          |  37/39  |   95%   | `fuel-res-8`_  |
+| odl_l2-noha          |  39/39  |  100%   | `fuel-res-8`_  |
 +----------------------+---------+---------+----------------+
 | odl_l2-sfc           |  45/45  |  100%   | `fuel-res-9`_  |
 +----------------------+---------+---------+----------------+
-| odl_l2-sfc-noha      |  36/42  |   86%   | `fuel-res-10`_ |
+| odl_l2-sfc-noha      |  35/42  |   83%   | `fuel-res-10`_ |
 +----------------------+---------+---------+----------------+
-| odl_l3               |  38/39  |   97%   | `fuel-res-11`_ |
+| odl_l3               |  36/39  |   92%   | `fuel-res-11`_ |
 +----------------------+---------+---------+----------------+
 | odl_l3-noha          |  36/36  |  100%   | `fuel-res-12`_ |
 +----------------------+---------+---------+----------------+
-| kvm_ovs_dpdk         |   6/39  |   15%   | `fuel-res-13`_ |
+| kvm_ovs_dpdk         |  39/39  |  100%   | `fuel-res-13`_ |
 +----------------------+---------+---------+----------------+
-| kvm_ovs_dpdk_noha    |  36/36  |  100%   | `fuel-res-14`_ |
+| kvm_ovs_dpdk_noha    |  35/36  |   97%   | `fuel-res-14`_ |
 +----------------------+---------+---------+----------------+
-| kvm_ovs_dpdk_bar     |   6/42  |   14%   | `fuel-res-15`_ |
+| kvm_ovs_dpdk_bar     |  42/42  |  100%   | `fuel-res-15`_ |
 +----------------------+---------+---------+----------------+
-| kvm_ovs_dpdk_bar_noha|  38/39  |   97%   | `fuel-res-16`_ |
+| kvm_ovs_dpdk_bar_noha|  36/39  |   92%   | `fuel-res-16`_ |
 +----------------------+---------+---------+----------------+
 
 
@@ -407,15 +368,15 @@ Joid
 |  Scenario           | Scoring | Success |  Results      |
 |                     |         | rate    |               |
 +=====================+=========+=========+===============+
-| nosdn               |  29/33  |   97%   | `joid-res-1`_ |
+| nosdn               |  30/30  |  100%   | `joid-res-1`_ |
 +---------------------+---------+---------+---------------+
-| nosdn-noha          |  33/33  |  100%   | `joid-res-2`_ |
+| nosdn-noha          |  10/30  |   33%   | `joid-res-2`_ |
 +---------------------+---------+---------+---------------+
-| nosdn-lxd           |  18/24  |   75%   | `joid-res-3`_ |
+| nosdn-lxd           |  19/21  |   90%   | `joid-res-3`_ |
 +---------------------+---------+---------+---------------+
-| nosdn-lxd-noha      |  18/24  |   71%   | `joid-res-4`_ |
+| nosdn-lxd-noha      |  15/21  |   71%   | `joid-res-4`_ |
 +---------------------+---------+---------+---------------+
-| odl_l2              |   9/36  |   25%   | `joid-res-5`_ |
+| odl_l2              |   6/33  |   18%   | `joid-res-5`_ |
 +---------------------+---------+---------+---------------+
 
 It is highly recommended to install a json viewer in your browser
@@ -525,75 +486,70 @@ Useful links
 
 .. _`gluon-bug`: https://bugs.opendaylight.org/show_bug.cgi?id=5586
 
-.. _`apex-res-1`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-apex-apex-daily-danube-daily-danube-222
-
-.. _`apex-res-2`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-apex-apex-daily-danube-daily-danube-211
 
-.. _`apex-res-3`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-apex-apex-daily-danube-daily-danube-224
+.. _`apex-res-1`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-apex-baremetal-daily-danube-455
 
-.. _`apex-res-4`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-apex-apex-daily-danube-daily-danube-225
+.. _`apex-res-2`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-apex-baremetal-daily-danube-466
 
-.. _`apex-res-5`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-apex-apex-daily-danube-daily-danube-216
+.. _`apex-res-3`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-apex-baremetal-daily-danube-449
 
-.. _`apex-res-6`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-apex-apex-daily-danube-daily-danube-215
+.. _`apex-res-4`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-apex-baremetal-daily-danube-450
 
-.. _`apex-res-7`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-apex-apex-daily-danube-daily-danube-214
+.. _`apex-res-5`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-apex-baremetal-daily-danube-461
 
-.. _`apex-res-8`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-apex-apex-daily-danube-daily-danube-217
+.. _`apex-res-6`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-apex-baremetal-daily-danube-485
 
-.. _`apex-res-9`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-apex-apex-daily-danube-daily-danube-218
 
-.. _`compass-res-1`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-compass-virtual-daily-danube-216
+.. _`compass-res-1`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-compass-virtual-daily-danube-484
 
-.. _`compass-res-2`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-compass-virtual-daily-danube-221
+.. _`compass-res-2`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-compass-virtual-daily-danube-454
 
-.. _`compass-res-3`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-compass-baremetal-daily-danube-214
+.. _`compass-res-3`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-compass-baremetal-daily-danube-482
 
-.. _`compass-res-4`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-compass-virtual-daily-danube-213
+.. _`compass-res-4`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-compass-virtual-daily-danube-481
 
-.. _`compass-res-5`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-compass-baremetal-daily-danube-212
+.. _`compass-res-5`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-compass-baremetal-daily-danube-453
 
-.. _`compass-res-6`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-compass-baremetal-daily-danube-222
 
 .. _`fuel-res-1`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-baremetal-daily-danube-54
 
-.. _`fuel-res-2`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-virtual-daily-danube-357
+.. _`fuel-res-2`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-virtual-daily-danube-937
 
-.. _`fuel-res-3`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-baremetal-daily-danube-53
+.. _`fuel-res-3`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-baremetal-daily-danube-873
 
-.. _`fuel-res-4`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-virtual-daily-danube-355
+.. _`fuel-res-4`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-virtual-daily-danube-935
 
-.. _`fuel-res-5`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-baremetal-daily-danube-335
+.. _`fuel-res-5`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-baremetal-daily-danube-875
 
-.. _`fuel-res-6`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-virtual-daily-danube-356
+.. _`fuel-res-6`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-virtual-daily-danube-936
 
-.. _`fuel-res-7`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-zte-pod1-daily-danube-337
+.. _`fuel-res-7`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-baremetal-daily-danube-867
 
-.. _`fuel-res-8`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-virtual-daily-danube-358
+.. _`fuel-res-8`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-virtual-daily-danube-939
 
-.. _`fuel-res-9`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-baremetal-daily-danube-340
+.. _`fuel-res-9`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-baremetal-daily-danube-870
 
-.. _`fuel-res-10`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-virtual-daily-danube-353
+.. _`fuel-res-10`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-virtual-daily-danube-933
 
-.. _`fuel-res-11`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-baremetal-daily-danube-338
+.. _`fuel-res-11`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-baremetal-daily-danube-868
 
-.. _`fuel-res-12`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-virtual-daily-danube-360
+.. _`fuel-res-12`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-virtual-daily-danube-940
 
-.. _`fuel-res-13`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-baremetal-daily-danube-341
+.. _`fuel-res-13`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-baremetal-daily-danube-871
 
-.. _`fuel-res-14`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-virtual-daily-danube-359
+.. _`fuel-res-14`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-virtual-daily-danube-938
 
-.. _`fuel-res-15`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-baremetal-daily-danube-339
+.. _`fuel-res-15`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-baremetal-daily-danube-869
 
-.. _`fuel-res-16`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-virtual-daily-danube-361
+.. _`fuel-res-16`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-fuel-virtual-daily-danube-941
 
 
-.. _`joid-res-1`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-joid-baremetal-daily-danube-164
+.. _`joid-res-1`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-joid-baremetal-daily-danube-298
 
-.. _`joid-res-2`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-joid-baremetal-daily-danube-150
+.. _`joid-res-2`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-joid-baremetal-daily-danube-260
 
-.. _`joid-res-3`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-joid-baremetal-daily-danube-162
+.. _`joid-res-3`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-joid-baremetal-daily-danube-281
 
-.. _`joid-res-4`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-joid-baremetal-daily-danube-167
+.. _`joid-res-4`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-joid-baremetal-daily-danube-301
 
-.. _`joid-res-5`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-joid-baremetal-daily-danube-165
+.. _`joid-res-5`: http://testresults.opnfv.org/test/api/v1/results?build_tag=jenkins-functest-joid-baremetal-daily-danube-291 

diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh
index 23e09c1..dd3e378 100644 (file)
--- a/functest/ci/download_images.sh
+++ b/functest/ci/download_images.sh
@@ -8,31 +8,55 @@ RED='\033[1;31m'
 NC='\033[0m' # No Color
 
 function usage(){
-    echo -e "${RED}USAGE: $script <destination_folder>${NC}"
+    echo -e "${RED}USAGE: $script <destination_folder> <scenario_name> [arch]${NC}"
     exit 0
 }
 
 script=`basename "$0"`
 IMAGES_FOLDER_DIR=$1
+SCENARIO=$2
+ARCH=$3
 
 if [[ -z $IMAGES_FOLDER_DIR ]]; then usage; fi;
 
 set -ex
 mkdir -p ${IMAGES_FOLDER_DIR}
 
+
+####################
+# MANDATORY IMAGES #
+####################
+# These images should be present in Functest for the tests to work
+
+# Functest:
 wget -nc ${CIRROS_REPO_URL}/${CIRROS_X86_64_TAG}/cirros-${CIRROS_X86_64_TAG}-x86_64-disk.img -P ${IMAGES_FOLDER_DIR}
 wget -nc ${CIRROS_REPO_URL}/${CIRROS_X86_64_TAG}/cirros-${CIRROS_X86_64_TAG}-x86_64-lxc.tar.gz -P ${IMAGES_FOLDER_DIR}
-wget -nc http://artifacts.opnfv.org/sdnvpn/ubuntu-16.04-server-cloudimg-amd64-disk1.img -P ${IMAGES_FOLDER_DIR}
-
-# Add 3rd-party images for aarch64, since Functest can be run on an x86 machine to test an aarch64 POD
-wget -nc ${CIRROS_REPO_URL}/daily/20${CIRROS_AARCH64_TAG}/cirros-d${CIRROS_AARCH64_TAG}-aarch64-disk.img -P ${IMAGES_FOLDER_DIR}
-wget -nc ${CIRROS_REPO_URL}/daily/20${CIRROS_AARCH64_TAG}/cirros-d${CIRROS_AARCH64_TAG}-aarch64-initramfs -P ${IMAGES_FOLDER_DIR}
-wget -nc ${CIRROS_REPO_URL}/daily/20${CIRROS_AARCH64_TAG}/cirros-d${CIRROS_AARCH64_TAG}-aarch64-kernel -P ${IMAGES_FOLDER_DIR}
 
-# Add Ubuntu 14 qcow2 image
+# SNAPS:
 wget -nc http://uec-images.ubuntu.com/releases/trusty/14.04/ubuntu-14.04-server-cloudimg-amd64-disk1.img -P ${IMAGES_FOLDER_DIR}
-
-# Add Centos 7 qcow2 image
 wget -nc http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2 -P ${IMAGES_FOLDER_DIR}
 
+
+###################
+# OPTIONAL IMAGES #
+###################
+# Optional images can be commented if they are not going to be used by the tests
+
+# SDNVPN (odl-bgpvpn scenarios):
+if [[ ${SCENARIO} == *"bgpvpn"* ]]; then
+    wget -nc http://artifacts.opnfv.org/sdnvpn/ubuntu-16.04-server-cloudimg-amd64-disk1.img -P ${IMAGES_FOLDER_DIR}
+fi
+
+# ONOS (onos-sfc scenarios):
+if [[ ${SCENARIO} == *"onos-sfc"* ]]; then
+    wget -nc http://artifacts.opnfv.org/onosfw/images/firewall_block_image.img -P ${IMAGES_FOLDER_DIR}
+fi
+
+if [[ ${ARCH} == "arm" ]] || [[ ${ARCH} == "aarch64" ]]; then
+    # ARM (aarch64 cirros images):
+    wget -nc ${CIRROS_REPO_URL}/daily/20${CIRROS_AARCH64_TAG}/cirros-d${CIRROS_AARCH64_TAG}-aarch64-disk.img -P ${IMAGES_FOLDER_DIR}
+    wget -nc ${CIRROS_REPO_URL}/daily/20${CIRROS_AARCH64_TAG}/cirros-d${CIRROS_AARCH64_TAG}-aarch64-initramfs -P ${IMAGES_FOLDER_DIR}
+    wget -nc ${CIRROS_REPO_URL}/daily/20${CIRROS_AARCH64_TAG}/cirros-d${CIRROS_AARCH64_TAG}-aarch64-kernel -P ${IMAGES_FOLDER_DIR}
+fi
+
 set +ex
\ No newline at end of file

diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index ede0fc5..5724012 100644 (file)
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -234,7 +234,7 @@ class ODLTests(testcase.TestCase):
             elif installer_type == 'joid':
                 kwargs['odlip'] = os.environ['SDN_CONTROLLER']
             elif installer_type == 'compass':
-                kwargs['odlwebport'] = '8181'
+                kwargs['odlrestconfport'] = '8080'
             elif installer_type == 'daisy':
                 kwargs['odlip'] = os.environ['SDN_CONTROLLER_IP']
                 kwargs['odlwebport'] = '8181'

diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
index 8c8a6ce..8aeea41 100644 (file)
--- a/functest/tests/unit/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -511,7 +511,7 @@ class ODLRunTesting(ODLTesting):
     def test_compass(self):
         os.environ["INSTALLER_TYPE"] = "compass"
         self._test_run(testcase.TestCase.EX_OK,
-                       odlip=self._neutron_ip, odlwebport='8181')
+                       odlip=self._neutron_ip, odlrestconfport='8080')
 
     def test_daisy_no_controller_ip(self):
         with mock.patch('functest.utils.openstack_utils.get_endpoint',

diff --git a/setup.cfg b/setup.cfg
index e29259f..7630a17 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,7 +7,6 @@ home-page = https://wiki.opnfv.org/display/functest
 packages = functest
 scripts =
     docker/docker_remote_api/enable_remote_api.sh
-    docker/add_images.sh
     docker/config_install_env.sh
     functest/ci/download_images.sh