Merge "vpn testcases added in proposed_tests"

8 files changed, 79 insertions, 4 deletions

diff --git a/dovetail/compliance/proposed_tests.yml b/dovetail/compliance/proposed_tests.yml
index aaaa2023..cc4bfa8c 100644
--- a/dovetail/compliance/proposed_tests.yml
+++ b/dovetail/compliance/proposed_tests.yml
@@ -45,3 +45,9 @@ proposed_tests:
     - dovetail.ha.tc009
     # - dovetail.ha.tc010
     # - dovetail.ha.tc011
+    # sdnvpn
+    - dovetail.sdnvpn.tc001
+    - dovetail.sdnvpn.tc002
+    - dovetail.sdnvpn.tc003
+    - dovetail.sdnvpn.tc004
+    - dovetail.sdnvpn.tc008
diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml
index ec1f5254..934ff6a6 100644
--- a/dovetail/conf/dovetail_config.yml
+++ b/dovetail/conf/dovetail_config.yml
@@ -21,6 +21,7 @@ testarea_supported:
   - ha
   - ipv6
   - nfvi
+  - sdnvpn
   - vimops
 
 functest_testsuite:
@@ -32,6 +33,7 @@ functest_testsuite:
   - promise
 
 functest_testcase:
+  - bgpvpn
   - connection_check
   - api_check
   - snaps_health_check
diff --git a/dovetail/container.py b/dovetail/container.py
index 5c128c0b..ae7c8e2e 100644
--- a/dovetail/container.py
+++ b/dovetail/container.py
@@ -59,12 +59,19 @@ class Container(object):
 
     # set functest envs and TEST_DB_URL for creating functest container
     @staticmethod
-    def set_functest_config():
+    def set_functest_config(testcase_name):
 
         # These are all just used by Functest's function push_results_to_db.
         # And has nothing to do with DoveTail running test cases.
-        ins_type = " -e INSTALLER_TYPE=unknown"
-        scenario = " -e DEPLOY_SCENARIO=unknown"
+        ins_type = os.getenv('INSTALLER_TYPE', "unknown")
+        scenario = os.getenv('DEPLOY_SCENARIO', "unknown")
+        ins_type = ''.join([" -e INSTALLER_TYPE=", ins_type])
+        scenario = ''.join([" -e DEPLOY_SCENARIO=", scenario])
+        # vpn testcase only runs when scenario name includes bgpvpn
+        # functest requirements
+        if 'sdnvpn' in testcase_name:
+            ins_type = "-e INSTALLER_TYPE=netvirt"
+            scenario = " -e DEPLOY_SCENARIO=bgpvpn"
         node = " -e NODE_NAME=master"
         envs = "%s %s %s" % (ins_type, scenario, node)
 
@@ -122,7 +129,7 @@ class Container(object):
 
         config = ""
         if type.lower() == "functest":
-            config = cls.set_functest_config()
+            config = cls.set_functest_config(testcase_name)
         if type.lower() == "yardstick":
             config = cls.set_yardstick_config()
         if not config:
diff --git a/dovetail/testcase/sdnvpn.tc001.yml b/dovetail/testcase/sdnvpn.tc001.yml
new file mode 100644
index 00000000..a453838a
--- /dev/null
+++ b/dovetail/testcase/sdnvpn.tc001.yml
@@ -0,0 +1,12 @@
+---
+dovetail.sdnvpn.tc001:
+  name: dovetail.sdnvpn.tc001
+  objective: Connectivity between Neutron subnets through association of Neutron Networks to VPNs
+  validate:
+    type: functest
+    testcase: bgpvpn
+    pre_copy:
+      src_file: sdnvpn_config_testcase1.yaml
+      dest_path: /home/opnfv/repos/sdnvpn/sdnvpn/test/functest/config.yaml
+  report:
+    sub_testcase_list:
diff --git a/dovetail/testcase/sdnvpn.tc002.yml b/dovetail/testcase/sdnvpn.tc002.yml
new file mode 100644
index 00000000..0e4cb51e
--- /dev/null
+++ b/dovetail/testcase/sdnvpn.tc002.yml
@@ -0,0 +1,12 @@
+---
+dovetail.sdnvpn.tc002:
+  name: dovetail.sdnvpn.tc002
+  objective: Separation of tenant networks through association to different VPNs
+  validate:
+    type: functest
+    testcase: bgpvpn
+    pre_copy:
+      src_file: sdnvpn_config_testcase2.yaml
+      dest_path: /home/opnfv/repos/sdnvpn/sdnvpn/test/functest/config.yaml
+  report:
+    sub_testcase_list:
diff --git a/dovetail/testcase/sdnvpn.tc003.yml b/dovetail/testcase/sdnvpn.tc003.yml
new file mode 100644
index 00000000..3da7ccd1
--- /dev/null
+++ b/dovetail/testcase/sdnvpn.tc003.yml
@@ -0,0 +1,12 @@
+---
+dovetail.sdnvpn.tc003:
+  name: dovetail.sdnvpn.tc003
+  objective: Data center gateway integration through BGP peering
+  validate:
+    type: functest
+    testcase: bgpvpn
+    pre_copy:
+      src_file: sdnvpn_config_testcase3.yaml
+      dest_path: /home/opnfv/repos/sdnvpn/sdnvpn/test/functest/config.yaml
+  report:
+    sub_testcase_list:
diff --git a/dovetail/testcase/sdnvpn.tc004.yml b/dovetail/testcase/sdnvpn.tc004.yml
new file mode 100644
index 00000000..6e6727d2
--- /dev/null
+++ b/dovetail/testcase/sdnvpn.tc004.yml
@@ -0,0 +1,12 @@
+---
+dovetail.sdnvpn.tc004:
+  name: dovetail.sdnvpn.tc004
+  objective: VPN provides connectivity between subnets using association of Neutron Router to VPNs
+  validate:
+    type: functest
+    testcase: bgpvpn
+    pre_copy:
+      src_file: sdnvpn_config_testcase4.yaml
+      dest_path: /home/opnfv/repos/sdnvpn/sdnvpn/test/functest/config.yaml
+  report:
+    sub_testcase_list:
diff --git a/dovetail/testcase/sdnvpn.tc008.yml b/dovetail/testcase/sdnvpn.tc008.yml
new file mode 100644
index 00000000..80b01d7b
--- /dev/null
+++ b/dovetail/testcase/sdnvpn.tc008.yml
@@ -0,0 +1,12 @@
+---
+dovetail.sdnvpn.tc008:
+  name: dovetail.sdnvpn.tc008
+  objective: associate Neutron Router with an attached subnet to a VPN and verify reachability of the Floating IP
+  validate:
+    type: functest
+    testcase: bgpvpn
+    pre_copy:
+      src_file: sdnvpn_config_testcase8.yaml
+      dest_path: /home/opnfv/repos/sdnvpn/sdnvpn/test/functest/config.yaml
+  report:
+    sub_testcase_list: