diff options
Diffstat (limited to 'test/functest/testcase_1.py')
| -rw-r--r-- | test/functest/testcase_1.py | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/test/functest/testcase_1.py b/test/functest/testcase_1.py index 4f23bdc..4ad29b6 100644 --- a/test/functest/testcase_1.py +++ b/test/functest/testcase_1.py @@ -49,6 +49,9 @@ INSTANCE_5_NAME = ft_utils.get_parameter_from_yaml( "testcases.testcase_1.instance_5_name", config_file) IMAGE_NAME = ft_utils.get_parameter_from_yaml( "testcases.testcase_1.image_name", config_file) +ROUTE_DISTINGUISHERS = ft_utils.get_parameter_from_yaml( + "testcases.testcase_1.route_distinguishers", config_file) + IMAGE_FILENAME = ft_utils.get_functest_config( "general.openstack.image_file_name") IMAGE_FORMAT = ft_utils.get_functest_config( @@ -107,16 +110,21 @@ def main(): disk=IMAGE_FORMAT, container="bare", public=True) - network_1_id, _, _ = test_utils.create_network(neutron_client, - NET_1_NAME, - SUBNET_1_NAME, - SUBNET_1_CIDR, - ROUTER_1_NAME) - network_2_id, _, _ = test_utils.create_network(neutron_client, - NET_2_NAME, - SUBNET_2_NAME, - SUBNET_2_CIDR, - ROUTER_2_NAME) + network_1_id = test_utils.create_net(neutron_client, + NET_1_NAME) + test_utils.create_subnet(neutron_client, + SUBNET_1_NAME, + SUBNET_1_CIDR, + network_1_id) + + 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) @@ -204,6 +212,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'] |