summaryrefslogtreecommitdiffstats
path: root/test/functest
diff options
context:
space:
mode:
authorTim Irnich <tim.irnich@ericsson.com>2016-11-14 16:45:26 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-14 16:45:26 +0000
commit9492d419754c44ea38e6751a91b0c3625afccb07 (patch)
tree91f0844f4f2427d4c609e7ad1dbc6ac7b4451927 /test/functest
parent602428717a0ae71d875e0325e699c7cb26084a89 (diff)
parent986664da56529975fc25f53c1e9b4461ef059fb5 (diff)
Merge "Fix router assoc in Boron"
Diffstat (limited to 'test/functest')
-rw-r--r--test/functest/config.yaml1
-rw-r--r--test/functest/testcase_4.py17
2 files changed, 13 insertions, 5 deletions
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 7aa0be2..e49c774 100644
--- a/test/functest/testcase_4.py
+++ b/test/functest/testcase_4.py
@@ -80,6 +80,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")
@@ -111,11 +113,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)
@@ -195,6 +201,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']