move ckey/cert functions to Utils.CertTools

src/python/Utils/CertTools.py

@@ -3,6 +3,18 @@
 import os
 
 
+def ckey():
+    "Return user CA key either from proxy or userkey.pem"
+    pair = getKeyCertFromEnv()
+    return pair[0]
+
+
+def cert():
+    "Return user CA cert either from proxy or usercert.pem"
+    pair = getKeyCertFromEnv()
+    return pair[1]
+
+
 def getKeyCertFromEnv():
     """
     gets key and certificate from environment variables

src/python/WMCore/MicroService/MSRuleCleaner/MSRuleCleaner.py

@@ -28,15 +28,15 @@
 from WMCore.MicroService.DataStructs.DefaultStructs import RULECLEANER_REPORT
 from WMCore.MicroService.MSRuleCleaner.MSRuleCleanerWflow import MSRuleCleanerWflow
 from WMCore.MicroService.MSCore import MSCore
-from WMCore.MicroService.Tools.Common import ckey, cert
 from WMCore.Services.pycurl_manager import RequestHandler
 from WMCore.Services.Rucio.Rucio import WMRucioDIDNotFoundException
 from WMCore.ReqMgr.DataStructs import RequestStatus
-from Utils.Pipeline import Pipeline, Functor
 from WMCore.WMException import WMException
 from WMCore.Services.LogDB.LogDB import LogDB
 from WMCore.Services.WMStatsServer.WMStatsServer import WMStatsServer
 from WMCore.MicroService.Tools.Common import findParent
+from Utils.Pipeline import Pipeline, Functor
+from Utils.CertTools import ckey, cert
 
 
 class MSRuleCleanerResolveParentError(WMException):

src/python/WMCore/MicroService/Tools/Common.py

@@ -21,7 +21,7 @@
 
 # WMCore modules
 from Utils.IteratorTools import grouper
-from Utils.CertTools import getKeyCertFromEnv
+from Utils.CertTools import getKeyCertFromEnv, ckey, cert
 from WMCore.Services.pycurl_manager import RequestHandler
 from WMCore.Services.pycurl_manager import getdata as multi_getdata
 
@@ -503,18 +503,6 @@ def gigaBytes(size):
     return round(size / (1000 ** 3), 2)
 
 
-def ckey():
-    "Return user CA key either from proxy or userkey.pem"
-    pair = getKeyCertFromEnv()
-    return pair[0]
-
-
-def cert():
-    "Return user CA cert either from proxy or usercert.pem"
-    pair = getKeyCertFromEnv()
-    return pair[1]
-
-
 def elapsedTime(time0, msg='Elapsed time', ndigits=1):
     "Helper function to return elapsed time message"
     msg = "%s: %s sec" % (msg, round(time.time() - time0, ndigits))