diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/functest_utils.py | 2 | ||||
| -rwxr-xr-x | utils/openstack_clean.py | 2 | ||||
| -rwxr-xr-x | utils/openstack_snapshot.py | 6 |
3 files changed, 2 insertions, 8 deletions
diff --git a/utils/functest_utils.py b/utils/functest_utils.py index ff8234104..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) # ---------------------------------------------------------- diff --git a/utils/openstack_clean.py b/utils/openstack_clean.py index 3b937c917..ef26be1f3 100755 --- a/utils/openstack_clean.py +++ b/utils/openstack_clean.py @@ -233,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") |