Changeset d69ce97

Timestamp:

Nov 12, 2010 8:44:51 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

403a5ba

Parents:

9ecda47

Message:

Add version to topology object

Files:

• fedd/federation/topdl.py (modified) (5 diffs)
• wsdl/topdl.xsd (modified) (1 diff)

fedd/federation/topdl.py

@@ -532 +532 @@
 
 class Topology(base):
+    version = "1.0"
     @staticmethod
     def init_element(e):
@@ -554 +555 @@
             return e
 
-    def __init__(self, substrates=[], elements=[], attribute=[]):
+    def __init__(self, substrates=[], elements=[], attribute=[], 
+            version=None):
+
+        if version is None: self.version = Topology.version
+        else: self.version = version
+
         self.substrates = [ self.init_class(Substrate, s) \
                 for s in self.make_list(substrates) ]
@@ -619 +625 @@
         return Topology(substrates=[s.clone() for s in self.substrates], 
                 elements=[e.clone() for e in self.elements],
-                attribute=[a.clone() for a in self.attribute])
+                attribute=[a.clone() for a in self.attribute],
+                version=self.version)
 
 
@@ -628 +635 @@
     def to_dict(self):
         rv = { }
+        rv['version'] = self.version
         if self.substrates:
             rv['substrates'] = [ s.to_dict() for s in self.substrates ]
@@ -637 +645 @@
 
     def to_xml(self):
-        rv = ""
+        rv = "<version>%s</version>" % escape(self.version)
         if self.substrates:
             rv += join(["<substrates>%s</substrates>" % s.to_xml() \

wsdl/topdl.xsd

@@ -269 +269 @@
     </xsd:annotation>
     <xsd:sequence>
+      <xsd:element name="version" type="xsd:string"/>
       <xsd:element name="substrates" type="tns:substrateType" 
         minOccurs="0" maxOccurs="unbounded" />