Changeset 69692a9 for fedd/federation/topdl.py

Timestamp:

Sep 21, 2009 6:48:12 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:

ae0f69a

Parents:

adcbdaf

Message:

Looks like Dragon is being called correctly. Internals remain a bit messy.

File:

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

fedd/federation/topdl.py

@@ -22 +22 @@
         elif getattr(a, '__iter__', None): return a
         else: return [ a ]
+
+    def remove_attribute(self, key):
+        to_del = None
+        attrs = getattr(self, 'attribute', [])
+        for i, a in enumerate(attrs):
+            if a.attribute == key:
+                to_del = i
+                break
+        
+        if to_del: del attrs[i]
 
     def get_attribute(self, key):
@@ -384 +394 @@
             return e
 
-    def __init__(self, substrates=[], elements=[]):
+    def __init__(self, substrates=[], elements=[], attribute=[]):
         self.substrates = [ self.init_class(Substrate, s) \
                 for s in self.make_list(substrates) ]
         self.elements = [ self.init_element(e) \
                 for e in self.make_list(elements) ]
+        self.attribute = [ self.init_class(Attribute, c) \
+                for c in self.make_list(attribute) ]
         self.incorporate_elements()
 
@@ -419 +431 @@
     def clone(self):
         return Topology(substrates=[s.clone() for s in self.substrates], 
-                elements=[e.clone() for e in self.elements])
+                elements=[e.clone() for e in self.elements],
+                attribute=[a.clone() for a in self.attribute])
 
 
@@ -432 +445 @@
         if self.elements:
             rv['elements'] = [ s.to_dict() for s in self.elements ]
+        if self.attribute:
+            rv['attribute'] = [ s.to_dict() for s in self.attribute]
         return rv
 
@@ -519 +534 @@
 
         for k in e.keys():
-            if isinstance(e[k], (basestring, int, float, long)):
+            if isinstance(e[k], basestring):
                 rv += "<%s>%s</%s>" % (k, escape(e[k]), k)
+            elif isinstance(e[k], (int, float, long)):
+                rv += "<%s>%d</%s>" % (k, e[k], k)
             elif isinstance(e[k], dict):
                 rv += "<%s>%s</%s>" % (k, dict_to_xml(e[k]), k)
@@ -530 +547 @@
                         rv += "<%s>%s</%s>" % (k, escape(ee), k)
             else:
-                raise ConsistencyError("What is this?? %s %s" % (k, e[k]))
+                try:
+                    rv += "<%s>%s</%s>" % (k, e[k], k)
+                except Exception:
+                    raise ConsistencyError("What is this?? %s %s" % (k, e[k]))
         if top: rv += "</%s>" % top
         return rv
@@ -582 +602 @@
     return t
 
-def generate_portal_command_filter(cmd):
+def generate_portal_command_filter(cmd, add_filter=None):
     def rv(e):
         s =""
         if isinstance(e, Computer):
             gw = e.get_attribute('portal')
-            if gw:
+            if add_filter and callable(add_filter):
+                add = add_filter(e)
+            else:
+                add = True
+            if gw and add:
                 s = "%s $%s\n" % (cmd, to_tcl_name(e.name[0]))
         return s