Merge 3f04643 into 08d4951

xapi-project · Jun 9, 2015 · 196dd62 · 196dd62
2 parents 08d4951 + 3f04643
commit 196dd62
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/drivers/blktap2.py b/drivers/blktap2.py
@@ -1006,7 +1006,7 @@ def from_cli(cls, uuid):
         import XenAPI
 
         session = XenAPI.xapi_local()
-        session.xenapi.login_with_password('root', '')
+        session.xenapi.login_with_password('root', '', '', 'SM')
 
         target = sm.VDI.from_uuid(session, uuid)
         driver_info = target.sr.srcmd.driver_info
@@ -1448,7 +1448,7 @@ def _get_pool_config(self, pool_name):
             # special pool
             return pool_info
         session = XenAPI.xapi_local()
-        session.xenapi.login_with_password('root', '')
+        session.xenapi.login_with_password('root', '', '', 'SM')
         sr_ref = self.target.vdi.sr.srcmd.params.get('sr_ref')
         sr_config = session.xenapi.SR.get_other_config(sr_ref)
         vdi_config = session.xenapi.VDI.get_other_config(vdi_ref)
@@ -1713,7 +1713,7 @@ def setup_cache(self, sr_uuid, vdi_uuid, params):
                 return
 
         session = XenAPI.xapi_local()
-        session.xenapi.login_with_password('root', '')
+        session.xenapi.login_with_password('root', '', '', 'SM')
 
         dev_path = None
         local_sr_uuid = params.get(self.CONF_KEY_CACHE_SR)
@@ -1892,7 +1892,7 @@ def remove_cache(self, sr_uuid, vdi_uuid, params):
             return
 
         session = XenAPI.xapi_local()
-        session.xenapi.login_with_password('root', '')
+        session.xenapi.login_with_password('root', '', '', 'SM')
 
         if caching:
             self._remove_cache(session, local_sr_uuid)

diff --git a/drivers/cleanup.py b/drivers/cleanup.py
@@ -240,7 +240,7 @@ class LookupError(util.SMException):
 
     def getSession():
         session = XenAPI.xapi_local()
-        session.xenapi.login_with_password(XAPI.USER, '')
+        session.xenapi.login_with_password(XAPI.USER, '', '', 'SM')
         return session
     getSession = staticmethod(getSession)
 

diff --git a/drivers/coalesce-leaf b/drivers/coalesce-leaf
@@ -110,7 +110,7 @@ def leaf_coalesce(session, coalesceable_vdis):
 
 def vm_leaf_coalesce(vm_uuid):
     session = XenAPI.xapi_local()
-    session.xenapi.login_with_password('root', '')
+    session.xenapi.login_with_password('root', '', '', 'SM')
 
     messages = []
     vdis = {}

diff --git a/drivers/lcache.py b/drivers/lcache.py
@@ -206,7 +206,7 @@ def from_cli(cls):
         import XenAPI
 
         session = XenAPI.xapi_local()
-        session.xenapi.login_with_password('root', '')
+        session.xenapi.login_with_password('root', '', '', 'SM')
 
         return cls.from_session(session)
 

diff --git a/drivers/resetvdis.py b/drivers/resetvdis.py
@@ -133,7 +133,7 @@ def usage():
         usage()
 
     session = XenAPI.xapi_local()
-    session.xenapi.login_with_password('root', '')
+    session.xenapi.login_with_password('root', '', '', 'SM')
     mode = sys.argv[1]
     if mode == "all":
         if len(sys.argv) not in [4, 5]:

diff --git a/drivers/util.py b/drivers/util.py
@@ -579,7 +579,7 @@ def get_localAPI_session():
     # First acquire a valid session
     session = XenAPI.xapi_local()
     try:
-        session.xenapi.login_with_password('root','')
+        session.xenapi.login_with_password('root', '', '', 'SM')
     except:
         raise xs_errors.XenError('APISession')
     return session

diff --git a/snapwatchd/snapwatchd b/snapwatchd/snapwatchd
@@ -137,7 +137,7 @@ def gen_SnapString(dict):
 
 def get_localAPI_session():
     session = XenAPI.xapi_local()
-    session.xenapi.login_with_password('root','')
+    session.xenapi.login_with_password('root', '', '', 'SM')
     return session
 
 def _getDevUUIDlist(h,uuid):