Changeset 935e46f

Timestamp:

Apr 22, 2010 10:21:17 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

76bcab2

Parents:

4c931af

Message:

Regular expression that accommodates appliances and virtual nodes better than the earlier one. Also for do not add project and experiment to pc\d+ nodenames.

Location:

fedd/federation

Files:

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

fedd/federation/emulab_access.py

@@ -1558 +1558 @@
                 for n in e.name:
                     if n in starter.node:
-                        e.set_attribute('hostname', "%s.%s.%s%s" % \
-                                (starter.node[n], ename, proj, self.domain))
+                        e.set_attribute('hostname', "%s%s" % \
+                                (starter.node[n], self.domain))
         except service_error, e:
             err = e

fedd/federation/local_emulab_segment.py

@@ -157 +157 @@
             self.log.debug("Getting mapping for %s %s" % (pid, eid))
             phys_start = re.compile('^Physical\s+Node\s+Mapping')
-            phys_line = re.compile('(\S+)\s+\S+\s+\S+\s+(.*)')
+            phys_line = re.compile('(\S+)(\s+\S+)*\s+(\S+)')
             phys_end = re.compile('^$')
             status = subprocess.Popen(cmd, stdout=subprocess.PIPE,
@@ -184 +184 @@
                 else:
                     m = phys_line.match(line.strip())
-                    if m: self.node[m.group(1)] = m.group(2)
+                    if m: self.node[m.group(1)] = m.group(3)
                     else: self.log.warn(
-                            "Matching failed while parsing node mapping")
+                            "Matching failed while parsing node mapping: " +\
+                                    "line %s" % line)
             rv = status.wait()
 

fedd/federation/proxy_emulab_segment.py

@@ -100 +100 @@
             self.log.debug("Getting mapping for %s %s" % (pid, eid))
             phys_start = re.compile('^Physical\s+Node\s+Mapping')
-            phys_line = re.compile('(\S+)\s+\S+\s+\S+\s+(.*)')
+            phys_line = re.compile('(\S+)(\s+\S+)*\s+(\S+)')
             phys_end = re.compile('^$')
             status = subprocess.Popen(cmd, stdout=subprocess.PIPE,
@@ -127 +127 @@
                 else:
                     m = phys_line.match(line.strip())
-                    if m: self.node[m.group(1)] = m.group(2)
+                    if m: self.node[m.group(1)] = m.group(3)
                     else: self.log.warn(
-                            "Matching failed while parsing node mapping")
+                            "Matching failed while parsing node mapping: " +\
+                                    "line %s" % line)
             rv = status.wait()