Changeset df783c1 for fedd/federation

Timestamp:

Aug 2, 2009 6:25:17 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:

81a7f3f

Parents:

cdb62d9

Message:

create images from topdl descriptions, a good sign they're coming out right.

File:

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

fedd/federation/topdl.py

@@ -5 +5 @@
     def init_class(c, arg):
         if isinstance(arg, dict):
-            return c(**arg)
+            try:
+                return c(**arg)
+            except:
+                print "%s" % arg
+                raise
         elif isinstance(arg, c):
             return arg
@@ -16 +20 @@
         elif getattr(a, '__iter__', None): return a
         else: return [ a ]
+
+    def get_attribute(self, key):
+        rv = None
+        attrs = getattr(self, 'attributes', None)
+        if attrs:
+            for a in attrs:
+                if a.attribute == key:
+                    rv = a.value
+                    break
+        return rv
 
 
@@ -93 +107 @@
 
 class OperatingSystem(base):
-    def __init__(self, name, version=None, distribution=None,
+    def __init__(self, name=None, version=None, distribution=None,
             distributionversion=None, attribute=[]):
         self.name = name
@@ -103 +117 @@
 
     def to_dict(self):
-        rv = { 'name': self.name }
+        rv = { }
+        if self.name: rv['name'] = self.name
         if self.version: rv['version'] = self.version
         if self.distribution: rv['version'] = self.distribution
@@ -249 +264 @@
         return rv
 
-def topology_from_xml(file=None, top="topology"):
+def topology_from_xml(string=None, file=None, top="topology"):
     import xml.parsers.expat
 
@@ -303 +318 @@
     xp.CharacterDataHandler = p.char_data
 
-    f = open(file, "r")
-
-    xp.ParseFile(f)
+    if file and string:
+        raise RuntimeError("Only one of file and string")
+    elif file:
+        f = open(file, "r")
+        xp.ParseFile(f)
+    elif string:
+        xp.Parse(string, isfinal=True)
+    else:
+        return None
 
     return Topology(**p.current[top])