diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/functest_utils.py | 17 | ||||
| -rwxr-xr-x | utils/openstack_clean.py | 13 | ||||
| -rwxr-xr-x | utils/openstack_snapshot.py | 6 |
3 files changed, 22 insertions, 14 deletions
diff --git a/utils/functest_utils.py b/utils/functest_utils.py index b8bd403a1..041601e21 100644 --- a/utils/functest_utils.py +++ b/utils/functest_utils.py @@ -28,7 +28,7 @@ import yaml logger = ft_logger.Logger("functest_utils").getLogger() REPOS_DIR = os.getenv('repos_dir') -FUNCTEST_REPO = ("%s/functest/" % REPOS_DIR) +FUNCTEST_REPO = ("%s/functest" % REPOS_DIR) # ---------------------------------------------------------- @@ -152,9 +152,7 @@ def get_db_url(logger=None): """ Returns DB URL """ - with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: - functest_yaml = yaml.safe_load(f) - f.close() + functest_yaml = get_functest_yaml() db_url = functest_yaml.get("results").get("test_db_url") return db_url @@ -329,9 +327,7 @@ def get_deployment_dir(logger=None): """ Returns current Rally deployment directory """ - with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: - functest_yaml = yaml.safe_load(f) - f.close() + functest_yaml = get_functest_yaml() deployment_name = functest_yaml.get("rally").get("deployment_name") rally_dir = functest_yaml.get("general").get("directories").get( "dir_rally_inst") @@ -437,3 +433,10 @@ def check_test_result(test_name, ret, start_time, stop_time): def get_testcases_file(): return FUNCTEST_REPO + "/ci/testcases.yaml" + + +def get_functest_yaml(): + with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: + functest_yaml = yaml.safe_load(f) + f.close() + return functest_yaml diff --git a/utils/openstack_clean.py b/utils/openstack_clean.py index 8aba763ce..ef26be1f3 100755 --- a/utils/openstack_clean.py +++ b/utils/openstack_clean.py @@ -202,9 +202,20 @@ def remove_networks(neutron_client, default_networks, default_routers): else: remove_routers(neutron_client, routers, default_routers) + # trozet: wait for Neutron to auto-cleanup HA networks when HA router is + # deleted + time.sleep(5) + # remove networks if network_ids is not None: for net_id in network_ids: + networks = os_utils.get_network_list(neutron_client) + if networks is None: + logger.debug("No networks left to remove") + break + elif not any(network['id'] == net_id for network in networks): + logger.debug("Network %s has already been removed" % net_id) + continue logger.debug("Removing network %s ..." % net_id) if os_utils.delete_neutron_net(neutron_client, net_id): logger.debug(" > Done!") @@ -222,7 +233,7 @@ def remove_ports(neutron_client, ports, network_ids): except: logger.debug(" > WARNING: Port %s does not contain fixed_ips" % port_id) - print port + logger.info(port) router_id = port['device_id'] if len(port['fixed_ips']) == 0 and router_id == '': logger.debug("Removing port %s ..." % port_id) diff --git a/utils/openstack_snapshot.py b/utils/openstack_snapshot.py index 058f9ded3..236cf74e5 100755 --- a/utils/openstack_snapshot.py +++ b/utils/openstack_snapshot.py @@ -20,7 +20,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 # -import os import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as ft_utils import functest.utils.openstack_utils as os_utils @@ -29,11 +28,6 @@ import yaml logger = ft_logger.Logger("openstack_snapshot").getLogger() -REPO_PATH = os.environ['repos_dir'] + '/functest/' -if not os.path.exists(REPO_PATH): - logger.error("Functest repository directory not found '%s'" % REPO_PATH) - exit(-1) - OS_SNAPSHOT_FILE = ft_utils.get_parameter_from_yaml( "general.openstack.snapshot_file") |