reqmgr2ms-monitor 2.3.4rc2__tar.gz → 2.3.4rc4__tar.gz

{reqmgr2ms-monitor-2.3.4rc2/src/python/reqmgr2ms_monitor.egg-info → reqmgr2ms-monitor-2.3.4rc4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: reqmgr2ms-monitor
-Version: 2.3.4rc2
+Version: 2.3.4rc4
 Summary: UNKNOWN
 Home-page: https://github.com/dmwm/WMCore
 Maintainer: CMS DMWM Group

{reqmgr2ms-monitor-2.3.4rc2 → reqmgr2ms-monitor-2.3.4rc4}/bin/wmagent-couchapp-init

@@ -18,6 +18,19 @@ from WMCore.Configuration import loadConfigurationFile
 from WMCore.Lexicon import splitCouchServiceURL
 from WMCore.WMBase import getWMBASE
 
+parser = argparse.ArgumentParser()
+parser.add_argument("--skip-cron", dest = "cron",
+                    default = True, action = "store_false",
+                    help = "Do not install maintenance cron jobs")
+parser.add_argument("--only-cron", dest = "pushApps",
+                    default = True, action = "store_false",
+                    help = "Install only maintenance cron jobs")
+options = parser.parse_args()
+
+if not options.cron and not options.pushApps:
+    print("Mutually excluding options: --skip-cron && --only-cron")
+    print("Chose only one of them.")
+    sys.exit(1)
 
 def couchAppRoot(couchapp):
     """Return parent path containing couchapp"""
@@ -31,7 +44,32 @@ def couchAppRoot(couchapp):
         return os.path.join(wmcoreroot, 'data', 'couchapps')
     raise OSError('Cannot find couchapp: %s' % couchapp)
 
-
+# Defining a minimal decorator with parameter
+def pushApps(pushAppsFlag):
+    """
+    Decorator with a single Bool parameter
+    :param pushApps: Bool parameter to check if the callFunc is to be executed or not
+    :return:         The decorated function with call arguments if pushApps=True
+    """
+    def pushAppsDecorator(callFunc):
+        """
+        An Auxiliary simple decorator
+        """
+        def installCouchAppWrapper(*args, **kwargs):
+            """
+            The callFunc wrapper. To decide whether to return the call to the
+            wrapped function or not based on the decorator's pushAppsFlag
+            :*args:    All parameters passed to the wrapped function call
+            :**kwargs: All keyword arguments passed to the wrapped function call
+            """
+            if pushAppsFlag:
+                return callFunc(*args, **kwargs)
+            else:
+                return
+        return installCouchAppWrapper
+    return pushAppsDecorator
+
+@pushApps(options.pushApps)
 def installCouchApp(couchUrl, couchDBName, couchAppName, basePath=None):
     """
     _installCouchApp_
@@ -273,11 +311,6 @@ files_needed_from_yui = [
 
 
 if __name__ == "__main__":
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--skip-cron", dest = "cron",
-                        default = True, action = "store_false",
-                        help = "Do not install maintenance cron jobs")
-    options = parser.parse_args()
 
     if "WMAGENT_CONFIG" not in os.environ:
         print("The WMAGENT_CONFIG environment variable needs to be set before")
@@ -285,7 +318,7 @@ if __name__ == "__main__":
         sys.exit(1)
 
     wmagentConfig = loadConfigurationFile(os.environ["WMAGENT_CONFIG"])
-            
+
     if hasattr(wmagentConfig, "JobStateMachine") and hasattr(wmagentConfig.JobStateMachine, "couchDBName"):
         fwjrDumpName = urllib.parse.quote_plus("%s/fwjrs" % wmagentConfig.JobStateMachine.couchDBName)
         jobDumpName = urllib.parse.quote_plus("%s/jobs" % wmagentConfig.JobStateMachine.couchDBName)
@@ -355,7 +388,7 @@ if __name__ == "__main__":
            urlsplit(wmagentConfig.WorkloadSummary.couchurl).scheme == 'http':
             installCouchApp(wmagentConfig.ACDC.couchurl, wmagentConfig.ACDC.database, "ACDC")
             installCouchApp(wmagentConfig.ACDC.couchurl, wmagentConfig.ACDC.database, "GroupUser")
-    
+
     if hasattr(wmagentConfig, "Tier0Feeder"):
         installCouchApp(wmagentConfig.JobStateMachine.couchurl, wmagentConfig.Tier0Feeder.requestDBName, "T0Request")
         centralWMStatsURL = wmagentConfig.General.centralWMStatsURL

{reqmgr2ms-monitor-2.3.4rc2 → reqmgr2ms-monitor-2.3.4rc4}/src/python/WMCore/Services/TagCollector/XMLUtils.py

@@ -71,7 +71,7 @@ def get_children(elem, event, row, key):
     row for given key. The change of notations can be applied during
     parsing step by using provided notations dictionary.
     """
-    for child in elem.getchildren():
+    for child in list(elem):
         child_key = child.tag
         child_data = child.attrib
         if not child_data:
@@ -79,7 +79,7 @@ def get_children(elem, event, row, key):
         else:
             child_dict = child_data
 
-        if child.getchildren():  # we got grand-children
+        if list(child):  # we got grand-children
             if child_dict:
                 row[key][child_key] = child_dict
             else:

{reqmgr2ms-monitor-2.3.4rc2 → reqmgr2ms-monitor-2.3.4rc4}/src/python/WMCore/__init__.py

@@ -6,5 +6,5 @@ Core libraries for Workload Management Packages
 
 """
 
-__version__ = '2.3.4rc2'
+__version__ = '2.3.4rc4'
 __all__ = []

{reqmgr2ms-monitor-2.3.4rc2 → reqmgr2ms-monitor-2.3.4rc4/src/python/reqmgr2ms_monitor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: reqmgr2ms-monitor
-Version: 2.3.4rc2
+Version: 2.3.4rc4
 Summary: UNKNOWN
 Home-page: https://github.com/dmwm/WMCore
 Maintainer: CMS DMWM Group