Changeset 13680 in genesis for tools

Timestamp:

Jan 4, 2017, 9:41:53 PM (8 years ago)

Author:

rick

Message:

Control gateway routing using 'flagged' IP.

The use of specialized serviceid IP addresses for use in determining the
presence of a default gateway will allow us, to remove the IP if the gateway is
not functional, without affecting other functions of the node. The presence of
the unused entries allowes new gateways to be added without the need of
updating all configuration files.

Side-note: This is a workaround since default routing to pasted through
lvrouted using the '-g' parameter at gateways and leaving the '-z' parameter
empty other nodes. How-ever this setup is causing defaultgw 'loops' in the
network, yet need to be tested some more.

File:

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

tools/gformat.py

@@ -55 +55 @@
 
 from pprint import pprint
-from collections import defaultdict
+from collections import defaultdict, OrderedDict
 from sys import stderr
 try:
@@ -117 +117 @@
 
 
-ileiden_proxies = []
+ileiden_proxies = OrderedDict()
 normal_proxies = []
 datadump_cache = {}
@@ -130 +130 @@
   interface_list_cache = {}
   rc_conf_local_cache = {}
-  ileiden_proxies = []
+  ileiden_proxies = OrderedDict()
   normal_proxies = []
   nameservers_cache = []
@@ -651 +651 @@
     addrs_list['lo0'].append((datadump['masterip'] + "/32", 'Master IP Not used in interface'))
 
+  if 'serviceid' in datadump:
+    addrs_list['lo0'].append((datadump['serviceid'] + "/32", 'Lvrouted GW IP'))
+
   for iface_key in get_interface_keys(datadump):
     ifacedump = datadump[iface_key]
@@ -739 +742 @@
   datadump['autogen_ileiden_enable'] = switchFormat(datadump['autogen_ileiden_enable'])
 
+
+  for i in range(1,50):
+    ileiden_proxies['172.31.254.%i' % i] = {'nodename' : 'unused'}
+
   if not ileiden_proxies or not normal_proxies:
     for host in get_hostlist():
@@ -744 +751 @@
       if hostdump['status'] == 'up':
         if hostdump['service_proxy_ileiden']:
-          ileiden_proxies.append(hostdump)
+          ileiden_proxies[hostdump['serviceid']] = hostdump
         if hostdump['service_proxy_normal']:
           normal_proxies.append(hostdump)
@@ -750 +757 @@
   datadump['autogen_ileiden_proxies'] = ileiden_proxies
   datadump['autogen_normal_proxies'] = normal_proxies
-  datadump['autogen_ileiden_proxies_ips'] = ','.join([x['masterip'] for x in ileiden_proxies])
-  datadump['autogen_ileiden_proxies_names'] = ','.join([x['autogen_item'] for x in ileiden_proxies])
   datadump['autogen_normal_proxies_ips'] = ','.join([x['masterip'] for x in normal_proxies])
   datadump['autogen_normal_proxies_names'] = ','.join([x['autogen_item'] for x in normal_proxies])
@@ -798 +803 @@
   #
   list_ileiden_proxies="
-  {% for item in autogen_ileiden_proxies -%}
-    {{ "%-16s"|format(item.masterip) }} # {{ item.nodename }}
+  {% for serviceid,item in autogen_ileiden_proxies.iteritems() -%}
+    {{ "%-16s"|format(serviceid) }} # {{ item.nodename }}
   {% endfor -%}
   "
   list_normal_proxies="
   {% for item in autogen_normal_proxies -%}
-    {{ "%-16s"|format(item.masterip) }} # {{ item.nodename }}
+    {{ "%-16s"|format(item.serviceid) }} # {{ item.nodename }}
   {% endfor -%}
   "
@@ -993 +998 @@
     for config in configs:
       ip_list.append(config['masterip'])
+      if 'serviceid' in config:
+        ip_list.append(config['serviceid'])
       for iface_key in get_interface_keys(config, True):
         l = config[iface_key]['ip']