Changeset c52c48d for fedd/fedd_create_experiment.py

Timestamp:

Sep 12, 2008 5:28:33 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:

291423b

Parents:

27b6aea

Message:

add info and work with SEER attach

File:

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

fedd/fedd_create_experiment.py

@@ -1278 +1278 @@
                 for tb in tbparams.keys() \
                     if tbparams[tb].has_key('federant') ],\
-                    'experiment': vtopo,\
+                    'vtopo': vtopo,\
+                    'vis' : vis,
+                    'experimentID' : [\
+                            { 'fedid': copy.copy(expid) }, \
+                            { 'localname': eid },\
+                        ],\
+                    'experimentAccess': { 'X509' : expcert },\
+                }
+        
+        self.state[expid] = { 'federant' : [ tbparams[tb]['federant'] \
+                for tb in tbparams.keys() \
+                    if tbparams[tb].has_key('federant') ],\
+                    'vtopo': vtopo,\
                     'vis' : vis,
                     'experimentID' : [\
                             { 'fedid': expid }, { 'localname': eid },\
                         ],\
-                    'experimentAccess': { 'X509' : expcert },\
                 }
-        
-        self.state[expid] = {\
-                'fedid': expid,
-                'localname': eid,
-                'federant': [ tbparams[tb]['federant'] \
-                    for tb in tbparams.keys() \
-                        if tbparams[tb].has_key('federant') ],\
-                'vis': vis,\
-                'vtopo': vtopo,\
-            }
         self.state[eid] = self.state[expid]
         return resp
@@ -1350 +1351 @@
             raise service_error(service_error.req, "No such experiment")
 
+    def get_info(self, req, fid):
+
+        req = req.get('InfoRequestBody', None)
+        if not req:
+            raise service_error(service_error.req,
+                    "Bad request format (no VisRequestBody)")
+        exp = req.get('experiment', None)
+        if exp:
+            if exp.has_key('fedid'):
+                key = fedid(bits=exp['fedid'])
+                keytype = "fedid"
+            elif exp.has_key('localname'):
+                key = exp['localname']
+                keytype = "localname"
+            else:
+                raise service_error(service_error.req, "Unknown lookup type")
+        else:
+            raise service_error(service_error.req, "No request?")
+
+        # The state may be massaged by the service function that called
+        # get_info (e.g., encoded for XMLRPC transport) so send a copy of the
+        # state.
+        if self.state.has_key(key):
+            return copy.deepcopy(self.state[key])
+        else:
+            raise service_error(service_error.req, "No such experiment")
 
 if __name__ == '__main__':