diff options
| -rw-r--r-- | sdnvpn/lib/config.py | 4 | ||||
| -rw-r--r-- | sdnvpn/lib/utils.py | 70 | ||||
| -rw-r--r-- | sdnvpn/test/functest/config.yaml | 13 | ||||
| -rw-r--r-- | sdnvpn/test/functest/run_sdnvpn_tests.py | 47 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_1.py | 3 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_10.py | 3 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_11.py | 166 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_2.py | 3 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_3.py | 3 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_4.py | 3 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_7.py | 3 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_8.py | 3 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_9.py | 1 |
13 files changed, 301 insertions, 21 deletions
diff --git a/sdnvpn/lib/config.py b/sdnvpn/lib/config.py index 99e5d00..9659fc3 100644 --- a/sdnvpn/lib/config.py +++ b/sdnvpn/lib/config.py @@ -54,6 +54,10 @@ class CommonConfig(object): self.custom_flavor_ram = 1024 self.custom_flavor_disk = 10 self.custom_flavor_vcpus = 1 + self.neutron_nw_quota = -1 + self.neutron_subnet_quota = -1 + self.neutron_port_quota = -1 + self.nova_instances_quota_class = -1 commonCfgInstance = None diff --git a/sdnvpn/lib/utils.py b/sdnvpn/lib/utils.py index e241d79..1afccf7 100644 --- a/sdnvpn/lib/utils.py +++ b/sdnvpn/lib/utils.py @@ -592,7 +592,7 @@ def cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, return True -def cleanup_nova(nova_client, instance_ids, image_ids): +def cleanup_nova(nova_client, instance_ids): if len(instance_ids) != 0: for instance_id in instance_ids: if not os_utils.delete_instance(nova_client, instance_id): @@ -600,10 +600,13 @@ def cleanup_nova(nova_client, instance_ids, image_ids): 'Instance with id {} was not deleted.'. format(instance_id)) return False + return True + +def cleanup_glance(glance_client, image_ids): if len(image_ids) != 0: for image_id in image_ids: - if not os_utils.delete_glance_image(nova_client, image_id): + if not os_utils.delete_glance_image(glance_client, image_id): logging.error('Fail to delete all images. ' 'Image with id {} was not deleted.'. format(image_id)) @@ -681,3 +684,66 @@ def is_fail_mode_secure(): 'in {} node'.format(openstack_node.name)) is_secure[openstack_node.name] = False return is_secure + + +def update_nw_subnet_port_quota(neutron_client, tenant_id, nw_quota, + subnet_quota, port_quota): + json_body = {"quota": { + "network": nw_quota, + "subnet": subnet_quota, + "port": port_quota + }} + + try: + neutron_client.update_quota(tenant_id=tenant_id, + body=json_body) + return True + except Exception as e: + logger.error("Error [update_nw_subnet_port_quota(neutron_client," + " '%s', '%s', '%s', '%s')]: %s" % + (tenant_id, nw_quota, subnet_quota, port_quota, e)) + return False + + +def update_instance_quota_class(nova_client, instances_quota): + try: + nova_client.quota_classes.update("default", instances=instances_quota) + return True + except Exception as e: + logger.error("Error [update_instance_quota_class(nova_client," + " '%s' )]: %s" % (instances_quota, e)) + return False + + +def get_neutron_quota(neutron_client, tenant_id): + try: + return neutron_client.show_quota(tenant_id=tenant_id)['quota'] + except Exception as e: + logger.error("Error in getting neutron quota for tenant " + " '%s' )]: %s" % (tenant_id, e)) + raise + + +def get_nova_instances_quota(nova_client): + try: + return nova_client.quota_classes.get("default").instances + except Exception as e: + logger.error("Error in getting nova instances quota: %s" % e) + raise + + +def get_ovs_groups(compute_node_list, ovs_br_list, of_protocol="OpenFlow13"): + """ + Gets, as input, a list of compute nodes and a list of OVS bridges + and returns the command console output, as a list of lines, that + contains all the OVS groups from all bridges and nodes in lists. + """ + cmd_out_lines = [] + for compute_node in compute_node_list: + for ovs_br in ovs_br_list: + if ovs_br in compute_node.run_cmd("sudo ovs-vsctl show"): + ovs_groups_cmd = ("sudo ovs-ofctl dump-groups {} -O {} | " + "grep group".format(ovs_br, of_protocol)) + cmd_out_lines += (compute_node.run_cmd(ovs_groups_cmd).strip(). + split("\n")) + return cmd_out_lines diff --git a/sdnvpn/test/functest/config.yaml b/sdnvpn/test/functest/config.yaml index d3063c1..2b26077 100644 --- a/sdnvpn/test/functest/config.yaml +++ b/sdnvpn/test/functest/config.yaml @@ -164,3 +164,16 @@ testcases: router_1_name: sdnvpn-10-1-router secgroup_name: sdnvpn-sg secgroup_descr: Security group for SDNVPN test cases + + sdnvpn.test.functest.testcase_11: + enabled: true + description: Check relevant OVS groups are removed upon deletion of OpenStack topology + instance_1_name: sdnvpn-11-1 + instance_2_name: sdnvpn-11-2 + image_name: sdnvpn-image + net_1_name: sdnvpn-11-1-net + subnet_1_name: sdnvpn-11-1-subnet + subnet_1_cidr: 10.10.10.0/24 + router_1_name: sdnvpn-11-1-router + secgroup_name: sdnvpn-sg + secgroup_descr: Security group for SDNVPN test cases diff --git a/sdnvpn/test/functest/run_sdnvpn_tests.py b/sdnvpn/test/functest/run_sdnvpn_tests.py index cff6a27..1a1d8f3 100644 --- a/sdnvpn/test/functest/run_sdnvpn_tests.py +++ b/sdnvpn/test/functest/run_sdnvpn_tests.py @@ -16,8 +16,10 @@ import traceback import yaml from functest.core import feature as base +from functest.utils import openstack_utils as os_utils from sdnvpn.lib import config as sdnvpn_config from sdnvpn.lib.gather_logs import gather_logs +from sdnvpn.lib import utils as test_utils COMMON_CONFIG = sdnvpn_config.CommonConfig() @@ -28,21 +30,32 @@ class SdnvpnFunctest(base.Feature): def execute(self): - cmd_line = "neutron quota-update --subnet -1 --network -1 --port -1" - self.__logger.info("Setting subnet/net quota to unlimited : %s" - % cmd_line) - cmd = os.popen(cmd_line) - output = cmd.read() - self.__logger.debug(output) + nova_client = os_utils.get_nova_client() + neutron_client = os_utils.get_neutron_client() + + tenant_id = os_utils.get_tenant_id(os_utils.get_keystone_client(), + os.environ['OS_PROJECT_NAME']) + + neutron_quota = test_utils.get_neutron_quota(neutron_client, tenant_id) + (neutron_nw_quota, neutron_subnet_quota, neutron_port_quota) = ( + neutron_quota['network'], neutron_quota['subnet'], + neutron_quota['port']) + instances_quota = test_utils.get_nova_instances_quota(nova_client) + + self.__logger.info("Setting net/subnet/port quota to unlimited") + test_utils.update_nw_subnet_port_quota( + neutron_client, + tenant_id, + COMMON_CONFIG.neutron_nw_quota, + COMMON_CONFIG.neutron_subnet_quota, + COMMON_CONFIG.neutron_port_quota) # Workaround for # https://jira.opnfv.org/projects/SDNVPN/issues/SDNVPN-115 - cmd_line = "nova quota-class-update --instances -1 default" - self.__logger.info("Setting instances quota to unlimited : %s" - % cmd_line) - cmd = os.popen(cmd_line) - output = cmd.read() - self.__logger.debug(output) + self.__logger.info("Setting instances quota class to unlimited") + test_utils.update_instance_quota_class( + nova_client, + COMMON_CONFIG.nova_instances_quota_class) with open(COMMON_CONFIG.config_file) as f: config_yaml = yaml.safe_load(f) @@ -80,6 +93,16 @@ class SdnvpnFunctest(base.Feature): if status == "FAIL": overall_status = "FAIL" + self.__logger.info("Resetting subnet/net/port quota") + test_utils.update_nw_subnet_port_quota(neutron_client, + tenant_id, + neutron_nw_quota, + neutron_subnet_quota, + neutron_port_quota) + + self.__logger.info("Resetting instances quota class") + test_utils.update_instance_quota_class(nova_client, instances_quota) + try: installer_type = str(os.environ['INSTALLER_TYPE'].lower()) if installer_type in ["fuel", "apex"]: diff --git a/sdnvpn/test/functest/testcase_1.py b/sdnvpn/test/functest/testcase_1.py index 718f305..1b51f00 100644 --- a/sdnvpn/test/functest/testcase_1.py +++ b/sdnvpn/test/functest/testcase_1.py @@ -210,7 +210,8 @@ def main(): logger.error("exception occurred while executing testcase_1: %s", e) raise finally: - test_utils.cleanup_nova(nova_client, instance_ids, image_ids) + test_utils.cleanup_nova(nova_client, instance_ids) + test_utils.cleanup_glance(glance_client, image_ids) test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, subnet_ids, router_ids, network_ids) diff --git a/sdnvpn/test/functest/testcase_10.py b/sdnvpn/test/functest/testcase_10.py index 557b658..6344a17 100644 --- a/sdnvpn/test/functest/testcase_10.py +++ b/sdnvpn/test/functest/testcase_10.py @@ -252,7 +252,8 @@ def main(): for thread in threads: thread.join() - test_utils.cleanup_nova(nova_client, instance_ids, image_ids) + test_utils.cleanup_nova(nova_client, instance_ids) + test_utils.cleanup_glance(glance_client, image_ids) test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, subnet_ids, router_ids, network_ids) diff --git a/sdnvpn/test/functest/testcase_11.py b/sdnvpn/test/functest/testcase_11.py new file mode 100644 index 0000000..40de205 --- /dev/null +++ b/sdnvpn/test/functest/testcase_11.py @@ -0,0 +1,166 @@ +#!/usr/bin/python +# +# Copyright (c) 2017 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# + +import logging +import sys + +from functest.utils import openstack_utils as os_utils +from sdnvpn.lib import config as sdnvpn_config +from sdnvpn.lib import utils as test_utils +from sdnvpn.lib.results import Results + +logger = logging.getLogger(__name__) + +COMMON_CONFIG = sdnvpn_config.CommonConfig() +TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig( + 'sdnvpn.test.functest.testcase_11') + + +def main(): + results = Results(COMMON_CONFIG.line_length) + + results.add_to_summary(0, "=") + results.add_to_summary(2, "STATUS", "SUBTEST") + results.add_to_summary(0, "=") + + nova_client = os_utils.get_nova_client() + neutron_client = os_utils.get_neutron_client() + glance_client = os_utils.get_glance_client() + openstack_nodes = test_utils.get_nodes() + + (floatingip_ids, instance_ids, router_ids, network_ids, image_ids, + subnet_ids, interfaces, bgpvpn_ids) = ([] for i in range(8)) + + try: + image_id = os_utils.create_glance_image( + glance_client, TESTCASE_CONFIG.image_name, + COMMON_CONFIG.image_path, disk=COMMON_CONFIG.image_format, + container="bare", public='public') + image_ids.append(image_id) + + network_1_id = test_utils.create_net(neutron_client, + TESTCASE_CONFIG.net_1_name) + subnet_1_id = test_utils.create_subnet(neutron_client, + TESTCASE_CONFIG.subnet_1_name, + TESTCASE_CONFIG.subnet_1_cidr, + network_1_id) + + network_ids.append(network_1_id) + subnet_ids.append(subnet_1_id) + + sg_id = os_utils.create_security_group_full( + neutron_client, TESTCASE_CONFIG.secgroup_name, + TESTCASE_CONFIG.secgroup_descr) + + # Check required number of compute nodes + compute_hostname = ( + nova_client.hypervisors.list()[0].hypervisor_hostname) + compute_nodes = [node for node in openstack_nodes + if node.is_compute()] + + av_zone_1 = "nova:" + compute_hostname + # List of OVS bridges to get groups + ovs_br = "br-int" + # Get a list of groups, before start topology + initial_ovs_groups = test_utils.get_ovs_groups(compute_nodes, + [ovs_br]) + + # boot INSTANCES + vm_2 = test_utils.create_instance( + nova_client, + TESTCASE_CONFIG.instance_2_name, + image_id, + network_1_id, + sg_id, + secgroup_name=TESTCASE_CONFIG.secgroup_name, + compute_node=av_zone_1) + + vm_1 = test_utils.create_instance( + nova_client, + TESTCASE_CONFIG.instance_1_name, + image_id, + network_1_id, + sg_id, + secgroup_name=TESTCASE_CONFIG.secgroup_name, + compute_node=av_zone_1) + instance_ids.extend([vm_1.id, vm_2.id]) + + # Wait for VMs to get ips. + instances_up = test_utils.wait_for_instances_up(vm_1, vm_2) + + if not instances_up: + logger.error("One or more instances is down") + # TODO: Handle this appropriately + + logging.info("Wait before subtest") + test_utils.wait_before_subtest() + # Get added OVS groups + added_ovs_groups = (len(initial_ovs_groups) - + len(test_utils.get_ovs_groups( + compute_nodes, [ovs_br]))) + # Check if group added successfully + results.record_action("Check if a new group was added to OVS") + msg = "New OVS group added" + results.add_to_summary(0, "-") + if added_ovs_groups != 0: + results.add_success(msg) + else: + results.add_failure(msg) + results.add_to_summary(0, "=") + # Backup OVS controller connection info. + # To support HA changes should be made here. + get_ext_ip_cmd = "sudo ovs-vsctl get-controller {}".format(ovs_br) + ovs_controller_conn = (compute_nodes[0].run_cmd(get_ext_ip_cmd). + strip().split('\n')[0]) + # Disconnect OVS from controller + for compute_node in compute_nodes: + compute_node.run_cmd("sudo ovs-vsctl del-controller {}". + format(ovs_br)) + except Exception as e: + logger.error("exception occurred while executing testcase_1: %s", e) + raise + finally: + # Cleanup topology + test_utils.cleanup_nova(nova_client, instance_ids) + test_utils.cleanup_glance(glance_client, image_ids) + test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, + interfaces, subnet_ids, router_ids, + network_ids) + # Connect again OVS to Controller + for compute_node in compute_nodes: + compute_node.run_cmd("sudo ovs-vsctl set-controller {} {}". + format(ovs_br, ovs_controller_conn)) + logging.info("Wait before subtest") + test_utils.wait_before_subtest() + # Get OVS groups added after the reconnection + added_ovs_groups = (len(initial_ovs_groups) - + len(test_utils.get_ovs_groups( + compute_nodes, [ovs_br]))) + + # Check if group removed successfully + results.record_action("Check if group was removed from OVS " + "after deleting the topology.") + msg = "" + # After removing the topology, groups must be equal to the initial + if added_ovs_groups != 0: + msg += " Additional group was not deleted from OVS" + results.add_to_summary(0, "-") + if len(msg) == 0: + msg = "Group was deleted from ovs" + results.add_success(msg) + else: + results.add_failure(msg) + + return results.compile_summary() + + +if __name__ == '__main__': + logging.basicConfig(level=logging.INFO) + sys.exit(main()) diff --git a/sdnvpn/test/functest/testcase_2.py b/sdnvpn/test/functest/testcase_2.py index bc37c5c..7594055 100644 --- a/sdnvpn/test/functest/testcase_2.py +++ b/sdnvpn/test/functest/testcase_2.py @@ -271,7 +271,8 @@ def main(): logger.error("exception occurred while executing testcase_2: %s", e) raise finally: - test_utils.cleanup_nova(nova_client, instance_ids, image_ids) + test_utils.cleanup_nova(nova_client, instance_ids) + test_utils.cleanup_glance(glance_client, image_ids) test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, subnet_ids, router_ids, network_ids) diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py index 7e14505..3dc1e7c 100644 --- a/sdnvpn/test/functest/testcase_3.py +++ b/sdnvpn/test/functest/testcase_3.py @@ -278,7 +278,8 @@ def main(): logger.error("exception occurred while executing testcase_3: %s", e) raise finally: - test_utils.cleanup_nova(nova_client, instance_ids, image_ids) + test_utils.cleanup_nova(nova_client, instance_ids) + test_utils.cleanup_glance(glance_client, image_ids) test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, subnet_ids, router_ids, network_ids) diff --git a/sdnvpn/test/functest/testcase_4.py b/sdnvpn/test/functest/testcase_4.py index f6748f9..5e6b2b8 100644 --- a/sdnvpn/test/functest/testcase_4.py +++ b/sdnvpn/test/functest/testcase_4.py @@ -220,7 +220,8 @@ def main(): logger.error("exception occurred while executing testcase_4: %s", e) raise finally: - test_utils.cleanup_nova(nova_client, instance_ids, image_ids) + test_utils.cleanup_nova(nova_client, instance_ids) + test_utils.cleanup_glance(glance_client, image_ids) test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, subnet_ids, router_ids, network_ids) diff --git a/sdnvpn/test/functest/testcase_7.py b/sdnvpn/test/functest/testcase_7.py index 65a77b6..2d9e713 100644 --- a/sdnvpn/test/functest/testcase_7.py +++ b/sdnvpn/test/functest/testcase_7.py @@ -163,7 +163,8 @@ def main(): logger.error("exception occurred while executing testcase_7: %s", e) raise finally: - test_utils.cleanup_nova(nova_client, instance_ids, image_ids) + test_utils.cleanup_nova(nova_client, instance_ids) + test_utils.cleanup_glance(glance_client, image_ids) test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, subnet_ids, router_ids, network_ids) diff --git a/sdnvpn/test/functest/testcase_8.py b/sdnvpn/test/functest/testcase_8.py index abb111f..fb54761 100644 --- a/sdnvpn/test/functest/testcase_8.py +++ b/sdnvpn/test/functest/testcase_8.py @@ -165,7 +165,8 @@ def main(): logger.error("exception occurred while executing testcase_8: %s", e) raise finally: - test_utils.cleanup_nova(nova_client, instance_ids, image_ids) + test_utils.cleanup_nova(nova_client, instance_ids) + test_utils.cleanup_glance(glance_client, image_ids) test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, subnet_ids, router_ids, network_ids) diff --git a/sdnvpn/test/functest/testcase_9.py b/sdnvpn/test/functest/testcase_9.py index 45e9d5b..1489a5a 100644 --- a/sdnvpn/test/functest/testcase_9.py +++ b/sdnvpn/test/functest/testcase_9.py @@ -65,6 +65,7 @@ def main(): return results.compile_summary() + if __name__ == '__main__': logging.basicConfig(level=logging.INFO) sys.exit(main()) |