Changeset cebcdce for fedd/federation/emulab_access.py

Timestamp:

Dec 1, 2011 5:10:32 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

7f57435

Parents:

32b4536

Message:

Track initial state image name; move attributes into emulab_access:
namespace

File:

• fedd/federation/emulab_access.py (modified) (2 diffs)

fedd/federation/emulab_access.py

@@ -1032 +1032 @@
                 if a not in attr: attr.append(a)
 
+        def merge_os(os, e):
+            if len(e.os) == 0:
+                # No OS at all:
+                if os.get_attribute('emulab_access:image'):
+                    os.set_attribute('emulab_access:initial_image', 
+                            os.get_attribute('emulab_access:image'))
+                e.os = [ os ]
+            elif len(e.os) == 1:
+                # There's one OS, copy the initial image and replace
+                eos = e.os[0]
+                initial = eos.get_attribute('emulab_access:initial_image')
+                if initial:
+                    os.set_attribute('emulab_access:initial_image', initial)
+                e.os = [ os] 
+            else:
+                # Multiple OSes, replace or append
+                for eos in e.os:
+                    if os.name == eos.name:
+                        eos.version = os.version
+                        eos.version = os.distribution
+                        eos.version = os.distributionversion
+                        for a in os.attribute:
+                            if eos.get_attribute(a.attribute):
+                                eos.remove_attribute(a.attribute)
+                            eos.set_attribute(a.attribute, a.value)
+                        break
+                else:
+                    e.os.append(os)
+
+
+        if t is None: return
         # Copy the assigned names into the return topology
         for e in t.elements:
@@ -1042 +1073 @@
                         e.status = info.node[e.name].status
                         os = info.node[e.name].getOS()
-                        if os: e.os = [ os ]
+                        if os: merge_os(os, e)
                 else:
                     # Simple debugging assignment