Changeset c259a77 for fedd/fedd_create.py

Timestamp:

Jun 3, 2014 4:29:31 PM (10 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

0b217d1

Parents:

ba07149

Message:

Service info in xml files.

File:

• fedd/fedd_create.py (modified) (5 diffs)

fedd/fedd_create.py

@@ -17 +17 @@
 from federation.client_lib import client_opts, exit_with_fault, RPCException, \
         wrangle_standard_options, do_rpc, get_experiment_names, save_certfile,\
-        get_abac_certs, log_authentication
+        get_abac_certs, log_authentication, parse_service,\
+        service_dict_to_line, ns_service_re, extract_services_from_xml
 from federation.util import abac_split_cert, abac_context_to_creds
 
@@ -58 +59 @@
         self.set_defaults(delegate=True)
 
-def parse_service(svc):
-    """
-    Pasre a service entry into a hash representing a service entry in a
-    message.  The format is:
-        svc_name:exporter(s):importer(s):attr=val,attr=val
-    The svc_name is teh service name, exporter is the exporting testbeds
-    (comma-separated) importer is the importing testbeds (if any) and the rest
-    are attr=val pairs that will become attributes of the service.  These
-    include parameters and other such stuff.
-    """
-
-    terms = svc.split(':')
-    svcd = { }
-    if len(terms) < 2 or len(terms[0]) == 0 or len(terms[1]) == 0:
-        sys.exit("Bad service description '%s': Not enough terms" % svc)
-    
-    svcd['name'] = terms[0]
-    svcd['export'] = terms[1].split(",")
-    if len(terms) > 2 and len(terms[2]) > 0:
-        svcd['import'] = terms[2].split(",")
-    if len(terms) > 3 and len(terms[3]) > 0:
-        svcd['fedAttr'] = [ ]
-        for t in terms[3].split(";"):
-            i = t.find("=")
-            if i != -1 :
-                svcd['fedAttr'].append(
-                        {'attribute': t[0:i], 'value': t[i+1:]})
-            else:
-                sys.exit("Bad service attribute '%s': no equals sign" % t)
-    return svcd
-
 def project_export_service(master, project):
     """
@@ -156 +126 @@
 
 # Main line
-service_re = re.compile('^\\s*#\\s*SERVICE:\\s*([\\S]+)')
 parser = fedd_create_opts()
 (opts, args) = parser.parse_args()
@@ -173 +142 @@
     try:
         top = topdl.topology_from_xml(filename=opts.file, top='experiment')
+        # Pull any service descriptions from the file as well
+        svcs = extract_services_from_xml(filename=opts.file)
     except EnvironmentError:
         # Can't read the file, fail now
@@ -186 +157 @@
             # Parse all the strings that we can pull out of the file using the
             # service_re.
-            svcs.extend([parse_service(service_re.match(l).group(1)) \
-                    for l in lines if service_re.match(l)])
+            svcs.extend([parse_service(ns_service_re.match(l).group(1)) \
+                    for l in lines if ns_service_re.match(l)])
         except EnvironmentError:
             sys.exit("Cannot read description file (%s)" %opts.file)