Changeset 1e7f268

Timestamp:

May 14, 2010 3:10:15 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

822fd49

Parents:

22c88c9

Message:

Make computers single named

Files:

• fedd/federation/experiment_control.py (modified) (1 diff)
• fedd/federation/experiment_partition.py (modified) (1 diff)
• fedd/federation/topdl.py (modified) (7 diffs)
• wsdl/topdl.xsd (modified) (1 diff)

fedd/federation/experiment_control.py

@@ -1383 +1383 @@
                             "%s" % ip_addr(int(netmask))))
 
-                hname = i.element.name[0]
+                hname = i.element.name
                 if ifs.has_key(hname):
                     hosts.append("%s\t%s-%s %s-%d" % \

fedd/federation/experiment_partition.py

@@ -333 +333 @@
                         'type': 'transit',
                         'member': [ {
-                            'element': i.element.name[0], 
+                            'element': i.element.name, 
                             'interface': i.name 
                             } for i in s.interfaces \

fedd/federation/topdl.py

@@ -255 +255 @@
 
 class Computer(base):
-    def __init__(self, name=[], cpu=[], os=[], software=[], storage=[],
+    def __init__(self, name=, cpu=[], os=[], software=[], storage=[],
             interface=[], attribute=[]):
         def assign_element(i):
             i.element = self
 
-        self.name = self.make_list(name)
+        self.name = name
         self.cpu = [ self.init_class(CPU, c)  for c in self.make_list(cpu) ]
         self.os = [ self.init_class(OperatingSystem, c) \
@@ -276 +276 @@
     def clone(self):
         # Copy the list of names
-        return Computer(name=[ n for n in self.name ],
+        return Computer(name=self.name,
                 cpu=[x.clone() for x in self.cpu],
                 os=[x.clone() for x in self.os],
@@ -642 +642 @@
                 add = True
             if gw and add:
-                s = "%s ${%s}\n" % (cmd, to_tcl_name(e.name[0]))
+                s = "%s ${%s}\n" % (cmd, to_tcl_name(e.name))
         return s
     return rv
@@ -652 +652 @@
             gw = e.get_attribute('portal')
             if gw:
-                s = "tb-set-node-os ${%s} %s\n" % (to_tcl_name(e.name[0]), image)
+                s = "tb-set-node-os ${%s} %s\n" % (to_tcl_name(e.name), image)
         return s
     return rv
@@ -662 +662 @@
             gw = e.get_attribute('portal')
             if gw:
-                s = "tb-set-hardware ${%s} %s\n" % (to_tcl_name(e.name[0]), type)
+                s = "tb-set-hardware ${%s} %s\n" % (to_tcl_name(e.name), type)
         return s
     return rv
@@ -678 +678 @@
         tarfiles = ""
         if isinstance(e, Computer):
-            name = to_tcl_name(e.name[0])
+            name = to_tcl_name(e.name)
             out += "set %s [$ns node]\n" % name
             if e.os and len(e.os) == 1:
@@ -792 +792 @@
 
     for e in [e for e in t.elements if isinstance(e, Computer)]:
-        name = e.name[0]
+        name = e.name
         virt_type = e.get_attribute("virtualization_type") or "emulab-vnode"
         exclusive = e.get_attribute("exclusive") or "1"

wsdl/topdl.xsd

@@ -184 +184 @@
     </xsd:annotation>
     <xsd:sequence>
-      <xsd:element name="name" type="xsd:string" minOccurs="0"
-        maxOccurs="unbounded"/>
+      <xsd:element name="name" type="xsd:string"/>
       <xsd:element name="cpu" type="tns:cpuType"
         minOccurs="0" maxOccurs="unbounded"/>