Changeset 12658df

Timestamp:

Apr 28, 2010 9:38:07 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

7e67ab9

Parents:

ab847bc

Message:

Add interface to specify services to the command line. Also make
--serializeOnly into --serialize_only and fix its operation for create.

File:

• fedd/fedd_client.py (modified) (13 diffs)

fedd/fedd_client.py

@@ -69 +69 @@
         self.add_option( "--debug", action="count", dest="debug", 
                 default=0, help="Set debug.  Repeat for more information")
-        self.add_option("--serializeOnly", action="store_true", 
+        self.add_option("--serialize_only", action="store_true", 
                 dest="serialize_only", default=False,
                 help="Print the SOAP request that would be sent and exit")
@@ -99 +99 @@
                 help="Project to export from master")
         self.add_option("--master", dest="master",
-                help="Master testbed in the federation")
+                help="Master testbed in the federation (pseudo project export)")
+        self.add_option("--service", dest="service", action="append",
+                type="string", default=[],
+                help="Service description name:exporters:importers:attrs")
 
 class fedd_split_opts(fedd_create_opts):
@@ -315 +318 @@
         if transport == "soap":
             if serialize_only:
-                print self.caller.serialize_soap(req_dict) 
-                sys.exit(0)
+                print caller.serialize_soap(req_dict) 
+                return { }
             else:
                 try:
@@ -331 +334 @@
                 ser = dumps((req_dict,))
                 print ser
-                sys.exit(0)
+                return { }
             else:
                 try:
@@ -908 +911 @@
                     len(resp_dict['vtopo'].get('node', [])),
                     file, fmt, opts.neato, opts.labels, opts.pixels)
+        elif opts.serialze_only:
+            sys.exit(0)
         else:
             sys.exit("Bad response. %s" % e.message)
@@ -1064 +1069 @@
             self.gen_image(topo, len(topo.get('node', [])), file, fmt,
                     opts.neato, opts.labels, opts.pixels)
+        elif opts.serialze_only:
+            sys.exit(0)
         else:
             sys.exit("Bad response. %s" % e.message)
@@ -1418 +1425 @@
     def __init__(self): 
         fedd_rpc.__init__(self)
+
+    @staticmethod
+    def parse_service(svc):
+        terms = svc.split(':')
+        svcd = { }
+        if len(terms) < 2 or len(terms[0]) == 0 or len(terms[1]) == 0:
+            sys.exit("Bad service description '%s': Not enough terms" % svc)
+        
+        svcd['name'] = terms[0]
+        svcd['export'] = terms[1].split(",")
+        if len(terms) > 2 and len(terms[2]) > 0:
+            svcd['import'] = terms[2].split(",")
+        if len(terms) > 3 and len(terms[3]) > 0:
+            svcd['fedAttr'] = [ ]
+            for t in terms[3].split(","):
+                i = t.find("=")
+                if i != -1 :
+                    svcd['fedAttr'].append(
+                            {'attribute': t[0:i], 'value': t[i+1:]})
+                else:
+                    sys.exit("Bad service attribute '%s': no equals sign" % t)
+        return svcd
+
     def __call__(self):
         parser = fedd_create_opts()
 
         (opts, args) = parser.parse_args()
+
+        svcs = []
 
         if opts.trusted:
@@ -1427 +1459 @@
                 sys.exit("Cannot read trusted certificates (%s)" % opts.trusted)
 
-        if not opts.project :
-            parser.error('--project is required')
+        if not (opts.project and opts.master) and not opts.service:
+            print >>sys.stderr, "Neither master/project nor services requested"
 
         if opts.debug > 0: opts.tracefile=sys.stderr
@@ -1456 +1488 @@
             sys.exit("Must specify an experiment description (--file)")
 
-        if not opts.master:
-            sys.exit("Must specify a master testbed (--master)")
-
         out_certfile = opts.out_certfile
-
+        
+        # Fill in svcs here so errors in service specification come before the
+        # New call is made
+        if opts.master and opts.project:
+            svcs.append({
+                    'name': 'project_export', 
+                    'export': [opts.master], 
+                    'fedAttr': [ 
+                        { 'attribute': 'project', 'value': opts.project },
+                        ],
+                    })
+
+        svcs.extend([ self.parse_service(s) for s in opts.service])
         msg = { }
 
@@ -1500 +1541 @@
                     elif k =='localname':
                         e_local = id[k]
-
-        msg = {
-                'experimentdescription': { 'ns2description': exp_desc },
-                'service': [ {
-                    'name': 'project_export', 
-                    'export': [opts.master], 
-                    'fedAttr': [ 
-                        { 'attribute': 'project', 'value': opts.project },
-                        ],
-                    }, ]
-            }
+        elif opts.serialize_only:
+            e_local = "serialize"
+        msg = { 'experimentdescription': { 'ns2description': exp_desc }, }
+
+        if svcs:
+            msg['service'] = svcs
 
         if e_fedid:
@@ -1716 +1752 @@
 
         if opts.debug > 1: print >>sys.stderr, resp_dict
-        self.print_response_as_testbed(resp_dict, opts.label)
+        if not opts.serialize_only:
+            self.print_response_as_testbed(resp_dict, opts.label)
 
 # Keep requesting experiment status and printing updates to the log until the
@@ -1792 +1829 @@
                 sys.exit("Error processing RPC: %s" % e)
 
-            status = resp_dict.get('experimentStatus', None)
+            if not opts.serialize_only:
+                status = resp_dict.get('experimentStatus', None)
+            else:
+                status = "active"
             log = resp_dict.get('allocationLog', None)
             if not status:
@@ -1865 +1905 @@
 
         if opts.debug > 1: print >>sys.stderr, resp_dict
-        print resp_dict
-
-
+        if not opts.serialize_only:
+            print resp_dict
 
 cmds = {\