Changeset 3582

Timestamp:

10/26/2009 09:01:43 PM (1 month ago)

Author:

brian

Message:

ClassAd? generator update to add AccessPoints? and MountInfo?.

Files:

• gip/trunk/gip/libexec/osg_classad_transform.py (modified) (15 diffs)

gip/trunk/gip/libexec/osg_classad_transform.py

@@ -18 +18 @@
-import osg_info_wrapper
-import gip_common
+import gip_ldap
-
-log = gip_common.getLogger('CEMonUploader')
@@ -81 +82 @@
-    raise ValueError("Unable to find matching entry in list.")
-
-
+, all_cese_se
-    # Determine CESE binds, if any
-    if ce.multi:
@@ -88 +89 @@
-        unique = ce.glue['CEUniqueID']
-    adjacent_ses = []
+    se_to_cese = {}
-    for cese in all_cese:
-        if cese.multi and unique in cese.glue['CESEBindGroupCEUniqueID']:
@@ -94 +96 @@
-        elif not cese.multi and unique == cese.glue['CESEBindGroupCEUniqueID']:
-            adjacent_ses.append(cese.glue['CESEBindGroupSEUniqueID'])
-
+
+
+
+
+
+
+
+
+
+
-
-ap_multi_attributes = ['SEAccessProtocolEndpoint', 'SEAccessProtocolVersion',
@@ -100 +111 @@
-    'SEAccessProtocolMaxStreams']
-drop_attrs = ['GlueForeignKey', 'GlueSiteDescription', 'GlueSiteLocation',
-
+
+
+
-
-
@@ -354 +367 @@
-    def add_aps(self, aps, results):
-        for ap in aps:
-self, 
+
-        for attr in ap_multi_attributes:
-            attr_val = []
-            for ap in aps:
-                attr_val.append(str(ap.glue[attr][0]))
-_val
+
-
-    def add_software(self, software, results):
@@ -366 +379 @@
-    def emit(self, site=None, cluster=None, ce=None, voview=None, software=None,
-            aps=None, service=None, se=None, voinfo=None, sa=None,
-
+cese=None, 
-
-        if not site or not cluster or not ce:
@@ -386 +399 @@
-        if se:
-            self.add_to_results(se, results)
+        if cese:
+            self.add_to_results(cese, results)
-        if subcluster:
-            self.add_to_results(subcluster, results)
@@ -497 +512 @@
-    parser.add_option("-c", "--certificate", dest="certificate", help="Cert" \
-        "ificate file to use.", default=None)
+    parser.add_option("-i", "--uri", dest="uri", help="URI for input data.",
+        default=None)
-    parser.add_option("-k", "--keyfile", dest="key", help="Key file to use.",
-        default=None)
@@ -533 +550 @@
-        bdii = None
-    
-
+, options.uri
-
-
-def main():
-
-
+
+
+
+
+
+
-    upload(cae, bdii, entries)
-
@@ -561 +582 @@
-    all_sub = filter_by_class(entries, "GlueSubCluster")
-    all_cese = filter_by_class(entries, "GlueCESEBindGroup")
+    all_cese_se = filter_by_class(entries, "GlueCESEBind")
-    all_services = filter_by_class(entries, "GlueService")
-    all_cps = filter_by_class(entries, "GlueSEControlProtocol")
@@ -649 +671 @@
-        # Determine close SEs, if any
-        try:
-
+
+
-        except:
-            raise
- =
+, seid_to_cese = [],
-
-        # Determine VOViews on this CE
@@ -661 +684 @@
-        # (thinking about better ways to do this)
-        kw = {'site': site, 'cluster': cluster}
-        print >> sys.stderr, "Adjacent SEs %s." % ", ".join(adjacent_ses)
-        if adjacent_ses:
-            # All SEs
@@ -667 +689 @@
-                adjacent_sas = se_to_sas.get(se, [])
-                kw['se'] = id_to_se[se]
-se
+id_to_se[se]
-                kw['services'] = se_to_services.get(se, [])
+                if se in seid_to_cese:
+                    kw['cese'] = seid_to_cese[se]
-                # All SAs
-                if adjacent_sas:
@@ -693 +717 @@
-        bdii.run()
-
-def main():
-    cae, bdii = configure_emitter()
-    entries = osg_info_wrapper.main(return_entries=True)
-    upload(cae, bdii, entries)
-
-if __name__ == '__main__':