Changeset cebcdce for fedd/federation/emulab_segment.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_segment.py (modified) (3 diffs)

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('/')