Added keystone constructor with tenantid

diegoparrilla · diegoparrilla · commit 2e8b7f4c8aa2 · 2016-06-15T13:23:47.000+02:00
Get the list of snapshots in cinder
diff --git a/cinder.py b/cinder.py
@@ -44,6 +44,17 @@ def get_all_volumes(self, tenant_id):
             data = None
         return data
 
+    def get_all_snapshots(self, tenant_id):
+        headers = {"X-Auth-Token": "%s" % self.token_, "Content-Type": "application/json"}
+        r = requests.get("%s/%s/snapshots" % (self.url_, tenant_id), headers=headers, verify=False)
+        if r.status_code == 200:
+            data = r.json()
+            if 'error' in data:
+                raise Exception(data['error']['message'])
+        else:
+            data = None
+        return data
+
     def get_all_global_volumes(self, tenant_id):
         headers = {"X-Auth-Token": "%s" % self.token_, "Content-Type": "application/json"}
         r = requests.get("%s/%s/volumes/detail?all_tenants=1" % (self.url_, tenant_id), headers=headers, verify=False)
diff --git a/keystone.py b/keystone.py
@@ -33,19 +33,24 @@ class Keystone:
     credentials_ = None
     tenantId_ = None
     
-    def __init__(self, url, username, password, tenant):
+    def __init__(self, url, username, password, tenant, tenantid = None):
         self.url_ = url
         self.username_ = username
         self.password_ = password
-        self.tenant_ = tenant
-        credentials = json.dumps({"auth":{"passwordCredentials": {"username": "%s" % self.username_ , "password": "%s" % self.password_}, "tenantName": "%s" %  self.tenant_}})
+        if tenantid is None:
+            self.tenant_ = tenant
+            credentials = json.dumps({"auth":{"passwordCredentials": {"username": "%s" % self.username_ , "password": "%s" % self.password_}, "tenantName": "%s" %  self.tenant_}})
+        else:
+            self.tenantId_ = tenantid
+            credentials = json.dumps({"auth":{"passwordCredentials": {"username": "%s" % self.username_ , "password": "%s" % self.password_}, "tenantId": "%s" %  self.tenantId_}})
         headers = {"Content-Type": "application/json"}
         r = requests.post("%s/tokens" % self.url_, headers=headers, data=credentials, verify=False)
         if r.status_code==200:
             self.credentials_ = r.json()
             self.token_ = self.credentials_['access']['token']['id']
             self.tenantId_ = self.credentials_['access']['token']['tenant']['id']
-        
+            self.tenant_ = self.credentials_['access']['token']['tenant']['name']
+
     def getToken(self):
         if self.token_==None:
             return None
