Changeset 3925b50 for fedd


Ignore:
Timestamp:
Oct 15, 2008 4:50:48 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:
abb87eb
Parents:
d199ced
Message:

add placeholder for other experiment descriptions

Location:
fedd
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • fedd/fedd_client.py

    rd199ced r3925b50  
    546546
    547547        msg = {
    548                 'experimentdescription': exp_desc,
     548                'experimentdescription': { 'ns2description': exp_desc },
    549549                'master': opts.master,
    550550                'user' : [ {\
  • fedd/fedd_experiment_control.py

    rd199ced r3925b50  
    13461346                    "Bad request format (no CreateRequestBody)")
    13471347        # The tcl parser needs to read a file so put the content into that file
    1348         file_content=req.get('experimentdescription', None)
    1349         if file_content:
    1350             try:
    1351                 f = open(tclfile, 'w')
    1352                 f.write(file_content)
    1353                 f.close()
    1354             except IOError:
    1355                 raise service_error(service_error.internal,
    1356                         "Cannot write temp experiment description")
     1348        descr=req.get('experimentdescription', None)
     1349        if descr:
     1350            file_content=descr.get('ns2description', None)
     1351            if file_content:
     1352                try:
     1353                    f = open(tclfile, 'w')
     1354                    f.write(file_content)
     1355                    f.close()
     1356                except IOError:
     1357                    raise service_error(service_error.internal,
     1358                            "Cannot write temp experiment description")
     1359            else:
     1360                raise service_error(service_error.req,
     1361                        "Only ns2descriptions supported")
    13571362        else:
    13581363            raise service_error(service_error.req, "No experiment description")
  • fedd/fedd_types.xsd

    rd199ced r3925b50  
    264264    </xsd:sequence>
    265265  </xsd:complexType>
     266
     267  <xsd:complexType name="experimentDescriptionType">
     268    <xsd:annotation>
     269      <xsd:documentation>
     270        The description of the federated experiment
     271      </xsd:documentation>
     272    </xsd:annotation>
     273    <xsd:choice>
     274      <xsd:element name="ns2description" type="xsd:base64Binary"/>
     275    </xsd:choice>
     276  </xsd:complexType>
     277
    266278
    267279  <xsd:complexType name="requestType">
     
    317329      <xsd:element name="user" type="tns:userType" minOccurs="1"
    318330        maxOccurs="unbounded"/>
    319       <xsd:element name="experimentdescription" type="xsd:base64Binary"/>
     331      <xsd:element name="experimentdescription"
     332        type="tns:experimentDescriptionType"/>
    320333      <xsd:element name="master" type="xsd:string"/>
    321334      <xsd:element name="experimentID" type="tns:IDType" minOccurs="0"
Note: See TracChangeset for help on using the changeset viewer.