Modified testcase_2 according to the Limitations of Boron

Change-Id: I79fa899a5deb917f5d87298b7c1b2dd17ad7770d
JIRA: SDNVPN-85
Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com>

diff --git a/test/functest/config.yaml b/test/functest/config.yaml
index dc949fb..d1cd45c 100644 (file)
--- a/test/functest/config.yaml
+++ b/test/functest/config.yaml
@@ -66,6 +66,8 @@ testcases:
       secgroup_descr: Security group for SDNVPN test cases
       targets1: '88:88'
       targets2: '55:55'
+      route_distinguishers1: '111:111'
+      route_distinguishers2: '222:222'
 
   testcase_3:
       enabled: false

diff --git a/test/functest/testcase_2.py b/test/functest/testcase_2.py
index e1b6863..89ba009 100644 (file)
--- a/test/functest/testcase_2.py
+++ b/test/functest/testcase_2.py
@@ -57,23 +57,33 @@ def main():
                                             disk=COMMON_CONFIG.image_format,
                                             container="bare",
                                             public=True)
-    network_1_id, _, _ = test_utils.create_network(
+    network_1_id = test_utils.create_net(
+        neutron_client,
+        TESTCASE_CONFIG.net_1_name)
+    test_utils.create_subnet(
         neutron_client,
-        TESTCASE_CONFIG.net_1_name,
         TESTCASE_CONFIG.subnet_1a_name,
         TESTCASE_CONFIG.subnet_1a_cidr,
-        TESTCASE_CONFIG.router_1_name,
+        network_1_id)
+    test_utils.create_subnet(
+        neutron_client,
         TESTCASE_CONFIG.subnet_1b_name,
-        TESTCASE_CONFIG.subnet_1b_cidr)
+        TESTCASE_CONFIG.subnet_1b_cidr,
+        network_1_id)
 
-    network_2_id, _, _ = test_utils.create_network(
+    network_2_id = test_utils.create_net(
+        neutron_client,
+        TESTCASE_CONFIG.net_2_name)
+    test_utils.create_subnet(
         neutron_client,
-        TESTCASE_CONFIG.net_2_name,
         TESTCASE_CONFIG.subnet_2a_name,
         TESTCASE_CONFIG.subnet_2a_cidr,
-        TESTCASE_CONFIG.router_2_name,
+        network_2_id)
+    test_utils.create_subnet(
+        neutron_client,
         TESTCASE_CONFIG.subnet_2b_name,
-        TESTCASE_CONFIG.subnet_2b_cidr)
+        TESTCASE_CONFIG.subnet_2b_cidr,
+        network_2_id)
 
     sg_id = os_utils.create_security_group_full(neutron_client,
                                                 TESTCASE_CONFIG.secgroup_name,
@@ -177,6 +187,7 @@ def main():
     kwargs = {"import_targets": TESTCASE_CONFIG.targets2,
               "export_targets": TESTCASE_CONFIG.targets2,
               "route_targets": TESTCASE_CONFIG.targets2,
+              "route_distinguishers": TESTCASE_CONFIG.route_distinguishers1,
               "name": vpn1_name}
     bgpvpn1 = os_utils.create_bgpvpn(neutron_client, **kwargs)
     bgpvpn1_id = bgpvpn1['bgpvpn']['id']
@@ -224,6 +235,7 @@ def main():
     kwargs = {"import_targets": TESTCASE_CONFIG.targets1,
               "export_targets": TESTCASE_CONFIG.targets1,
               "route_targets": TESTCASE_CONFIG.targets1,
+              "route_distinguishers": TESTCASE_CONFIG.route_distinguishers2,
               "name": vpn2_name}
     bgpvpn2 = os_utils.create_bgpvpn(neutron_client, **kwargs)
     bgpvpn2_id = bgpvpn2['bgpvpn']['id']