Merge pull request #5861 from TaykYoku/v7r2_fixhack-1

[v7r2] return standard result in PublisherHandler.getSite

Author: fstagni

src/DIRAC/ResourceStatusSystem/Service/PublisherHandler.py

@@ -183,9 +183,10 @@ def export_getTree(self, elementType, elementName):
         finds its parent site and returns all descendants of that site.
         """
 
-        site = self.getSite(elementType, elementName)
-        if not site:
-            return S_ERROR("No site")
+        result = self.getSite(elementType, elementName)
+        if not result["OK"]:
+            return result
+        site = result["Value"]
 
         siteStatus = self.rsClient.selectStatusElement(
             "Site", "Status", name=site, meta={"columns": ["StatusType", "Status"]}
@@ -284,10 +285,10 @@ def getSite(self, elementType, elementName):
         if elementType == "StorageElement":
             elementType = "SE"
 
-        domainNames = gConfig.getSections("Resources/Sites")
-        if not domainNames["OK"]:
-            return domainNames
-        domainNames = domainNames["Value"]
+        result = gConfig.getSections("Resources/Sites")
+        if not result["OK"]:
+            return result
+        domainNames = result["Value"]
 
         for domainName in domainNames:
 
@@ -299,9 +300,9 @@ def getSite(self, elementType, elementName):
 
                 elements = gConfig.getValue("Resources/Sites/%s/%s/%s" % (domainName, site, elementType), "")
                 if elementName in elements:
-                    return site
+                    return S_OK(site)
 
-        return ""
+        return S_ERROR("No site")
 
     # ResourceManagementClient ...................................................