Changeset e83f2f2 for fedd/fedd_create.py

Timestamp:

Dec 14, 2010 6:58:28 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

c092b7f

Parents:

2627eb3

Message:

Move proofs around. Lots of changes, including fault handling.

File:

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

fedd/fedd_create.py

@@ -9 +9 @@
 from string import join
 
+from federation.proof import proof
 from federation.fedid import fedid, generate_fedid
 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,\
-        get_abac_certs
+        get_abac_certs, log_authentication
 from federation.util import abac_split_cert, abac_context_to_creds
 from federation import topdl
@@ -247 +248 @@
             caller=service_caller('New'), responseBody="NewResponseBody")
 except RPCException, e:
-    exit_with_fault(e)
+    exit_with_fault(e, 'New (create)', opts)
 except RuntimeError, e:
     sys.exit("Error processing RPC: %s" % e)
@@ -253 +254 @@
 if opts.debug > 1: print >>sys.stderr, resp_dict
 
+proof = proof.from_dict(resp_dict.get('proof', {}))
+if proof and opts.auth_log:
+    log_authentication(opts.auth_log, 'New (create)', 'succeeded', proof)
 # Save the experiment ID certificate if we need it
 try:
@@ -303 +307 @@
             serialize_only=opts.serialize_only,
             tracefile=opts.tracefile,
-            caller=service_caller('Create'), responseBody="CreateResponseBody")
+            caller=service_caller('Create', max_retries=1), responseBody="CreateResponseBody")
 except RPCException, e:
-    exit_with_fault(e)
+    exit_with_fault(e, 'Create', opts)
 except RuntimeError, e:
     sys.exit("Error processing RPC: %s" % e)
@@ -318 +322 @@
 if e_fedid: print "fedid: %s" % e_fedid
 if st: print "status: %s" % st
-
+proof = proof.from_dict(resp_dict.get('proof', {}))
+if proof and opts.auth_log:
+    log_authentication(opts.auth_log, 'Create', 'succeeded', proof)