Merge branch 'ipv6'

[nodemanager.git] / plugins / hostmap.py

diff --git a/plugins/hostmap.py b/plugins/hostmap.py
index d0d8d74..8bd1c08 100644 (file)
--- a/plugins/hostmap.py
+++ b/plugins/hostmap.py
@@ -38,6 +38,8 @@ def GetSlivers(data, config=None, plc=None):
 
     hostname = data['hostname']
 
+    hostname_filter = ".".join(hostname.split(".")[1:])
+
     for sliver in data['slivers']:
         slicename = sliver['name']
         for tag in sliver['attributes']:
@@ -52,14 +54,17 @@ def GetSlivers(data, config=None, plc=None):
                 for index, entry in enumerate(tag["value"].split("\n")):
                     parts = entry.split(" ")
                     if len(parts)==2:
-                       if parts[1] == hostname:
-                           line = "127.0.0.1 %s.%s private%d" % (slicename, parts[1], index)
-                       else:
-                           line = "%s %s.%s private%d" % (parts[0], slicename, parts[1], index)
+                       line = "%s pvt.%s private%d" % (parts[0], parts[1], index)
+
+                       if (parts[0].startswith("10.")) and (hostname_filter not in parts[1]):
+                           continue
 
                        if (index==0):
                            line = line + " headnode"
 
+                       if parts[1] == hostname:
+                           line = line + " pvt.self"
+
                        hostmap.append(line)
 
                 hostmap = "\n".join(hostmap)
@@ -84,4 +89,3 @@ def GetSlivers(data, config=None, plc=None):
                     logger.log_exc("hostmap (%s): failed to write %s" % (slicename, fn))
 
 
-