Changeset cebcdce

Timestamp:

Dec 1, 2011 5:10:32 PM (13 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

Location:

fedd/federation

Files:

• emulab_access.py (modified) (2 diffs)
• emulab_segment.py (modified) (3 diffs)
• local_emulab_segment.py (modified) (1 diff)

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

fedd/federation/emulab_segment.py

@@ -33 +33 @@
                         version=self.osversion)
             if self.image and rv:
-                rv.set_attribute('image', self.image)
+                rv.set_attribute('emulab_access:image', self.image)
             return rv
 
@@ -295 +295 @@
                 raise service_error(service_error.internal,
                         "Cannot get node mapping of segment:%s/%s" % (pid, eid))
-    def get_image(self, node, top):
+    def get_initial_image(self, node, top):
         for e in top.elements:
             if isinstance(e, topdl.Computer):
                 if node == e.name:
-                    if e.os: 
-                        return e.os[0].get_attribute('image')
+                    if e.os and len(e.os) == 1: 
+                        return e.os[0].get_attribute(
+                                'emulab_access:initial_image')
         return None
 
@@ -326 +327 @@
                 return False
             elif state == 'initial': 
-                image = self.get_image(lnode, top)
+                image = self.get_initial_image(lnode, top)
                 if image:
                     pid, iid = image.split('/')

fedd/federation/local_emulab_segment.py

@@ -141 +141 @@
     def __call__(self, parent, op, targets, param, top):
         for l, p in targets.items():
-            self.log.info("[operation_segment]: Calling op on %s(%s)" % (l,p))
+            self.log.info("[operation_segment]: Calling op %s on %s(%s)" % \
+                    (op, l,p))
             self.do_operation(op, l, p, param, top)
         return True