Changeset 987aaa1 for fedd/fedd_create_experiment.py

Timestamp:

Sep 9, 2008 2:07:18 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

45ebc4d

Parents:

4fc2250

Message:

get topo and vis data, persistent state

File:

• fedd/fedd_create_experiment.py (modified) (3 diffs)

fedd/fedd_create_experiment.py

@@ -74 +74 @@
         self.ssh_identity_file = ssh_identity_file
         self.ssh_type = ssh_type
+        self.state = { }
         self.tclsh = tclsh
         self.tcl_splitter = tcl_splitter
@@ -1252 +1253 @@
                 os.rmdir(os.path.join(path, d))
         os.rmdir(tmpdir)
-        
-        return { 'emulab' : [ tbparams[tb]['emulab'] \
+
+        resp = { 'emulab' : [ tbparams[tb]['emulab'] \
                 for tb in tbparams.keys() \
                     if tbparams[tb].has_key('emulab') ],\
@@ -1261 +1262 @@
                     'experimentAccess': { 'X509' : expcert },\
                 }
+        
+        self.state[expid] = {\
+                'emulab': [ tbparams[tb]['emulab'] \
+                    for tb in tbparams.keys() \
+                        if tbparams[tb].has_key('emulab') ],\
+                'vis': vis,\
+                'vtopo': vtopo,\
+            }
+            
+        return resp
+
+    def get_vtopo(self, req, fid):
+
+        req = req.get('VtopoRequestBody', None)
+        if not req:
+            raise service_error(service_error.req,
+                    "Bad request format (no VtopoRequestBody)")
+        if req.has_key('experiment') and req['experiment'].has_key('fedid'):
+            qfedid = req['experiment']['fedid']
+        else:
+            raise service_error(service_error.req, "Use fedid for lookup")
+
+        if self.state.has_key(qfedid):
+            return { 'experiment' : {'fedid': qfedid },\
+                    'vtopo': self.state[qfedid]['vtopo'],\
+                    }
+        else:
+            raise service_error(service_error.req, "No such experiment")
+
+    def get_vis(self, req, fid):
+
+        req = req.get('VisRequestBody', None)
+        if not req:
+            raise service_error(service_error.req,
+                    "Bad request format (no VisRequestBody)")
+        if req.has_key('experiment') and req['experiment'].has_key('fedid'):
+            qfedid = req['experiment']['fedid']
+        else:
+            raise service_error(service_error.req, "Use fedid for lookup")
+
+        if self.state.has_key(qfedid):
+            return { 'experiment' : {'fedid': qfedid },\
+                    'vis': self.state[qfedid]['vis'],\
+                    }
+        else:
+            raise service_error(service_error.req, "No such experiment")
+
 
 if __name__ == '__main__':