Changeset ecca6eb for fedd/federation/topdl.py

Timestamp:

Sep 3, 2009 6:51:50 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:

f5ae004

Parents:

66861a2

Message:

checkpoint

File:

• fedd/federation/topdl.py (modified) (6 diffs)

fedd/federation/topdl.py

@@ -231 +231 @@
     def clone(self):
         return ID(self.fedid, self.uuid, self.uri, self.localname,
-                self.kernberosUsername)
+                self.kerberosUsername)
 
     def to_dict(self):
@@ -327 +327 @@
         return Segment(self.id.clone(), self.type, self.uri, 
                 interface=[i.clone() for i in self.interface], 
-                attribute=[a.clone() for a in attribute])
+                attribute=[a.clone() for a in self.attribute])
 
     def to_dict(self):
@@ -579 +579 @@
 
 def to_tcl_name(n):
-    t = re.subst('-(\d+)', '(\1)', n)
+    t = re.sub('-(\d+)', '(\1)', n)
     return t
+
+def generate_portal_command_filter(cmd):
+    def rv(e):
+        s =""
+        if isinstance(e, Computer):
+            gw = e.get_attribute('portal')
+            if gw:
+                s = "%s $%s\n" % (cmd, to_tcl_name(e.name[0]))
+        return s
+    return rv
 
 def generate_portal_image_filter(image):
@@ -588 +598 @@
             gw = e.get_attribute('portal')
             if gw:
-                s = "tb-set-node-os $%s %s" % (to_tcl_name(e.name[0]), image)
+                s = "tb-set-node-os $%s %s\n" % (to_tcl_name(e.name[0]), image)
         return s
     return rv
 
-def generate_portal_command_filter(cmd):
+def generate_portal_hardware_filter(type):
     def rv(e):
         s =""
@@ -598 +608 @@
             gw = e.get_attribute('portal')
             if gw:
-                s = "%s $%s" % (cmd, to_tcl_name(e.name[0]))
+                s = "tb-set-hardware $%s %s\n" % (to_tcl_name(e.name[0]), type)
         return s
     return rv
@@ -620 +630 @@
                 if osid:
                     out += "tb-set-node-os $%s %s\n" % (name, osid)
+            hw = e.get_attribute('type')
+            if hw:
+                out += "tb-set-hardware $%s %s\n" % (name, hw)
             for s in e.software:
                 if s.install: