Changeset bcbf543 for fedd


Ignore:
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:
5 edited

Legend:

Unmodified
Added
Removed
  • fedd/fedd.py

    r4d48e01 rbcbf543  
    122122                resp = self.server.impl.xmlrpc_dispatch(method, params,
    123123                            fedid(cert=self.request.get_peer_cert()))
    124                 data = xmlrpclib.dumps((resp,), methodresponse=True)
     124                data = xmlrpclib.dumps((resp,), encoding='UTF-8',
     125                        methodresponse=True)
    125126            except xmlrpclib.Fault, f:
    126127                data = xmlrpclib.dumps(f, methodresponse=True)
  • fedd/fedd_create.py

    r4d48e01 rbcbf543  
    288288
    289289    try:
    290         resp = port.RequestAccess({ 'CreateRequestBody': msg})
    291         resp, method = loads(resp)
    292         resp = resp[0]
     290        resp = port.Create({ 'CreateRequestBody': msg})
    293291    except Error, e:
    294292        resp = { 'FeddFaultBody': \
  • fedd/fedd_create_experiment.py

    r4d48e01 rbcbf543  
    467467                self.element = { }
    468468                self.topo = { \
    469                         'nodes': { 'node': self.nodes  },\
    470                         'lans' : { 'lan' : self.lans },\
     469                        'node': self.nodes,\
     470                        'lan' : self.lans,\
    471471                    }
    472472                self.chars = ""
     
    517517        try:
    518518            # Node names
    519             nodes = [ n['vname'] for n in topo['nodes']['node'] ]
    520             topo_lans = topo['lans']['lan']
     519            nodes = [ n['vname'] for n in topo['node'] ]
     520            topo_lans = topo['lan']
    521521        except KeyError:
    522522            raise service_error(service_error.internal, "Bad topology")
     
    582582                vn = m.group(1)
    583583                vis_node = {'name': vn, \
    584                         'x': int(m.group(2)),\
    585                         'y' : int(m.group(3)),\
     584                        'x': float(m.group(2)),\
     585                        'y' : float(m.group(3)),\
    586586                    }
    587587                if vn in links.keys() or vn in lans.keys():
  • fedd/fedd_proj.py

    r4d48e01 rbcbf543  
    577577
    578578        if msg != None:
    579             return xmlrpclib.dumps(({ "RequestAccessResponseBody": msg },))
     579            return { "RequestAccessResponseBody": msg }
    580580        else:
    581581            raise service_error(service_error.internal,
    582582                    "No response generated?!");
    583583
    584     def xmlrpc_RequestAccess(self, params, fid):
     584    def xmlrpc_Create(self, params, fid):
    585585        msg = self.create_experiment.create_experiment(params[0], fedid)
    586586
    587587        if msg != None:
    588             return xmlrpclib.dumps(({ "CreateResponseBody": msg },))
     588            return { "CreateResponseBody" : msg }
    589589        else:
    590590            raise service_error(service_error.internal,
  • fedd/fedd_types.xsd

    r4d48e01 rbcbf543  
    170170  </xsd:complexType>
    171171
    172   <xsd:complexType name="vtoponodesType">
    173     <xsd:annotation>
    174       <xsd:documentation>
    175         Collection of nodes in the virtual topology of a federated experiment (emulab legacy)
    176       </xsd:documentation>
    177     </xsd:annotation>
    178     <xsd:sequence>
    179       <xsd:element name="node" type="tns:vtoponodeType" minOccurs="0"
    180         maxOccurs="unbounded"/>
    181     </xsd:sequence>
    182   </xsd:complexType>
    183 
    184172  <xsd:complexType name="vtopolanType">
    185173    <xsd:annotation>
     
    198186  </xsd:complexType>
    199187
    200   <xsd:complexType name="vtopolansType">
    201     <xsd:annotation>
    202       <xsd:documentation>
    203         Collection of LAN in the virtual topology of a federated experiment (emulab legacy)
    204       </xsd:documentation>
    205     </xsd:annotation>
    206     <xsd:sequence>
     188  <xsd:complexType name="vtopoType">
     189    <xsd:annotation>
     190      <xsd:documentation>
     191        The virtual topology of a federated experiment (emulab legacy)
     192      </xsd:documentation>
     193    </xsd:annotation>
     194    <xsd:sequence>
     195      <xsd:element name="node" type="tns:vtoponodeType" minOccurs="0"
     196        maxOccurs="unbounded" />
    207197      <xsd:element name="lan" type="tns:vtopolanType" minOccurs="0"
    208198        maxOccurs="unbounded"/>
    209     </xsd:sequence>
    210   </xsd:complexType>
    211 
    212   <xsd:complexType name="vtopoType">
    213     <xsd:annotation>
    214       <xsd:documentation>
    215         The virtual topology of a federated experiment (emulab legacy)
    216       </xsd:documentation>
    217     </xsd:annotation>
    218     <xsd:sequence>
    219       <xsd:element name="nodes" type="tns:vtoponodesType"/>
    220       <xsd:element name="lans" type="tns:vtopolansType"/>
    221199    </xsd:sequence>
    222200  </xsd:complexType>
Note: See TracChangeset for help on using the changeset viewer.