Changeset 80b1e82

Timestamp:

Nov 18, 2011 7:19:48 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

9294673

Parents:

29d5f7c

Message:

Info stuff all works. SEER will need to add a legacy parameter to info.

Files:

• fedd/fedd_info.py (modified) (2 diffs)
• fedd/federation/experiment_control.py (modified) (4 diffs)
• wsdl/fedd_types.xsd (modified) (1 diff)

fedd/fedd_info.py

@@ -19 +19 @@
         self.add_option("--data", dest="data", default=[],
                 action="append", type="choice",
-                choices=("id", "experimentdescription", "federant", "vtopo", 
-                    "vis", "log", "status", "embedding"),
+                choices=("id", "experimentdescription", "vtopo", "vis", 
+                    "log", "status"),
                 help="data to extract")
         
@@ -37 +37 @@
 
 req = { 'experiment': exp_id }
+
+# If legacy data is requested, request it from the server.
+if 'vis' in opts.data  or 'vtopo' in opts.data:
+    req['legacy'] = True
 
 try:

fedd/federation/experiment_control.py

@@ -1892 +1892 @@
         self.state_lock.acquire()
         # XXX: this needs to be recalculated
-        if self.state.has_key(key):
-            if self.state[key].has_key('vtopo'):
+        if key in self.state:
+            if self.state[key].top is not None:
+                vtopo = topdl.topology_to_vtopo(self.state[key].top)
                 rv = { 'experiment' : {keytype: key },
-                        'vtopo': self.state[key]['vtopo'],
+                        'vtopo': vtopo,
                         'proof': proof.to_dict(), 
                     }
             else:
-                state = self.state[key]['experimentStatus']
+                state = self.state[key].status
         self.state_lock.release()
 
@@ -1937 +1938 @@
 
         self.state_lock.acquire()
-        # XXX: this needs to be recalculated
-        if self.state.has_key(key):
-            if self.state[key].has_key('vis'):
-                rv =  { 'experiment' : {keytype: key },
-                        'vis': self.state[key]['vis'],
+        # Generate the visualization
+        if key in self.state:
+            if self.state[key].top is not None:
+                try:
+                    vis = self.genviz(
+                            topdl.topology_to_vtopo(self.state[key].topo))
+                except service_error, e:
+                    self.state_lock.release()
+                    raise e
+                rv =  { 'experiment' : {keytype: key },
+                        'vis': vis,
                         'proof': proof.to_dict(), 
-                        }
+                        }
             else:
-                state = self.state[key]['experimentStatus']
+                state = self.state[key].status
         self.state_lock.release()
 
@@ -2210 +2217 @@
                     "Bad request format (no InfoRequestBody)")
         exp = req.get('experiment', None)
+        legacy = req.get('legacy', False)
         if exp:
             if exp.has_key('fedid'):
@@ -2227 +2235 @@
         if self.state.has_key(key):
             rv = self.state[key].get_info()
+            # Copy the topo if we need to generate legacy representations
+            if legacy:
+                top = self.state[key].top 
+                if top is not None: top = top.clone()
         self.state_lock.release()
 
+        # If the legacy visualization and topology representations are
+        # requested, calculate them and add them to teh return.
+        if legacy and rv is not None:
+            if top is not None:
+                vtopo = topdl.topology_to_vtopo(top)
+                if vtopo is not None:
+                    rv['vtopo'] = vtopo
+                    try:
+                        vis = self.genviz(vtopo)
+                    except service_error, e:
+                        self.log.debug('Problem generating visualization: %s' \
+                                % e)
+                        vis = None
+                    if vis is not None:
+                        rv['vis'] = vis
         if rv:
             rv['proof'] = proof.to_dict()

wsdl/fedd_types.xsd

@@ -670 +670 @@
     <xsd:sequence>
       <xsd:element name="experiment" type="tns:IDType"/>
+      <xsd:element name="legacy" type="xsd:boolean" 
+        minOccurs="0" maxOccurs="1"/>
     </xsd:sequence>
   </xsd:complexType>