Changeset 0a49bd7 for fedd/fedd_new.py

Timestamp:

Jan 15, 2011 5:52:15 PM (14 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_new.py (modified) (5 diffs)

fedd/fedd_new.py

@@ -2 +2 @@
 
 import sys
+from datetime import datetime
 
 from federation.fedid import fedid, generate_fedid
 from federation.remote_service import service_caller
+from federation.proof import proof
 from federation.client_lib import client_opts, exit_with_fault, RPCException, \
         wrangle_standard_options, do_rpc, get_experiment_names, \
-        save_certfile, get_abac_certs
-
+        save_certfile, get_abac_certs, log_authentication
 
 class new_opts(client_opts):
@@ -14 +15 @@
         client_opts.__init__(self)
         self.add_option("--experiment_cert", dest="out_certfile",
-                type="string", help="output certificate file")
+                action='callback', callback=self.expand_file, type='str',
+                help="output certificate file")
         self.add_option("--experiment_name", dest="exp_name",
                 type="string", help="Suggested experiment name")
@@ -24 +26 @@
 (opts, args) = parser.parse_args()
 
-cert, fid, url = wrangle_standard_options(opts)
 try:
+    cert, fid, url = wrangle_standard_options(opts)
     acerts = get_abac_certs(opts.abac_dir)
 except EnvironmentError, e:
     sys.exit('%s: %s' % (e.filename, e.strerror))
+except RuntimeError, e:
+    sys.exit("%s" %e)
 
 out_certfile = opts.out_certfile
@@ -55 +59 @@
             caller=service_caller("New"), responseBody='NewResponseBody')
 except RPCException, e:
-    exit_with_fault(e)
+    exit_with_fault(e, 'New', opts)
 except RuntimeError, e:
     sys.exit("Error processing RPC: %s" % e)
@@ -72 +76 @@
 e_fedid, e_local = get_experiment_names(resp_dict.get('experimentID', None))
 st = resp_dict.get('experimentStatus', None)
+proof = proof.from_dict(resp_dict.get('proof', {}))
 
 if e_local: print "localname: %s" % e_local
 if e_fedid: print "fedid: %s" % e_fedid
 if st: print "status: %s" % st
+if proof and opts.auth_log:
+    log_authentication(opts.auth_log, 'New', 'succeeded', proof)