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

fedd/fedd_create.py

@@ -7 +7 @@
 import ABAC
 
-from string import join
-
+from string import join, ascii_letters
+from random import choice
+
+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
@@ -26 +28 @@
         client_opts.__init__(self)
         self.add_option("--experiment_cert", dest="out_certfile",
+                action="callback", callback=self.expand_file,
                 type="string", help="output certificate file")
         self.add_option("--experiment_name", dest="exp_name",
                 type="string", help="Suggested experiment name")
-        self.add_option("--file", dest="file", 
+        self.add_option("--file", dest="file", action="callback",
+                callback=self.expand_file, type="str",
                 help="experiment description file")
         self.add_option("--project", action="store", dest="project", 
@@ -153 +157 @@
 (opts, args) = parser.parse_args()
 
+svcs = []
 # Option processing
-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:
@@ -199 +207 @@
 
 # Fill in services
-svcs = []
 if opts.master and opts.project:
     svcs.append(project_export_service(opts.master, opts.project))
@@ -231 +238 @@
 if acerts:
     msg['credential'] = acerts
+
+# ZSI will not properly construct an empty message.  If nothing has been added
+# to msg, pick a random localname to ensure the message is created
+if not msg:
+    msg['experimentID'] = { 
+            'localname': join([choice(ascii_letters) for i in range(0,8)],""),
+            }
+
 
 if opts.debug > 1: print >>sys.stderr, msg
@@ -242 +257 @@
             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)
@@ -248 +263 @@
 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:
@@ -298 +316 @@
             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)
@@ -313 +331 @@
 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)