Changeset 5d854e1 for fedd/fedd_image.py

Timestamp:

Sep 21, 2010 3:12:16 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

3bf0b3c

Parents:

87807f42

Message:

allow FEDD_URL in the environment to set the contact URL. Man am I sick of typing --url.

File:

• fedd/fedd_image.py (modified) (7 diffs)

fedd/fedd_image.py

@@ -181 +181 @@
         raise RuntimeError("Bad response. %s" % e.message)
 
-def get_experiment_topo(opts, cert):
+def get_experiment_topo(opts, cert, url):
     """
     Get the topology of an existing experiment from a running fedd.  That is,
@@ -204 +204 @@
     req = { 'experiment': exp_id }
     resp_dict = do_rpc(req,
-            opts.url, opts.transport, cert, opts.trusted, 
+            url, opts.transport, cert, opts.trusted, 
             serialize_only=opts.serialize_only,
             tracefile=opts.tracefile,
@@ -211 +211 @@
     return extract_topo_from_message(resp_dict, opts.serialize_only)
 
-def get_file_topo(opts, cert):
+def get_file_topo(opts, cert, url):
     """
     Parse a topology file or convert an ns2 file into a topdl.Topology.  XML
@@ -238 +238 @@
     if opts.debug > 1: print >>sys.stderr, msg
     resp_dict = do_rpc(msg, 
-            opts.url, opts.transport, cert, opts.trusted, 
+            url, opts.transport, cert, opts.trusted, 
             serialize_only=opts.serialize_only,
             tracefile=opts.tracefile,
@@ -252 +252 @@
 # not be a big deal.  It's checked if needed below
 try:
-    cert, fid = wrangle_standard_options(opts)
+    cert, fid, url = wrangle_standard_options(opts)
 except RuntimeError, e:
     cert = None
@@ -285 +285 @@
         sys.exit("Couldn't find an identity certificate, RPC (Info) needed.")
     try:
-        top = get_experiment_topo(opts, cert)
+        top = get_experiment_topo(opts, cert, url)
     except RPCException, e:
         exit_with_fault(e)
@@ -296 +296 @@
                 % opts.file
     try:
-        top = get_file_topo(opts, cert)
+        top = get_file_topo(opts, cert, url)
     except RPCException, e:
         print >>sys.stderr, "Cannot extract a topology from %s" % opts.file