Changeset 10729 in genesis for tools

Timestamp:

May 8, 2012, 9:37:52 PM (13 years ago)

Author:

rick

Message:

Verbeter alle compass waardes, door het uit te rekenen met coordinaten.

Fixes: nodefactory#100

File:

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

tools/gformat.py

@@ -31 +31 @@
 import time
 import rdnap
+import math
 import make_network_kml
 from pprint import pprint
@@ -140 +141 @@
 
 
-
-def make_relations():
+def network(ip):
+  addr, mask = ip.split('/')
+  # Not parsing of these folks please
+  addr = parseaddr(addr)
+  mask = int(mask)
+  network = addr & ~((1 << (32 - mask)) - 1)
+  return network
+  
+
+
+def make_relations(datadumps=None):
   """ Process _ALL_ yaml files to get connection relations """
-  errors = ""
+  errors = []
   poel = defaultdict(list)
-  for host in get_hostlist():
+
+  if not datadumps:
+    for host in get_hostlist():
+      datadumps[host] = get_yaml(host)
+
+  for host, datadump in datadumps.iteritems():
     try:
-      datadump = get_yaml(host)
       for iface_key in datadump['autogen_iface_keys']:
-        l = datadump[iface_key]['ip']
-        addr, mask = l.split('/')
-
-        # Not parsing of these folks please
-        if not valid_addr(addr):
-          continue
-
-        addr = parseaddr(addr)
-        mask = int(mask)
-        network = addr & ~((1 << (32 - mask)) - 1)
-        poel[network] += [(host,datadump[iface_key])]
+        net_addr = network(datadump[iface_key]['ip'])
+        poel[net_addr] += [(host,datadump[iface_key])]
     except (KeyError, ValueError), e:
-      errors += "[FOUT] in '%s' interface '%s'" % (host,iface_key) 
-      errors += e
+      errors.append("[FOUT] in '%s' interface '%s' (%s)" % (host,iface_key, e))
       continue
   return (poel, errors)
@@ -189 +193 @@
   """
   dy = lat2 - lat1
-  dx = math.cos(math.pi/180*lat1)*(long2 - long1)
+  dx = math.cos(lat1)*(long2 - long1)
   angle = math.atan2(dy,dx)
   return angle
 
+
+
 def angle_to_cd(angle):
   """ Return Dutch Cardinal Direction estimation in 'one digit' of radian angle """
@@ -198 +204 @@
   # For easy conversion get positive degree
   degrees = math.degrees(angle)
-  if degrees < 0:
-    360 - abs(degrees)
+  abs_degrees = 360 + degrees if degrees < 0 else degrees
 
   # Numbers can be confusing calculate from the 4 main directions
   p = 22.5
-  if degrees < p:
-    return "n"
-  elif degrees < (90 - p):
-    return "no"
-  elif degrees < (90 + p):
-    return "o"
-  elif degrees < (180 - p):
-    return "zo"
-  elif degrees < (180 + p):
-    return "z"
-  elif degrees < (270 - p):
-    return "zw"
-  elif degrees < (270 + p):
-    return "w"
-  elif degrees < (360 - p):
-    return "nw"
+  if abs_degrees < p:
+    cd = "n"
+  elif abs_degrees < (90 - p):
+    cd = "no"
+  elif abs_degrees < (90 + p):
+    cd = "o"
+  elif abs_degrees < (180 - p):
+    cd = "zo"
+  elif abs_degrees < (180 + p):
+    cd = "z"
+  elif abs_degrees < (270 - p):
+    cd = "zw"
+  elif abs_degrees < (270 + p):
+    cd = "w"
+  elif abs_degrees < (360 - p):
+    cd = "nw"
   else:
-    return "n"
+    cd = "n"
+  return cd
+
+
+
+def cd_between_hosts(hostA, hostB, datadumps):
+  # Using RDNAP coordinates
+  dx = float(int(datadumps[hostA]['rdnap_x']) - int(datadumps[hostB]['rdnap_x'])) * -1
+  dy = float(int(datadumps[hostA]['rdnap_y']) - int(datadumps[hostB]['rdnap_y'])) * -1
+  return angle_to_cd(math.atan2(dx,dy))
+
+  # GPS coordinates seems to fail somehow
+  #latA = float(datadumps[hostA]['latitude'])
+  #latB = float(datadumps[hostB]['latitude'])
+  #lonA = float(datadumps[hostA]['longitude'])
+  #lonB = float(datadumps[hostB]['longitude'])
+  #return angle_to_cd(angle_between_points(latA, latB, lonA, lonB))
 
 
@@ -333 +354 @@
 def is_member(ip, mask, canidate):
   """ Return True if canidate is part of ip/mask block"""
-  ip_addr = gformat.parseaddr(ip)
-  ip_canidate = gformat.parseaddr(canidate)
+  ip_addr = parseaddr(ip)
+  ip_canidate = parseaddr(canidate)
   mask = int(mask)
   ip_addr = ip_addr & ~((1 << (32 - mask)) - 1)
@@ -1320 +1341 @@
       # First generate all datadumps
       datadumps = dict()
+      ssid_to_node = dict()
       for host in get_hostlist():
         logger.info("# Processing: %s", host)
@@ -1327 +1349 @@
         datadumps[datadump['autogen_realname']] = datadump
 
+      (poel, errors) = make_relations(datadumps)
+      print "\n".join(["# WARNING: %s" % x for x in errors])
 
       for host,datadump in datadumps.iteritems():
@@ -1364 +1388 @@
           if not datadump[iface_key].has_key('desc'):
             datadump[iface_key]['desc'] = 'autogen-FIXME'
+          # Set the compass value based on the angle between the poels
+          if datadump[iface_key].has_key('ns_ip'):
+            my_pool = poel[network(datadump[iface_key]['ip'])]
+            remote_hosts = list(set([x[0] for x in my_pool]) - set([host]))
+            if remote_hosts:
+              compass_target = remote_hosts[0]
+              datadump[iface_key]['compass'] = cd_between_hosts(host, compass_target, datadumps)
+            
         store_yaml(datadump)
     elif sys.argv[1] == "list":