Global renaming from APISession to ApiSession.

Signed-off-by: Arnaud Garcia-Fernandez <arnaud.garcia-fernandez@vates.tech>

Author: Ythogtha

drivers/LinstorSR.py

@@ -2585,7 +2585,7 @@ def _start_persistent_http_server(volume_name):
                 # Use a timeout call because XAPI may be unusable on startup
                 # or if the host has been ejected. So in this case the call can
                 # block indefinitely.
-                api_session = util.timeout(5, util.APISession, "SM-ha-linstor-http-server")
+                api_session = util.timeout(5, util.ApiSession, "SM-ha-linstor-http-server")
                 session = api_session.session
                 host_ip = util.get_this_host_address(session)
             except:
@@ -2672,7 +2672,7 @@ def _start_persistent_nbd_server(self, volume_name):
                 device_size = 256 * 1024 * 1024
 
             try:
-                api_session = util.timeout(5, util.APISession, "SM-ha-linstor-nbd-server")
+                api_session = util.timeout(5, util.ApiSession, "SM-ha-linstor-nbd-server")
                 session = api_session.session
                 ips = util.get_host_addresses(session)
             except Exception as e:

drivers/XE_SR_ERRORCODES.xml

@@ -521,7 +521,7 @@
 
        <!-- Agent database query errors 150+ -->
         <code>
-                <name>APISession</name>
+                <name>ApiSession</name>
                 <description>Failed to initialize XMLRPC connection</description>
                 <value>150</value>
         </code>

drivers/blktap2.py

@@ -882,7 +882,7 @@ def abort_linstor_gc(drbd_path: str) -> bool:
 
         openers = get_all_volume_openers(volume_name, "0")
 
-        api_session = util.timeout(5, util.APISession, "SM-blktap2-abort_linstor_gc")
+        api_session = util.timeout(5, util.ApiSession, "SM-blktap2-abort_linstor_gc")
         try:
             srs = util.get_linstor_srs_uuid(api_session.session)
             pbd_ref = util.find_pbd_ref_from_dconf_value(
@@ -1154,7 +1154,7 @@ def get_o_direct_capability(self, options):
 
     @classmethod
     def from_cli(cls, uuid):
-        with util.APISession("SM-blktap2") as session:
+        with util.ApiSession("SM-blktap2") as session:
             target = sm.VDI.from_uuid(session, uuid)
             driver_info = target.sr.srcmd.driver_info
         return cls(uuid, target, driver_info)

drivers/cleanup.py

@@ -303,7 +303,7 @@ def __init__(self, session, srUuid):
         self.session = session
         self._api_session = None
         if self.session is None:
-            self._api_session = util.APISession("SM-GC")
+            self._api_session = util.ApiSession("SM-GC")
             self.session = self._api_session.session
         self._srRef = self.session.xenapi.SR.get_by_uuid(srUuid)
         self.srRecord = self.session.xenapi.SR.get_record(self._srRef)
@@ -2121,7 +2121,7 @@ def msg_cleared(self, xapi_session, msg_ref):
         return msg is None
 
     def check_no_space_candidates(self):
-        with util.APISession("SM-GC-check_no_space") as xapi_session:
+        with util.ApiSession("SM-GC-check_no_space") as xapi_session:
             msg_id = self.xapi.srRecord["sm_config"].get(VDI.DB_GC_NO_SPACE)
             if self.no_space_candidates:
                 if msg_id is None or self.msg_cleared(xapi_session, msg_id):
@@ -3928,7 +3928,7 @@ def _abort_gc_from_openers(uuid: str, is_vdi_uuid: bool, openers: "LinstorVolume
                 if node_name == hostname:
                     continue
 
-                with util.timeout(5), util.APISession("SM-GC-coalescing") as session:
+                with util.timeout(5), util.ApiSession("SM-GC-coalescing") as session:
                     sr_uuid = util.get_sr_uuid_from_vdi_uuid(session, uuid) if is_vdi_uuid else uuid
                     util.SMlog(f"LINSTOR volume is coalescing on `{sr_uuid}`. We're going to interrupt the GC...")
                     return util.strtobool(session.xenapi.host.call_plugin(

drivers/coalesce-leaf

@@ -229,7 +229,7 @@ def main():
         print(USAGE_STRING % sys.argv[0])
         sys.exit(-1)
 
-    with util.APISession("SM-coalesce-leaf") as session:
+    with util.ApiSession("SM-coalesce-leaf") as session:
         ret, messages = vm_leaf_coalesce(session, uuid)
     if messages:
         print("\n".join(messages))

drivers/lcache.py

@@ -221,7 +221,7 @@ def from_session(cls, session):
 
     @classmethod
     def from_cli(cls):
-        with util.APISession("SM-local-cache") as session:
+        with util.ApiSession("SM-local-cache") as session:
             return cls.from_session(session)
 
     def statvfs(self):

drivers/linstorcowutil.py

@@ -651,7 +651,7 @@ def clear(self):
     def __init__(self, uri, group_name) -> None:
         self._uri = uri
         self._group_name = group_name
-        self._loads: List[util.APISession] = []
+        self._loads: List[util.ApiSession] = []
         self._executor_data = self.ExecutorData()
 
     def __del__(self):
@@ -678,7 +678,7 @@ def get_local_cowutil(self, vdi_type):
         return instance
 
     def _init_executor_thread(self):
-        api_session = util.APISession("SM-linstorvhdutil")
+        api_session = util.ApiSession("SM-linstorvhdutil")
         try:
             linstor = LinstorVolumeManager(
                 self._uri,

drivers/linstorvolumemanager.py

@@ -101,7 +101,7 @@ def get_all_volume_openers(resource_name, volume) -> LinstorVolumeOpeners:
     volume = str(volume)
     openers = {}
 
-    with util.APISession("SM-get-linstor-volume-openers") as session:
+    with util.ApiSession("SM-get-linstor-volume-openers") as session:
         hosts = session.xenapi.host.get_all_records()
         for host_ref, host_record in hosts.items():
             node_name = host_record['hostname']
@@ -190,7 +190,7 @@ def get_controller_node_name():
         if res:
             return res.groups()[0]
 
-    session = util.timeout(5, util.APISession, "SM-get-linstor-controller-node-name").session
+    session = util.timeout(5, util.ApiSession, "SM-get-linstor-controller-node-name").session
 
     for host_ref, host_record in session.xenapi.host.get_all_records().items():
         node_name = host_record['hostname']
@@ -213,7 +213,7 @@ def get_controller_node_name():
 def demote_drbd_resource(node_name, resource_name):
     PLUGIN_CMD = 'demoteDrbdResource'
 
-    session = util.timeout(5, util.APISession, "SM-demote-drbd-resource").session
+    session = util.timeout(5, util.ApiSession, "SM-demote-drbd-resource").session
 
     for host_ref, host_record in session.xenapi.host.get_all_records().items():
         if host_record['hostname'] != node_name:
@@ -1410,7 +1410,7 @@ def destroy(self):
             # It needs to be done locally by each host so we go through the linstor-manager plugin.
             # If we don't do this sometimes, the destroy will fail when trying to destroy the resource groups with:
             # "linstor-manager:destroy error: Failed to destroy SP `xcp-sr-linstor_group_thin_device` on node `r620-s2`: The specified storage pool 'xcp-sr-linstor_group_thin_device' on node 'r620-s2' can not be deleted as volumes / snapshot-volumes are still using it."
-            session = util.timeout(5, util.APISession, "SM-linstor-destroy").session
+            session = util.timeout(5, util.ApiSession, "SM-linstor-destroy").session
             for host_ref in session.xenapi.host.get_all():
                 try:
                     response = session.xenapi.host.call_plugin(

drivers/mpathcount.py

@@ -280,7 +280,7 @@ def add(key, val):
 
 if __name__ == '__main__':
     try:
-        with util.APISession("SM-mpathcount") as api_session:
+        with util.ApiSession("SM-mpathcount") as api_session:
             main(api_session)
     except xs_errors.XenError as e:
         util.SMlog(f"MPATH: Failure `{e}`")

drivers/plugins/keymanagerutil.py

@@ -39,7 +39,7 @@ def load_key(key_hash, vdi_uuid):
 
 
 def _check_key(key_hash, vdi_uuid):
-    with util.APISession(PROGRAM_NAME) as session:
+    with util.ApiSession(PROGRAM_NAME) as session:
         vdi = session.xenapi.VDI.get_by_uuid(vdi_uuid)
         sm_config = session.xenapi.VDI.get_sm_config(vdi)
         if 'key_hash' in sm_config: