Changeset 0a49bd7 for fedd/fedd_ns2topdl.py

Timestamp:

Jan 15, 2011 5:52:15 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

aaf7f41

Parents:

ac15159 (diff), 944b746 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Ted Faber <faber@…> (01/15/11 17:51:40)

git-committer:

Ted Faber <faber@…> (01/15/11 17:52:15)

Message:

merge from current

File:

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

fedd/fedd_ns2topdl.py

@@ -4 +4 @@
 
 from federation import topdl
+from federation.proof import proof
 from federation.remote_service import service_caller
 from federation.client_lib import client_opts, exit_with_fault, RPCException, \
@@ -12 +13 @@
         client_opts.__init__(self)
         self.add_option("--file", dest="file", 
+                action='callback', callback=self.expand_file, type='str',
                 help="experiment description file")
         self.add_option("--output", dest="outfile", type="string",
@@ -19 +21 @@
 (opts, args) = parser.parse_args()
 
-cert, fid, url = wrangle_standard_options(opts)
+try:
+    cert, fid, url = wrangle_standard_options(opts)
+except RuntimeError, e:
+    sys.exit("%s" %e)
 
 if opts.file:
@@ -41 +46 @@
             responseBody="Ns2TopdlResponseBody")
 except RPCException, e:
-    exit_with_fault(e)
+    exit_with_fault(e, 'Ns2Topdl', opts)
 except RuntimeError, e:
     sys.exit("Error processing RPC: %s" % e)
@@ -65 +70 @@
 else:
     print topdl.topology_to_xml(top, top="experiment")
+proof = proof.from_dict(resp_dict.get('proof', {}))
+if proof and opts.auth_log:
+    log_authentication(opts.auth_log, 'New (create)', 'succeeded', proof)