Index: tools/gformat.py
===================================================================
--- tools/gformat.py	(revision 13676)
+++ tools/gformat.py	(revision 13680)
@@ -55,5 +55,5 @@
 
 from pprint import pprint
-from collections import defaultdict
+from collections import defaultdict, OrderedDict
 from sys import stderr
 try:
@@ -117,5 +117,5 @@
 
 
-ileiden_proxies = []
+ileiden_proxies = OrderedDict()
 normal_proxies = []
 datadump_cache = {}
@@ -130,5 +130,5 @@
   interface_list_cache = {}
   rc_conf_local_cache = {}
-  ileiden_proxies = []
+  ileiden_proxies = OrderedDict()
   normal_proxies = []
   nameservers_cache = []
@@ -651,4 +651,7 @@
     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,4 +742,8 @@
   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,5 +751,5 @@
       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,6 +757,4 @@
   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,11 +803,11 @@
   #
   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,4 +998,6 @@
     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']