Changeset 0a49bd7 for fedd/fedd_ftopo.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_ftopo.py (modified) (4 diffs)

fedd/fedd_ftopo.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,\
-        wrangle_standard_options, do_rpc, get_experiment_names, info_format
+        wrangle_standard_options, do_rpc, get_experiment_names, info_format, \
+        log_authentication
 
 class ftopo_opts(client_opts):
@@ -12 +14 @@
         client_opts.__init__(self)
         self.add_option("--experiment_cert", dest="exp_certfile",
-                type="string", help="experiment certificate file")
+                action='callback', callback=self.expand_file, type='str',
+                help="experiment certificate file")
         self.add_option("--experiment_name", dest="exp_name",
                 type="string", help="human readable experiment name")
@@ -41 +44 @@
             caller=service_caller('Info'), responseBody='InfoResponseBody')
 except RPCException, e:
-    exit_with_fault(e)
+    exit_with_fault(e, 'Ftopo', opts)
 except RuntimeError, e:
     sys.exit("Error processing RPC: %s" % e)
@@ -64 +67 @@
 else:
     sys.exit("Badly formatted response (no experiment descrption)!?")
+proof = proof.from_dict(resp_dict.get('proof', {}))
+if proof and opts.auth_log:
+    log_authentication(opts.auth_log, 'Ftopo', 'succeeded', proof)