Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Restore Kingbird functest"
[functest.git]
/
functest
/
utils
/
openstack_snapshot.py
diff --git
a/functest/utils/openstack_snapshot.py
b/functest/utils/openstack_snapshot.py
index
560cadb
..
e64030f
100755
(executable)
--- a/
functest/utils/openstack_snapshot.py
+++ b/
functest/utils/openstack_snapshot.py
@@
-20,17
+20,16
@@
# http://www.apache.org/licenses/LICENSE-2.0
#
# http://www.apache.org/licenses/LICENSE-2.0
#
-import functest.utils.functest_logger as ft_logger
-import functest.utils.functest_utils as ft_utils
-import functest.utils.openstack_utils as os_utils
import yaml
import yaml
+import functest.utils.functest_logger as ft_logger
+import functest.utils.openstack_utils as os_utils
+from functest.utils.constants import CONST
logger = ft_logger.Logger("openstack_snapshot").getLogger()
logger = ft_logger.Logger("openstack_snapshot").getLogger()
-OS_SNAPSHOT_FILE = \
- ft_utils.get_functest_config("general.openstack.snapshot_file")
+OS_SNAPSHOT_FILE = CONST.openstack_snapshot_file
def separator():
def separator():
@@
-64,7
+63,7
@@
def get_volumes(cinder_client):
volumes = os_utils.get_volumes(cinder_client)
if volumes is not None:
for volume in volumes:
volumes = os_utils.get_volumes(cinder_client)
if volumes is not None:
for volume in volumes:
- dic_volumes.update({volume.id: volume.
display_
name})
+ dic_volumes.update({volume.id: volume.name})
return {'volumes': dic_volumes}
return {'volumes': dic_volumes}