Changeset c259a77 for fedd/fedd_ns2topdl.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_ns2topdl.py (modified) (4 diffs)

fedd/fedd_ns2topdl.py

@@ -8 +8 @@
 from federation.remote_service import service_caller
 from federation.client_lib import client_opts, exit_with_fault, RPCException, \
-        wrangle_standard_options, do_rpc, get_experiment_names, save_certfile
+        wrangle_standard_options, do_rpc, get_experiment_names, save_certfile,\
+        ns_service_re
 
 class ns_topdl_opts(client_opts):
@@ -26 +27 @@
 except RuntimeError, e:
     sys.exit("%s" %e)
-
+svcs = []
+contents = ''
 if opts.file:
     try:
-        contents = "".join([l for l in open(opts.file, "r")])
+        for l in open(opts.file, 'r'):
+            contents += l
+            if  ns_service_re.match(l):
+                svcs.append('SERVICE: %s' % ns_service_re.match(l).group(1))
     except EnvironmentError, e:
         sys.exit("Can't read %s: %s" % (opts.file, e))
@@ -62 +67 @@
     sys.exit("Bad response. %s" % e.message)
 
+if len(svcs) > 0 :
+    comments = '<!--\n%s\n-->' % '\n'.join(svcs)
+else:
+    comments = ''
+
 if opts.outfile:
     try:
         f = open(opts.outfile, "w")
+        print >>f, comments
         print >>f, topdl.topology_to_xml(top, top="experiment")
         f.close()
@@ -70 +81 @@
         sys.exit("Can't write to %s: %s" % (opts.outfile, e))
 else:
+    print comments
     print topdl.topology_to_xml(top, top="experiment")
 proof = proof.from_dict(resp_dict.get('proof', {}))