Changeset cdb62d9

Timestamp:

Jul 30, 2009 6:41:05 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-2.00, version-3.01, version-3.02

Children:

df783c1

Parents:

eec716b

Message:

add computer name & rate info, small tweaks

Files:

• fedd/federation/topdl.py (modified) (3 diffs)
• wsdl/topdl.xsd (modified) (2 diffs)

fedd/federation/topdl.py

@@ -128 +128 @@
     def __init__(self, substrate, capacity=None, latency=None, attribute=[],
             element=None):
-        if isinstance(substrate, basestring):
-            self.substrate = [ substrate ]
-        else:
-            self.substrate = substrate
+        self.substrate = self.make_list(substrate)
         self.capacity = self.init_class(Capacity, capacity)
         self.latency = self.init_class(Latency, latency)
@@ -150 +147 @@
 
 class Computer(base):
-    def __init__(self, cpu=[], os=[], software=[], storage=[], interface=[],
-            attribute=[]):
+    def __init__(self, name=[], cpu=[], os=[], software=[], storage=[],
+            interface=[], attribute=[]):
         def assign_element(i):
             i.element = self
 
+        self.name = self.make_list(name)
         self.cpu = [ self.init_class(CPU, c)  for c in self.make_list(cpu) ]
         self.os = [ self.init_class(OperatingSystem, c) \
@@ -182 +180 @@
         if self.attribute:
             rv['attribute'] = [ i.to_dict() for i in self.attribute ]
-        return rv
+        return { 'computer': rv }
 
 class Other(base):

wsdl/topdl.xsd

@@ -36 +36 @@
         A strawman network capacity description for access negotiation.
         This will come to include more and more interesting parameters.
+        Rate in kb/s.
       </xsd:documentation>
     </xsd:annotation>
@@ -178 +179 @@
     </xsd:annotation>
     <xsd:sequence>
+      <xsd:element name="name" type="xsd:string" minOccurs="0"
+        maxOccurs="unbounded"/>
       <xsd:element name="cpu" type="tns:cpuType"
         minOccurs="0" maxOccurs="unbounded"/>