From 986664da56529975fc25f53c1e9b4461ef059fb5 Mon Sep 17 00:00:00 2001
From: Romanos Skiadas <rski@intracom-telecom.com>
Date: Wed, 2 Nov 2016 14:11:41 +0200
Subject: Fix router assoc in Boron
As per I6b57eab89839d9e9122cd24b0f05737467439dd9:
- Add a route distinguisher
- Remove the router from the network that is network associated
Change-Id: I1399bb51c787df881529279ef7a1946a3c5c5591
JIRA: SDNVPN-66
Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com>
---
test/functest/config.yaml | 1 +
test/functest/testcase_4.py | 17 ++++++++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
(limited to 'test')
diff --git a/test/functest/config.yaml b/test/functest/config.yaml
index 63d5843..41996e0 100644
--- a/test/functest/config.yaml
+++ b/test/functest/config.yaml
@@ -91,3 +91,4 @@ testcases:
sdnvpn_sg_descr: Security group for SDNVPN test cases
targets1: '88:88'
targets2: '55:55'
+ route_distinguishers: '12:12'
diff --git a/test/functest/testcase_4.py b/test/functest/testcase_4.py
index 13f531f..6798c53 100644
--- a/test/functest/testcase_4.py
+++ b/test/functest/testcase_4.py
@@ -82,6 +82,8 @@ TARGETS_1 = ft_utils.get_parameter_from_yaml(
"testcases.testcase_4.targets1", config_file)
TARGETS_2 = ft_utils.get_parameter_from_yaml(
"testcases.testcase_4.targets2", config_file)
+ROUTE_DISTINGUISHERS = ft_utils.get_parameter_from_yaml(
+ "testcases.testcase_4.route_distinguishers", config_file)
SUCCESS_CRITERIA = ft_utils.get_parameter_from_yaml(
"testcases.testcase_4.succes_criteria", config_file)
TEST_DB = ft_utils.get_functest_config("results.test_db_url")
@@ -113,11 +115,15 @@ def main():
SUBNET_1_NAME,
SUBNET_1_CIDR,
ROUTER_1_NAME)
- network_2_id, _, router_2_id = test_utils.create_network(neutron_client,
- NET_2_NAME,
- SUBNET_2_NAME,
- SUBNET_2_CIDR,
- ROUTER_2_NAME)
+ # the network that is net-assoc'd cannot have a router
+ # because ODL doesn't support it
+ network_2_id = test_utils.create_net(neutron_client,
+ NET_2_NAME)
+ test_utils.create_subnet(neutron_client,
+ SUBNET_2_NAME,
+ SUBNET_2_CIDR,
+ network_2_id)
+
sg_id = os_utils.create_security_group_full(neutron_client,
SECGROUP_NAME, SECGROUP_DESCR)
@@ -205,6 +211,7 @@ def main():
vpn_name = "sdnvpn-" + str(randint(100000, 999999))
kwargs = {"import_targets": TARGETS_1,
"export_targets": TARGETS_2,
+ "route_distinguishers": ROUTE_DISTINGUISHERS,
"name": vpn_name}
bgpvpn = os_utils.create_bgpvpn(neutron_client, **kwargs)
bgpvpn_id = bgpvpn['bgpvpn']['id']
--
cgit