Integrate Stor4NFV feature openstack test case

Change-Id: I245d0fbe8f026a24138ede4041caae4dccc15cc0
Signed-off-by: Qiaowei Ren <qiaowei.ren@intel.com>

diff --git a/ci/run.yaml b/ci/run.yaml
index ad2a225..28a5f82 100644 (file)
--- a/ci/run.yaml
+++ b/ci/run.yaml
@@ -167,6 +167,7 @@
       - barometercollectd
       - fds
       - vgpu
+      - stor4nfv_os
     jobs:
       - '{repo}-{container}-{test}-{tag}-run'
 
@@ -183,6 +184,7 @@
             - name: '{repo}-functest-features-barometercollectd-{tag}-run'
             - name: '{repo}-functest-features-fds-{tag}-run'
             - name: '{repo}-functest-features-vgpu-{tag}-run'
+            - name: '{repo}-functest-features-stor4nfv_os-{tag}-run'
 
 - project:
     name: '{repo}-functest-features-{tag}-run'

diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml
index 3912b3d..1384511 100644 (file)
--- a/docker/features/testcases.yaml
+++ b/docker/features/testcases.yaml
@@ -94,3 +94,17 @@ tiers:
                 run:
                     module: 'functest.opnfv_tests.openstack.vgpu.vgpu'
                     class: 'vGPU'
+
+            -
+                case_name: stor4nfv_os
+                project_name: stor4nfv
+                criteria: 100
+                blocking: false
+                description: >-
+                    This tests are necessary demonstrate conformance
+                    of the OpenStack+Stor4NFV deployment.
+                dependencies:
+                    - DEPLOY_SCENARIO: 'stor4nfv'
+                run:
+                    module: 'stor4nfv_tests.stor4nfv_os'
+                    class: 'OsStor4nfvTest'

diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt
index 73c11b4..510b3e6 100644 (file)
--- a/docker/features/thirdparty-requirements.txt
+++ b/docker/features/thirdparty-requirements.txt
@@ -4,4 +4,5 @@ robotframework-sshlibrary;python_version=='2.7'
 baro_tests
 sdnvpn
 sfc
+stor4nfv_tests
 doctor-tests;python_version>='3.0'

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 72b0ba8..6efdfb1 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -491,6 +491,20 @@ tiers:
                     module: 'functest.opnfv_tests.openstack.vgpu.vgpu'
                     class: 'vGPU'
 
+            -
+                case_name: stor4nfv_os
+                project_name: stor4nfv
+                criteria: 100
+                blocking: false
+                description: >-
+                    This tests are necessary demonstrate conformance
+                    of the OpenStack+Stor4NFV deployment.
+                dependencies:
+                    - DEPLOY_SCENARIO: 'stor4nfv'
+                run:
+                    module: 'stor4nfv_tests.stor4nfv_os'
+                    class: 'OsStor4nfvTest'
+
     -
         name: components
         order: 3