Changeset 65f3f29 for fedd/federation

Timestamp:

Jul 25, 2009 10:52:45 AM (15 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:

ca489e8

Parents:

d27fd76

Message:

Added multi info functions and some helpers to fedd_client

File:

• fedd/federation/experiment_control.py (modified) (5 diffs)

fedd/federation/experiment_control.py

@@ -329 +329 @@
                 'Vis': soap_handler('Vis', self.get_vis),
                 'Info': soap_handler('Info', self.get_info),
+                'MultiInfo': soap_handler('MultiInfo', self.get_multi_info),
                 'Terminate': soap_handler('Terminate', 
                     self.terminate_experiment),
@@ -338 +339 @@
                 'Vis': xmlrpc_handler('Vis', self.get_vis),
                 'Info': xmlrpc_handler('Info', self.get_info),
+                'MultiInfo': xmlrpc_handler('MultiInfo', self.get_multi_info),
                 'Terminate': xmlrpc_handler('Terminate',
                     self.terminate_experiment),
@@ -2177 +2179 @@
                 raise service_error(service_error.req, "No such experiment")
 
+    def clean_info_response(self, rv):
+        """
+        Remove the information in the experiment's state object that is not in
+        the info response.
+        """
+        # Remove the owner info (should always be there, but...)
+        if rv.has_key('owner'): del rv['owner']
+
+        # Convert the log into the allocationLog parameter and remove the
+        # log entry (with defensive programming)
+        if rv.has_key('log'):
+            rv['allocationLog'] = "".join(rv['log'])
+            del rv['log']
+        else:
+            rv['allocationLog'] = ""
+
+        if rv['experimentStatus'] != 'active':
+            if rv.has_key('federant'): del rv['federant']
+        else:
+            # remove the allocationID info from each federant
+            for f in rv.get('federant', []):
+                if f.has_key('allocID'): del f['allocID']
+
+        return rv
+
     def get_info(self, req, fid):
         """
@@ -2186 +2213 @@
         if not req:
             raise service_error(service_error.req,
-                    "Bad request format (no VisRequestBody)")
+                    "Bad request format (no InfoRequestBody)")
         exp = req.get('experiment', None)
         if exp:
@@ -2211 +2238 @@
 
         if rv:
-            # Remove the owner info (should always be there, but...)
-            if rv.has_key('owner'): del rv['owner']
-
-            # Convert the log into the allocationLog parameter and remove the
-            # log entry (with defensive programming)
-            if rv.has_key('log'):
-                rv['allocationLog'] = "".join(rv['log'])
-                del rv['log']
-            else:
-                rv['allocationLog'] = ""
-
-            if rv['experimentStatus'] != 'active':
-                if rv.has_key('federant'): del rv['federant']
-            else:
-                # remove the allocationID info from each federant
-                for f in rv.get('federant', []):
-                    if f.has_key('allocID'): del f['allocID']
-
-            return rv
+            return self.clean_info_response(rv)
         else:
             raise service_error(service_error.req, "No such experiment")
+
+    def get_multi_info(self, req, fid):
+        """
+        Return all the stored info that this fedid can access
+        """
+        rv = { 'info': [ ] }
+
+        self.state_lock.acquire()
+        for key in [ k for k in self.state.keys() if isinstance(k, fedid)]:
+            self.check_experiment_access(fid, key)
+
+            if self.state.has_key(key):
+                e = copy.deepcopy(self.state[key])
+                e = self.clean_info_response(e)
+                rv['info'].append(e)
+        self.state_lock.release()
+        return rv