Changeset bcbf543

Timestamp:

Sep 4, 2008 11:20:54 AM (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:

4fc2250

Parents:

4d48e01

Message:

initial SEER integration

Location:

fedd

Files:

• fedd.py (modified) (1 diff)
• fedd_create.py (modified) (1 diff)
• fedd_create_experiment.py (modified) (3 diffs)
• fedd_proj.py (modified) (1 diff)
• fedd_types.xsd (modified) (2 diffs)

fedd/fedd.py

@@ -122 +122 @@
                 resp = self.server.impl.xmlrpc_dispatch(method, params,
                             fedid(cert=self.request.get_peer_cert()))
-                data = xmlrpclib.dumps((resp,), methodresponse=True)
+                data = xmlrpclib.dumps((resp,), encoding='UTF-8', 
+                        methodresponse=True)
             except xmlrpclib.Fault, f:
                 data = xmlrpclib.dumps(f, methodresponse=True)

fedd/fedd_create.py

@@ -288 +288 @@
 
     try:
-        resp = port.RequestAccess({ 'CreateRequestBody': msg})
-        resp, method = loads(resp)
-        resp = resp[0]
+        resp = port.Create({ 'CreateRequestBody': msg})
     except Error, e:
         resp = { 'FeddFaultBody': \

fedd/fedd_create_experiment.py

@@ -467 +467 @@
                 self.element = { }
                 self.topo = { \
-                        'nodes': { 'node': self.nodes  },\
-                        'lans' : { 'lan' : self.lans },\
+                        'node': self.nodes,\
+                        'lan' : self.lans,\
                     }
                 self.chars = ""
@@ -517 +517 @@
         try:
             # Node names
-            nodes = [ n['vname'] for n in topo['nodes']['node'] ]
-            topo_lans = topo['lans']['lan']
+            nodes = [ n['vname'] for n in topo['node'] ]
+            topo_lans = topo['lan']
         except KeyError:
             raise service_error(service_error.internal, "Bad topology")
@@ -582 +582 @@
                 vn = m.group(1)
                 vis_node = {'name': vn, \
-                        'x': int(m.group(2)),\
-                        'y' : int(m.group(3)),\
+                        'x': float(m.group(2)),\
+                        'y' : float(m.group(3)),\
                     }
                 if vn in links.keys() or vn in lans.keys():

fedd/fedd_proj.py

@@ -577 +577 @@
 
         if msg != None:
-            return xmlrpclib.dumps(({ "RequestAccessResponseBody": msg },))
+            return { "RequestAccessResponseBody": msg }
         else:
             raise service_error(service_error.internal,
                     "No response generated?!");
 
-    def xmlrpc_RequestAccess(self, params, fid):
+    def xmlrpc_Create(self, params, fid):
         msg = self.create_experiment.create_experiment(params[0], fedid)
 
         if msg != None:
-            return xmlrpclib.dumps(({ "CreateResponseBody": msg },))
+            return { "CreateResponseBody" : msg }
         else:
             raise service_error(service_error.internal,

fedd/fedd_types.xsd

@@ -170 +170 @@
   </xsd:complexType>
 
-  <xsd:complexType name="vtoponodesType">
-    <xsd:annotation>
-      <xsd:documentation>
-        Collection of nodes in the virtual topology of a federated experiment (emulab legacy)
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="node" type="tns:vtoponodeType" minOccurs="0"
-        maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
   <xsd:complexType name="vtopolanType">
     <xsd:annotation>
@@ -198 +186 @@
   </xsd:complexType>
 
-  <xsd:complexType name="vtopolansType">
-    <xsd:annotation>
-      <xsd:documentation>
-        Collection of LAN in the virtual topology of a federated experiment (emulab legacy)
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
+  <xsd:complexType name="vtopoType">
+    <xsd:annotation>
+      <xsd:documentation>
+        The virtual topology of a federated experiment (emulab legacy)
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="node" type="tns:vtoponodeType" minOccurs="0" 
+        maxOccurs="unbounded" />
       <xsd:element name="lan" type="tns:vtopolanType" minOccurs="0"
         maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="vtopoType">
-    <xsd:annotation>
-      <xsd:documentation>
-        The virtual topology of a federated experiment (emulab legacy)
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="nodes" type="tns:vtoponodesType"/>
-      <xsd:element name="lans" type="tns:vtopolansType"/>
     </xsd:sequence>
   </xsd:complexType>