fix: registerAndGetOwnerId is private method

Author: fstagni

src/DIRAC/WorkloadManagementSystem/DB/SandboxMetadataDB.py

@@ -12,7 +12,7 @@ def __init__(self):
         DB.__init__(self, "SandboxMetadataDB", "WorkloadManagement/SandboxMetadataDB")
         result = self.__initializeDB()
         if not result["OK"]:
-            raise RuntimeError("Can't create tables: %s" % result["Message"])
+	    raise RuntimeError(f"Can't create tables: {result['Message']}")
         self.__assignedSBGraceDays = 0
         self.__unassignedSBGraceDays = 15
 
@@ -73,7 +73,7 @@ def __initializeDB(self):
 
         return self._createTables(tablesToCreate)
 
-    def registerAndGetOwnerId(self, owner, ownerDN, ownerGroup):
+    def __registerAndGetOwnerId(self, owner, ownerDN, ownerGroup):
         """
         Get the owner ID and register it if it's not there
         """
@@ -112,7 +112,7 @@ def registerAndGetSandbox(self, owner, ownerDN, ownerGroup, sbSE, sbPFN, size=0)
         Register a new sandbox in the metadata catalog
         Returns ( sbid, newSandbox )
         """
-        result = self.registerAndGetOwnerId(owner, ownerDN, ownerGroup)
+	result = self.__registerAndGetOwnerId(owner, ownerDN, ownerGroup)
         if not result["OK"]:
             return result
         ownerId = result["Value"]
@@ -144,7 +144,7 @@ def registerAndGetSandbox(self, owner, ownerDN, ownerGroup, sbSE, sbPFN, size=0)
             return S_OK((result["lastRowId"], True))
         result = self._query("SELECT LAST_INSERT_ID()")
         if not result["OK"]:
-            return S_ERROR("Can't determine sand box id after insertion")
+	    return S_ERROR("Can't determine sandbox id after insertion")
         return S_OK((result["Value"][0][0], True))
 
     def accessedSandboxById(self, sbId):
@@ -273,7 +273,7 @@ def unassignEntities(self, entitiesDict, requesterName, requesterGroup):
             escapedSetup = self._escapeString(entitySetup)["Value"]
             result = self.__filterEntitiesByRequester(entitiesIds, escapedSetup, requesterName, requesterGroup)
             if not result["OK"]:
-                gLogger.error("Cannot filter entities: %s" % result["Message"])
+		gLogger.error(f"Cannot filter entities: {result['Message']}")
                 continue
             ids = result["Value"]
             if not ids:
@@ -283,7 +283,7 @@ def unassignEntities(self, entitiesDict, requesterName, requesterGroup):
             sqlCmd = "DELETE FROM `sb_EntityMapping` WHERE %s" % " AND ".join(sqlCond)
             result = self._update(sqlCmd)
             if not result["OK"]:
-                gLogger.error("Cannot unassign entities: %s" % result["Message"])
+		gLogger.error(f"Cannot unassign entities: {result['Message']}")
             else:
                 updated += 1
         return S_OK(updated)

tests/Integration/WorkloadManagementSystem/Test_SandboxStoreClient.py

@@ -29,9 +29,6 @@
         python -m pytest -c ../pytest.ini  -vv tests/Integration/WorkloadManagementSystem/Test_SandboxStoreClient.py
 """
 
-from __future__ import print_function
-from __future__ import absolute_import
-from __future__ import division
 from DIRAC.Core.Base.Script import parseCommandLine
 
 parseCommandLine()
@@ -47,7 +44,7 @@
 gLogger.setLevel("DEBUG")
 
 
-def test_SSCChain(self):
+def test_SSCChain():
     """full test of functionalities"""
     ssc = SandboxStoreClient()
     smDB = SandboxMetadataDB()
@@ -71,3 +68,8 @@ def test_SSCChain(self):
     # # cleaning
     # res = smDB.deleteSandboxes(SBIdList)
     # assert res['OK'] is True
+
+
+def test_SandboxMetadataDB():
+    smDB = SandboxMetadataDB()
+    smDB.registerAndGetSandbox("owner_1", "owner_1_DN", "owner_1_group", "sbSE", "/sb/pfn/1.tar.bz2")