Add all ODL testcases in functest-smoke

It clones the related git repositories in /src and adapts the former
Dockerfiles too.

Change-Id: Ied5016f8cd5ed49f4e29bae5aa4413fad2477637
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

6 files changed, 77 insertions, 12 deletions

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 924da6847..a87ecc46f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -89,10 +89,10 @@ RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino ${REPO
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/doctor ${REPOS_DIR}/doctor
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/promise ${REPOS_DIR}/promise
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/netready ${REPOS_DIR}/netready
-RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/fds ${REPOS_DIR}/fds
+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 ${REPOS_DIR}/odl_test
+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 ${REPOS_VNFS_DIR}/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
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 22ff2eb3a..223ed64d0 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -2,6 +2,7 @@ FROM opnfv/functest-core
 
 ARG BRANCH=master
 ARG OPENSTACK_TAG=stable/ocata
+ARG ODL_TAG=release/beryllium-sr4
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
 RUN apk --no-cache add --virtual .build-deps --update \
@@ -11,9 +12,12 @@ RUN apk --no-cache add --virtual .build-deps --update \
         -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
         -rthirdparty-requirements.txt && \
+    git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
+    git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/fds /src/fds && \
     ln -s /src/tempest /src/refstack-client/.tempest && \
     virtualenv --system-site-packages /src/tempest/.venv && \
-    rm -r thirdparty-requirements.txt /src/refstack-client/.git && \
+    rm -r thirdparty-requirements.txt /src/refstack-client/.git /src/odl_test/.git \
+        /src/fds/.git && \
     apk del .build-deps
 COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
 CMD ["bash","-c","prepare_env start && run_tests -t all"]
diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index 69ea038a4..772196a00 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -85,6 +85,67 @@ tiers:
                     class: 'RefstackClient'
 
             -
+                case_name: odl
+                project_name: functest
+                criteria: 100
+                blocking: true
+                description: >-
+                    Test Suite for the OpenDaylight SDN Controller. It
+                    integrates some test suites from upstream using
+                    Robot as the test framework.
+                dependencies:
+                    installer: ''
+                    scenario: 'odl'
+                run:
+                    module: 'functest.opnfv_tests.sdn.odl.odl'
+                    class: 'ODLTests'
+                    args:
+                        suites:
+                            -  /src/odl_test/csit/suites/integration/basic
+                            -  /src/odl_test/csit/suites/openstack/neutron
+
+            -
+                case_name: odl_netvirt
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    Test Suite for the OpenDaylight SDN Controller when
+                    the NetVirt features are installed. It integrates
+                    some test suites from upstream using Robot as the
+                    test framework.
+                dependencies:
+                    installer: 'apex'
+                    scenario: 'os-odl_l3-nofeature'
+                run:
+                    module: 'functest.opnfv_tests.sdn.odl.odl'
+                    class: 'ODLTests'
+                    args:
+                        suites:
+                            -  /src/odl_test/csit/suites/integration/basic
+                            -  /src/odl_test/csit/suites/openstack/neutron
+                            -  /src/odl_test/csit/suites/openstack/connectivity
+
+            -
+                case_name: fds
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    Test Suite for the OpenDaylight SDN Controller when GBP features are
+                    installed. It integrates some test suites from upstream using
+                    Robot as the test framework.
+                dependencies:
+                    installer: 'apex'
+                    scenario: 'odl.*-fdio'
+                run:
+                    module: 'functest.opnfv_tests.sdn.odl.odl'
+                    class: 'ODLTests'
+                    args:
+                        suites:
+                            -  /src/fds/testing/robot
+
+            -
                 case_name: snaps_smoke
                 project_name: functest
                 criteria: 100
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index e26b31398..8da1d6172 100644
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -12,7 +12,8 @@ general:
         repo_doctor:        /home/opnfv/repos/doctor
         repo_copper:        /home/opnfv/repos/copper
         repo_domino:        /home/opnfv/repos/domino
-        repo_fds:           /home/opnfv/repos/fds
+        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
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 6a589c9b1..c6aa63623 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -162,8 +162,8 @@ tiers:
                     class: 'ODLTests'
                     args:
                         suites:
-                            -  /home/opnfv/repos/odl_test/csit/suites/integration/basic
-                            -  /home/opnfv/repos/odl_test/csit/suites/openstack/neutron
+                            -  /src/odl_test/csit/suites/integration/basic
+                            -  /src/odl_test/csit/suites/openstack/neutron
 
             -
                 case_name: odl_netvirt
@@ -183,9 +183,9 @@ tiers:
                     class: 'ODLTests'
                     args:
                         suites:
-                            -  /home/opnfv/repos/odl_test/csit/suites/integration/basic
-                            -  /home/opnfv/repos/odl_test/csit/suites/openstack/neutron
-                            -  /home/opnfv/repos/odl_test/csit/suites/openstack/connectivity
+                            -  /src/odl_test/csit/suites/integration/basic
+                            -  /src/odl_test/csit/suites/openstack/neutron
+                            -  /src/odl_test/csit/suites/openstack/connectivity
 
             -
                 case_name: fds
@@ -204,7 +204,7 @@ tiers:
                     class: 'ODLTests'
                     args:
                         suites:
-                            -  /home/opnfv/repos/fds/testing/robot
+                            -  /src/fds/testing/robot
 
             -
                 case_name: onos
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index 5724012ca..841da834b 100644
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -66,8 +66,7 @@ class ODLResultVisitor(robot.api.ResultVisitor):
 class ODLTests(testcase.TestCase):
     """ODL test runner."""
 
-    odl_test_repo = os.path.join(
-        constants.CONST.__getattribute__('dir_repos'), 'odl_test')
+    odl_test_repo = constants.CONST.__getattribute__('dir_repo_odl_test')
     neutron_suite_dir = os.path.join(odl_test_repo,
                                      "csit/suites/openstack/neutron")
     basic_suite_dir = os.path.join(odl_test_repo,