Changeset 3533

Timestamp:

10/08/2009 03:05:42 PM (2 months ago)

Author:

brian

Message:

Made fixes requested by Arvind

Files:

• rsvreports/setup.cfg (modified) (1 diff)
• rsvreports/src/rsvreports/info.py (modified) (1 diff)
• rsvreports/src/rsvreports/rsv_v11.py (modified) (3 diffs)
• rsvreports/src/rsvreports/rsv_v12.py (modified) (1 diff)
• rsvreports/src/rsvreports/rsv_v13.py (modified) (1 diff)
• rsvreports/src/rsvreports/rsv_v3.py (modified) (4 diffs)
• rsvreports/src/rsvreports/rsv_v7.py (modified) (1 diff)

rsvreports/setup.cfg

@@ -2 +2 @@
-[bdist_rpm]
-requires = setuptools MySQL-python
-1
+4
-
-[install]

rsvreports/src/rsvreports/info.py

@@ -60 +60 @@
-getSiteNames = \
-"""
-
+ as ResourceName
-FROM %(oim)s.resource OIMR
-
+, ResourceName
-"""
-

rsvreports/src/rsvreports/rsv_v11.py

@@ -1 +1 @@
-
-import re
+import sets
-
-from rsv_v7 import RSVreport as RSVreport_7
@@ -9 +10 @@
-        RSVreport_7.__init__(self, *args)
-        self.load_vo_sites()
+        self.resource_group_to_resources = self.info.mapResourceGroupToResource()
-
-    def subject(self):
@@ -26 +28 @@
-            self.cms_sites = []
-
+    def hasLHCResource(self, resource_group):
+        resources = self.resource_group_to_resources.setdefault(resource_group,
+            sets.Set())
+        for resource in resources:
+            resource = self.info.mapOIMFQDNToResource(resource)
+            self._log.debug("Checking resource group %s's resource %s for " \
+                "being in LHC." % (resource_group, resource))
+            for s in self.atlas_sites:
+                s_re = re.compile(s)
+                if s_re.search(resource):
+                    self._log.debug("Resource group %s matches ATLAS resource" \
+                        " %s" % (resource_group, s))
+                    return True
+        for s in self.atlas_sites:
+            s_re = re.compile(s)
+            if s_re.search(resource_group):
+                return True
+        return False
+
-    def getFormattedResourceName(self, resource):
-
+
+
+
-            return "*" + resource
-        return None

rsvreports/src/rsvreports/rsv_v12.py

@@ -13 +13 @@
-        return "CMS_RSV_GridView_Comparison"
-
+    def hasLHCResource(self, resource_group):
+        resources = self.resource_group_to_resources.setdefault(resource_group,
+            sets.Set())
+        for resource in resources:
+            resource = self.info.mapOIMFQDNToResource(resource)
+            self._log.debug("Checking resource group %s's resource %s for " \
+                "being in LHC." % (resource_group, resource))
+            for s in self.cms_sites:
+                s_re = re.compile(s)
+                if s_re.search(resource):
+                    self._log.debug("Resource group %s matches ATLAS resource" \
+                        " %s" % (resource_group, s))
+                    return True
+        for s in self.cms_sites:
+            s_re = re.compile(s)
+            if s_re.search(resource_group):
+                return True
+        return False
+
-    def getFormattedResourceName(self, resource):
-        if resource in self.cms_sites:

rsvreports/src/rsvreports/rsv_v13.py

@@ -296 +296 @@
-                if s_re.search(resource):
-                    self._log.debug("Resource group %s matches ATLAS resource" \
-
+)
-                    return True
-        for s in self.cms_sites:

rsvreports/src/rsvreports/rsv_v3.py

@@ -1 +1 @@
-
+import re
-import sys
-import sets
@@ -104 +105 @@
-        self.explain_avail_html = explain_avail_html
-        self.explain_avail_plain = explain_avail_plain
+        self.resource_group_to_resources =self.info.mapResourceGroupToResource()
+        self.load_lhc_sites()
+
+    def load_lhc_sites(self):
+        try:
+            self.atlas_sites = self.info.getVOOwnership("ATLAS")
+        except:
+            self.atlas_sites = []
+        try:
+            self.cms_sites = self.info.getVOOwnership("CMS")
+        except:
+            self.cms_sites = []
+
+    def hasLHCResource(self, resource_group):
+        resources = self.resource_group_to_resources.setdefault(resource_group,
+            sets.Set())
+        for resource in resources:
+            resource = self.info.mapOIMFQDNToResource(resource)
+            self._log.debug("Checking resource group %s's resource %s for " \
+                "being in LHC." % (resource_group, resource))
+            for s in self.cms_sites:
+                s_re = re.compile(s)
+                if s_re.search(resource):
+                    self._log.debug("Resource group %s matches CMS resource" \
+                        " %s" % (resource_group, s))
+                    return True
+            for s in self.atlas_sites:
+                s_re = re.compile(s)
+                if s_re.search(resource):
+                    self._log.debug("Resource group %s matches ATLAS resource" \
+                        " %s" % (resource_group, s))
+                    return True
+        for s in self.atlas_sites:
+            s_re = re.compile(s)
+            if s_re.search(resource_group):
+                return True
+        for s in self.cms_sites:
+            s_re = re.compile(s)
+            if s_re.search(resource_group):
+                return True
+        return False
-
-    def getEndDate(self):
@@ -160 +202 @@
-
-    def getFormattedResourceName(self, resource):
-
+
+
-            return " * %s" % str(resource)
-        return resource
@@ -183 +226 @@
-        if type in ['SE', 'SRMv2']:
-            filter_names = sets.Set()
-['BestmanXrootd']
-['SRMv2']
+.get('BestmanXrootd', [])
+.get('SRMv2', [])
-        else:
-            filter_names = self.info.getOIMServices()[type]

rsvreports/src/rsvreports/rsv_v7.py

@@ -81 +81 @@
-        sites.sort(cmp=cmp2)
-
-
+#
-
-        for site in sites:
-            if site in exclude_names:
+                self._log.info("Skipping excluded site %s." % site)
-                continue
-            formatted_name = self.getFormattedResourceName(site)
-            # Check that it should be in WLCG.
-
-
+
+
+
-            # Checks that we can correctly detect the name.
-            if not formatted_name:
-debug
+info
-                continue
-            if formatted_name.find('*') < 0:
-debug
+info
-                continue
+            self._log.info("Adding site %s to table" % site)
-            av = availability[site]
-            if av != None: