Changeset f769cb3

Timestamp:

Nov 23, 2011 2:28:47 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

c6f867c

Parents:

9294673

Message:

Gather node information and return in info

Location:

fedd/federation

Files:

• emulab_access.py (modified) (1 diff)
• emulab_segment.py (modified) (1 diff)
• proxy_emulab_segment.py (modified) (1 diff)

fedd/federation/emulab_access.py

@@ -1023 +1023 @@
                     if e.name in starter.node:
                         e.localname.append("%s%s" % \
-                                (starter.node[e.name], self.domain))
-                        e.status = 'active'
+                                (starter.node[e.name][0], self.domain))
+                        e.status = starter.node[e.name][1]
                 else:
                     # Simple debugging assignment

fedd/federation/emulab_segment.py

@@ -226 +226 @@
             if code ==0:
                 for k, v in nodes.items():
+                    print v
                     if v.get('erole', False) and 'pnode' in v:
-                        self.node[k] = v['pnode']
+                        st = v.get('status', 'up')
+                        if st == 'up': st = 'active'
+                        else: st = 'failed'
+                        self.node[k] = (v['pnode'], st)
                 if self.log:
                     self.log.info("Mapping complete")

fedd/federation/proxy_emulab_segment.py

@@ -142 +142 @@
                 else:
                     m = phys_line.match(line.strip())
-                    if m: self.node[m.group(1)] = m.group(3)
+                    if m: self.node[m.group(1)] = (m.group(3), 'active')
                     else: self.log.warn(
                             "Matching failed while parsing node mapping: " +\