Changeset 13843 in genesis for tools

Timestamp:

Apr 28, 2017, 1:36:55 PM (8 years ago)

Author:

rick

Message:

Fix generation & cleanup of config files

Location:

tools

Files:

• gformat.py (modified) (4 diffs)
• yaml2nag.py (modified) (2 diffs)

tools/gformat.py

@@ -299 +299 @@
     try:
       for iface_key in get_interface_keys(datadump):
+        # Bridge members has no IP assigned
+        if 'parent' in datadump[iface_key] and not 'ip' in datadump[iface_key]:
+          continue
         net_addr = network(datadump[iface_key]['ip'])
         poel[net_addr] += [(host,datadump[iface_key].copy())]
-    except (KeyError, ValueError), e:
-      errors.append("[FOUT] in '%s' interface '%s' (%s)" % (host,iface_key, e))
+    except (KeyError, ValueError) as e:
+      errors.append("[FOUT] in '%s' interface '%s' (%s)" % (host,iface_key, type(e).__name__ + ': ' +  str(e)))
       continue
 
@@ -2131 +2134 @@
 
           if 'rdnap_x' in datadump and 'rdnap_y' in datadump:
-            datadump['latitude'], datadump['longitude'] = map(lambda x: "%.5f" % x, rd2etrs(datadump['rdnap_x'], datadump['rdnap_y']))
+            if not 'latitude' in datadump and not 'longitude' in datadump:
+              datadump['latitude'], datadump['longitude'] = map(lambda x: "%.5f" % x, rd2etrs(datadump['rdnap_x'], datadump['rdnap_y']))
           elif 'latitude' in  datadump and 'longitude' in datadump:
-            datadump['rdnap_x'], datadump['rdnap_y'] = etrs2rd(datadump['latitude'], datadump['longitude'])
+            if not 'rdnap_x' in datadump and not 'rdnap_y' in datadump:
+              datadump['rdnap_x'], datadump['rdnap_y'] = etrs2rd(datadump['latitude'], datadump['longitude'])
+          # TODO: Compare outcome of both coordinate systems and validate against each-other
 
           if datadump['nodename'].startswith('Proxy'):
@@ -2207 +2213 @@
 
               # Set the compass value based on the angle between the poels
-              if datadump[iface_key].has_key('ns_ip'):
+              if 'ns_ip' in datadump[iface_key] and 'ip' in datadump[iface_key] and not 'compass' in datadump[iface_key]:
                 my_pool = poel[network(datadump[iface_key]['ip'])]
                 remote_hosts = list(set([x[0] for x in my_pool]) - set([host]))
@@ -2213 +2219 @@
                   compass_target = remote_hosts[0]
                   datadump[iface_key]['compass'] = cd_between_hosts(host, compass_target, datadumps)
+              # TODO: Compass wanted and actual direction might differ
 
               # Monitoring Group default

tools/yaml2nag.py

@@ -29 +29 @@
 define host{
   use        %(use)s
-  host_name  %(autogen_realname)s
-  alias      %(autogen_realname)s
+  host_name  %(autogen_fqdn)s
+  alias      %(autogen_fqdn)s
   address    %(masterip)s
   hostgroups %(hostgroups)s
@@ -73 +73 @@
         print_host(datadump, hostgroups)
       else:
-        print "# ERROR: nodetype %(nodetype)s for %(autogen_realname)s not defined" % datadump
+        print "# ERROR: nodetype %(nodetype)s for %(autogen_fqdn)s not defined" % datadump