Changeset 3925b50

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:

• fedd_client.py (modified) (1 diff)
• fedd_experiment_control.py (modified) (1 diff)
• fedd_types.xsd (modified) (2 diffs)

fedd/fedd_client.py

@@ -546 +546 @@
 
         msg = {
-                'experimentdescription': exp_desc,
+                'experimentdescription': { 'ns2description': exp_desc },
                 'master': opts.master,
                 'user' : [ {\

fedd/fedd_experiment_control.py

@@ -1346 +1346 @@
                     "Bad request format (no CreateRequestBody)")
         # The tcl parser needs to read a file so put the content into that file
-        file_content=req.get('experimentdescription', None)
-        if file_content:
-            try:
-                f = open(tclfile, 'w')
-                f.write(file_content)
-                f.close()
-            except IOError:
-                raise service_error(service_error.internal,
-                        "Cannot write temp experiment description")
+        descr=req.get('experimentdescription', None)
+        if descr:
+            file_content=descr.get('ns2description', None)
+            if file_content:
+                try:
+                    f = open(tclfile, 'w')
+                    f.write(file_content)
+                    f.close()
+                except IOError:
+                    raise service_error(service_error.internal,
+                            "Cannot write temp experiment description")
+            else:
+                raise service_error(service_error.req, 
+                        "Only ns2descriptions supported")
         else:
             raise service_error(service_error.req, "No experiment description")

fedd/fedd_types.xsd

@@ -264 +264 @@
     </xsd:sequence>
   </xsd:complexType>
+
+  <xsd:complexType name="experimentDescriptionType">
+    <xsd:annotation>
+      <xsd:documentation>
+        The description of the federated experiment
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:choice>
+      <xsd:element name="ns2description" type="xsd:base64Binary"/>
+    </xsd:choice>
+  </xsd:complexType>
+
 
   <xsd:complexType name="requestType">
@@ -317 +329 @@
       <xsd:element name="user" type="tns:userType" minOccurs="1"
         maxOccurs="unbounded"/>
-      <xsd:element name="experimentdescription" type="xsd:base64Binary"/>
+      <xsd:element name="experimentdescription" 
+        type="tns:experimentDescriptionType"/>
       <xsd:element name="master" type="xsd:string"/>
       <xsd:element name="experimentID" type="tns:IDType" minOccurs="0"