diff options
| -rw-r--r-- | requirements.txt | 1 | ||||
| -rw-r--r-- | sdnvpn/lib/utils.py | 44 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_1.py | 8 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_2.py | 8 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_4.py | 8 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_7.py | 9 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_8.py | 6 |
7 files changed, 62 insertions, 22 deletions
diff --git a/requirements.txt b/requirements.txt index 5543064..d3dcf3c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,4 @@ pbr>=1.8 # Apache-2.0 requests!=2.12.2,>=2.10.0 # Apache-2.0 opnfv PyYAML>=3.10.0 # MIT +networking-bgpvpn==6.0.0 # Apache-2.0 diff --git a/sdnvpn/lib/utils.py b/sdnvpn/lib/utils.py index 220f61e..e22e455 100644 --- a/sdnvpn/lib/utils.py +++ b/sdnvpn/lib/utils.py @@ -279,7 +279,7 @@ def wait_for_bgp_net_assoc(neutron_client, bgpvpn_id, net_id): % (bgpvpn_id, net_id)) while tries > 0 and net_id not in nets: - nets = os_utils.get_bgpvpn_networks(neutron_client, bgpvpn_id) + nets = get_bgpvpn_networks(neutron_client, bgpvpn_id) time.sleep(sleep_time) tries -= 1 if net_id not in nets: @@ -303,7 +303,7 @@ def wait_for_bgp_router_assoc(neutron_client, bgpvpn_id, router_id): logger.debug("Waiting for router %s to associate with BGPVPN %s " % (bgpvpn_id, router_id)) while tries > 0 and router_id not in routers: - routers = os_utils.get_bgpvpn_routers(neutron_client, bgpvpn_id) + routers = get_bgpvpn_routers(neutron_client, bgpvpn_id) time.sleep(sleep_time) tries -= 1 if router_id not in routers: @@ -551,7 +551,7 @@ def cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, if len(bgpvpn_ids) != 0: for bgpvpn_id in bgpvpn_ids: - os_utils.delete_bgpvpn(neutron_client, bgpvpn_id) + delete_bgpvpn(neutron_client, bgpvpn_id) if len(interfaces) != 0: for router_id, subnet_id in interfaces: @@ -611,3 +611,41 @@ def cleanup_nova(nova_client, instance_ids, image_ids): format(image_id)) return False return True + + +def create_bgpvpn(neutron_client, **kwargs): + # route_distinguishers + # route_targets + json_body = {"bgpvpn": kwargs} + return neutron_client.create_bgpvpn(json_body) + + +def update_bgpvpn(neutron_client, bgpvpn_id, **kwargs): + json_body = {"bgpvpn": kwargs} + return neutron_client.update_bgpvpn(bgpvpn_id, json_body) + + +def delete_bgpvpn(neutron_client, bgpvpn_id): + return neutron_client.delete_bgpvpn(bgpvpn_id) + + +def get_bgpvpn(neutron_client, bgpvpn_id): + return neutron_client.show_bgpvpn(bgpvpn_id) + + +def get_bgpvpn_routers(neutron_client, bgpvpn_id): + return get_bgpvpn(neutron_client, bgpvpn_id)['bgpvpn']['routers'] + + +def get_bgpvpn_networks(neutron_client, bgpvpn_id): + return get_bgpvpn(neutron_client, bgpvpn_id)['bgpvpn']['networks'] + + +def create_router_association(neutron_client, bgpvpn_id, router_id): + json_body = {"router_association": {"router_id": router_id}} + return neutron_client.create_router_association(bgpvpn_id, json_body) + + +def create_network_association(neutron_client, bgpvpn_id, neutron_network_id): + json_body = {"network_association": {"network_id": neutron_network_id}} + return neutron_client.create_network_association(bgpvpn_id, json_body) diff --git a/sdnvpn/test/functest/testcase_1.py b/sdnvpn/test/functest/testcase_1.py index d114929..8291151 100644 --- a/sdnvpn/test/functest/testcase_1.py +++ b/sdnvpn/test/functest/testcase_1.py @@ -150,7 +150,7 @@ def main(): "route_distinguishers": TESTCASE_CONFIG.route_distinguishers, "name": vpn_name } - bgpvpn = os_utils.create_bgpvpn(neutron_client, **kwargs) + bgpvpn = test_utils.create_bgpvpn(neutron_client, **kwargs) bgpvpn_id = bgpvpn['bgpvpn']['id'] logger.debug("VPN created details: %s" % bgpvpn) bgpvpn_ids.append(bgpvpn_id) @@ -159,7 +159,7 @@ def main(): results.record_action(msg) results.add_to_summary(0, "-") - os_utils.create_network_association( + test_utils.create_network_association( neutron_client, bgpvpn_id, network_1_id) # Wait for VMs to get ips. @@ -179,7 +179,7 @@ def main(): results.add_to_summary(0, "-") results.record_action(msg) results.add_to_summary(0, "-") - os_utils.create_network_association( + test_utils.create_network_association( neutron_client, bgpvpn_id, network_2_id) test_utils.wait_for_bgp_net_assocs(neutron_client, @@ -203,7 +203,7 @@ def main(): kwargs = {"import_targets": TESTCASE_CONFIG.targets1, "export_targets": TESTCASE_CONFIG.targets1, "name": vpn_name} - bgpvpn = os_utils.update_bgpvpn(neutron_client, bgpvpn_id, **kwargs) + bgpvpn = test_utils.update_bgpvpn(neutron_client, bgpvpn_id, **kwargs) logger.info("Waiting for the VMs to connect to each other using the" " updated network configuration") diff --git a/sdnvpn/test/functest/testcase_2.py b/sdnvpn/test/functest/testcase_2.py index 425589d..0265aee 100644 --- a/sdnvpn/test/functest/testcase_2.py +++ b/sdnvpn/test/functest/testcase_2.py @@ -181,7 +181,7 @@ def main(): "route_targets": TESTCASE_CONFIG.targets2, "route_distinguishers": TESTCASE_CONFIG.route_distinguishers1, "name": vpn1_name} - bgpvpn1 = os_utils.create_bgpvpn(neutron_client, **kwargs) + bgpvpn1 = test_utils.create_bgpvpn(neutron_client, **kwargs) bgpvpn1_id = bgpvpn1['bgpvpn']['id'] logger.debug("VPN1 created details: %s" % bgpvpn1) bgpvpn_ids.append(bgpvpn1_id) @@ -190,7 +190,7 @@ def main(): results.record_action(msg) results.add_to_summary(0, "-") - os_utils.create_network_association( + test_utils.create_network_association( neutron_client, bgpvpn1_id, network_1_id) # Wait for VMs to get ips. @@ -224,7 +224,7 @@ def main(): "route_targets": TESTCASE_CONFIG.targets1, "route_distinguishers": TESTCASE_CONFIG.route_distinguishers2, "name": vpn2_name} - bgpvpn2 = os_utils.create_bgpvpn(neutron_client, **kwargs) + bgpvpn2 = test_utils.create_bgpvpn(neutron_client, **kwargs) bgpvpn2_id = bgpvpn2['bgpvpn']['id'] logger.debug("VPN created details: %s" % bgpvpn2) bgpvpn_ids.append(bgpvpn2_id) @@ -233,7 +233,7 @@ def main(): results.record_action(msg) results.add_to_summary(0, "-") - os_utils.create_network_association( + test_utils.create_network_association( neutron_client, bgpvpn2_id, network_2_id) test_utils.wait_for_bgp_net_assoc(neutron_client, bgpvpn1_id, network_1_id) diff --git a/sdnvpn/test/functest/testcase_4.py b/sdnvpn/test/functest/testcase_4.py index b907145..cff60f1 100644 --- a/sdnvpn/test/functest/testcase_4.py +++ b/sdnvpn/test/functest/testcase_4.py @@ -154,7 +154,7 @@ def main(): "export_targets": TESTCASE_CONFIG.targets2, "route_distinguishers": TESTCASE_CONFIG.route_distinguishers, "name": vpn_name} - bgpvpn = os_utils.create_bgpvpn(neutron_client, **kwargs) + bgpvpn = test_utils.create_bgpvpn(neutron_client, **kwargs) bgpvpn_id = bgpvpn['bgpvpn']['id'] logger.debug("VPN created details: %s" % bgpvpn) bgpvpn_ids.append(bgpvpn_id) @@ -163,7 +163,7 @@ def main(): results.record_action(msg) results.add_to_summary(0, "-") - os_utils.create_router_association( + test_utils.create_router_association( neutron_client, bgpvpn_id, router_1_id) # Wait for VMs to get ips. @@ -183,7 +183,7 @@ def main(): results.add_to_summary(0, "-") results.record_action(msg) results.add_to_summary(0, "-") - os_utils.create_network_association( + test_utils.create_network_association( neutron_client, bgpvpn_id, network_2_id) test_utils.wait_for_bgp_router_assoc( @@ -207,7 +207,7 @@ def main(): kwargs = {"import_targets": TESTCASE_CONFIG.targets1, "export_targets": TESTCASE_CONFIG.targets1, "name": vpn_name} - bgpvpn = os_utils.update_bgpvpn(neutron_client, bgpvpn_id, **kwargs) + bgpvpn = test_utils.update_bgpvpn(neutron_client, bgpvpn_id, **kwargs) logger.info("Waiting for the VMs to connect to each other using the" " updated network configuration") diff --git a/sdnvpn/test/functest/testcase_7.py b/sdnvpn/test/functest/testcase_7.py index d29a50a..21bc12b 100644 --- a/sdnvpn/test/functest/testcase_7.py +++ b/sdnvpn/test/functest/testcase_7.py @@ -117,7 +117,7 @@ def main(): "export_targets": TESTCASE_CONFIG.targets, "route_distinguishers": TESTCASE_CONFIG.route_distinguishers, "name": vpn_name} - bgpvpn = os_utils.create_bgpvpn(neutron_client, **kwargs) + bgpvpn = test_utils.create_bgpvpn(neutron_client, **kwargs) bgpvpn_id = bgpvpn['bgpvpn']['id'] logger.debug("VPN created details: %s" % bgpvpn) bgpvpn_ids.append(bgpvpn_id) @@ -128,9 +128,9 @@ def main(): results.record_action(msg) results.add_to_summary(0, "-") - os_utils.create_network_association( + test_utils.create_network_association( neutron_client, bgpvpn_id, network_1_id) - os_utils.create_network_association( + test_utils.create_network_association( neutron_client, bgpvpn_id, network_2_id) test_utils.wait_for_bgp_net_assoc( @@ -154,7 +154,8 @@ def main(): results.add_to_summary(0, '-') fip = os_utils.create_floating_ip(neutron_client) - fip_added = os_utils.add_floating_ip(nova_client, vm_2.id, fip['fip_addr']) + fip_added = os_utils.add_floating_ip(nova_client, vm_2.id, + fip['fip_addr']) if fip_added: results.add_success(msg) else: diff --git a/sdnvpn/test/functest/testcase_8.py b/sdnvpn/test/functest/testcase_8.py index e3ccd66..7738c75 100644 --- a/sdnvpn/test/functest/testcase_8.py +++ b/sdnvpn/test/functest/testcase_8.py @@ -116,7 +116,7 @@ def main(): "export_targets": TESTCASE_CONFIG.targets, "route_distinguishers": TESTCASE_CONFIG.route_distinguishers, "name": vpn_name} - bgpvpn = os_utils.create_bgpvpn(neutron_client, **kwargs) + bgpvpn = test_utils.create_bgpvpn(neutron_client, **kwargs) bgpvpn_id = bgpvpn['bgpvpn']['id'] logger.debug("VPN created details: %s" % bgpvpn) bgpvpn_ids.append(bgpvpn_id) @@ -127,9 +127,9 @@ def main(): results.record_action(msg) results.add_to_summary(0, "-") - os_utils.create_router_association( + test_utils.create_router_association( neutron_client, bgpvpn_id, router_1_id) - os_utils.create_network_association( + test_utils.create_network_association( neutron_client, bgpvpn_id, network_2_id) test_utils.wait_for_bgp_router_assoc( |