change for get joid onos ip

[functest.git] / testcases / functest_utils.py

diff --git a/testcases/functest_utils.py b/testcases/functest_utils.py
index 92ababc..b3549ee 100644 (file)
--- a/testcases/functest_utils.py
+++ b/testcases/functest_utils.py
@@ -88,8 +88,8 @@ def get_instance_status(nova_client, instance):
         instance = nova_client.servers.get(instance.id)
         return instance.status
     except Exception, e:
-        print "Error [get_instance_status(nova_client, instance)]:" % \
-                                                        str(instance), e
+        print "Error [get_instance_status(nova_client, '%s')]:" % \
+            str(instance), e
         return None
 
 
@@ -98,7 +98,8 @@ def get_instance_by_name(nova_client, instance_name):
         instance = nova_client.servers.find(name=instance_name)
         return instance
     except Exception, e:
-        print "Error [get_instance_by_name(nova_client, '%s')]:" %instance_name, e
+        print "Error [get_instance_by_name(nova_client, '%s')]:" % \
+            instance_name, e
         return None
 
 
@@ -543,6 +544,36 @@ def delete_volume(cinder_client, volume_id, forced=False):
         return False
 
 
+def list_volume_types(cinder_client, public=True, private=True):
+    try:
+        volume_types = cinder_client.volume_types.list()
+        if not public:
+            volume_types = [vt for vt in volume_types if not vt.is_public]
+        if not private:
+            volume_types = [vt for vt in volume_types if vt.is_public]
+        return volume_types
+    except:
+        return None
+
+
+def create_volume_type(cinder_client, name):
+    try:
+        volume_type = cinder_client.volume_types.create(name)
+        return volume_type
+    except:
+        print "Error:", sys.exc_info()[0]
+        return None
+
+
+def delete_volume_type(cinder_client, volume_type):
+    try:
+        cinder_client.volume_types.delete(volume_type)
+        return True
+    except:
+        print "Error:", sys.exc_info()[0]
+        return False
+
+
 
 #*********************************************
 #   KEYSTONE