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

fedd/fedd_image.py

@@ -8 +8 @@
 
 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, save_certfile
+        wrangle_standard_options, do_rpc, get_experiment_names, save_certfile,\
+        log_authentication
 
 
@@ -17 +19 @@
         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")
-        self.add_option("--output", dest="outfile", type="string",
+        self.add_option("--output", dest="outfile",
+                action='callback', callback=self.expand_file, type='str',
                 help="output image file")
         self.add_option("--format", dest="format", type="choice", 
@@ -38 +42 @@
                 help="Size of output in pixels (diagrams are square")
         self.add_option("--file", dest="file", 
+                action='callback', callback=self.expand_file, type='str',
                 help="experiment description file")
         self.add_option("--group", dest="group", action="append", default=[], 
@@ -293 +298 @@
             caller=service_caller('Info'), responseBody="InfoResponseBody")
 
+    proof = proof.from_dict(resp_dict.get('proof', {}))
+    if proof and opts.auth_log:
+        log_authentication(opts.auth_log, 'Image', 'succeeded', proof)
     return extract_topo_from_message(resp_dict, opts.serialize_only)
 
@@ -333 +341 @@
 (opts, args) = parser.parse_args()
 
-# Note that if we're converting a local topdl file, the absence of a cert may
-# not be a big deal.  It's checked if needed below
+# Note that if we're converting a local topdl file, the absence of a cert or
+# abac directory may not be a big deal.  It's checked if needed below
 try:
     cert, fid, url = wrangle_standard_options(opts)
 except RuntimeError, e:
     cert = None
-    print >>sys.stderr, "Warning: %s e"
+    print >>sys.stderr, "Warning: %s" % e
 
 
@@ -371 +379 @@
         top = get_experiment_topo(opts, cert, url)
     except RPCException, e:
-        exit_with_fault(e)
+        exit_with_fault(e, 'image', opts)
     except RuntimeError, e:
         sys.exit("%s" % e)
@@ -383 +391 @@
     except RPCException, e:
         print >>sys.stderr, "Cannot extract a topology from %s" % opts.file
-        exit_with_fault(e)
+        exit_with_fault(e, 'image', opts)
     except RuntimeError, e:
         sys.exit("Cannot extract a topology from %s: %s" % (opts.file, e))