Changeset 13276 in genesis

Timestamp:

Jun 13, 2015, 7:30:13 PM (9 years ago)

Author:

rick

Message:

• Same depth nodes should also be travered
• Deal with unknown IP address in the network

File:

• tools/gformat.py (modified) (4 diffs)

tools/gformat.py

@@ -56 +56 @@
 from pprint import pprint
 from collections import defaultdict
+from sys import stderr
 try:
   import yaml
@@ -1684 +1685 @@
 
       # Find dependency tree based on output of lvrouted.mytree of nearest node
-      parent = defaultdict(list)
+      parents = defaultdict(list)
       stack = ['root']
       prev_depth = 0
@@ -1692 +1693 @@
       
         if prev_depth < depth:
-          print ip2host[stack[-1]], " -> ", ip2host[ip]
-          parent[ip2host[ip]].append(ip2host[stack[-1]])
+          try:
+            parents[ip2host[ip]].append(ip2host[stack[-1]])
+          except KeyError as e:
+            print >> stderr, "# Unable to find %s in configuration files" % e.args[0]
           stack.append(ip)
         elif prev_depth > depth:
           stack = stack[:(depth - prev_depth)]
+        elif prev_depth == depth:
+          try:
+            parents[ip2host[ip]].append(ip2host[stack[-1]])
+          except KeyError as e:
+            print >> stderr, "# Unable to find %s in configuration files" % e.args[0]
+
 
         prev_depth = depth
@@ -1866 +1875 @@
         hostgroups            srv_hybrid,%(monitoring_group)s\
 ''' % datadump
-        if len(parent[datadump['autogen_fqdn']]) > 0:
+        if len(parents[datadump['autogen_fqdn']]) > 0:
           print '''\
-        parent                %(parent)s\
-''' % { 'parent' : parent[datadump['autogen_fqdn']][0] }
+        parents               %(parents)s\
+''' % { 'parents' : parents[datadump['autogen_fqdn']][0] }
         print '''\
 }