Merge "Precise self.result in pytest_suite_runner.py"

[functest.git] / functest / utils / openstack_snapshot.py

diff --git a/functest/utils/openstack_snapshot.py b/functest/utils/openstack_snapshot.py
index 5b50ffa..952fb7b 100755 (executable)
--- a/functest/utils/openstack_snapshot.py
+++ b/functest/utils/openstack_snapshot.py
@@ -20,15 +20,16 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 
-import functest.utils.functest_logger as ft_logger
-import functest.utils.openstack_utils as os_utils
+import logging
 import yaml
-import functest.utils.functest_constants as ft_constants
 
-logger = ft_logger.Logger("openstack_snapshot").getLogger()
+import functest.utils.openstack_utils as os_utils
+from functest.utils.constants import CONST
+
+logger = logging.getLogger(__name__)
 
 
-OS_SNAPSHOT_FILE = ft_constants.OPENSTACK_SNAPSHOT_FILE
+OS_SNAPSHOT_FILE = CONST.openstack_snapshot_file
 
 
 def separator():
@@ -149,7 +150,7 @@ def main():
     snapshot.update(get_security_groups(neutron_client))
     snapshot.update(get_floatinips(nova_client))
     snapshot.update(get_users(keystone_client))
-    # snapshot.update(get_tenants(keystone_client))
+    snapshot.update(get_tenants(keystone_client))
 
     with open(OS_SNAPSHOT_FILE, 'w+') as yaml_file:
         yaml_file.write(yaml.safe_dump(snapshot, default_flow_style=False))
@@ -161,4 +162,5 @@ def main():
 
 
 if __name__ == '__main__':
+    logging.basicConfig()
     main()