Changeset 10585 in genesis

Timestamp:

Apr 26, 2012, 1:30:24 PM (13 years ago)

Author:

rick

Message:

Find a better way of formatting those listings, as diffing and reading them on
an long line is a real pain todo.

File:

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

tools/gformat.py

@@ -470 +470 @@
       normal_proxies.append(hostdump)
 
-  datadump['autogen_ileiden_proxies'] = ','.join([x['masterip'] for x in ileiden_proxies])
+  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'] = ','.join([x['masterip'] for x in normal_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])
 
@@ -485 +487 @@
 #
 captive_portal_whitelist=""
-# iLeiden Proxies {{ autogen_ileiden_proxies_names }}
-list_ileiden_proxies="{{ autogen_ileiden_proxies }}"
-# normal Proxies {{ autogen_normal_proxies_names }}
-list_normal_proxies="{{ autogen_normal_proxies }}"
-
 {% if nodetype == "Proxy" %}
 #
@@ -520 +517 @@
   # Hybrid Configuration
   #
+  list_ileiden_proxies=`cat <<EOF | cut -f 1 | tr '\\n' ','
+  {% for item in autogen_ileiden_proxies -%}
+    {{ "%-16s"|format(item.masterip) }} # {{ item.autogen_realname }}
+  {% endfor -%}
+  EOF`
+  list_normal_proxies=`cat <<EOF | cut -f 1 | tr '\\n' ','
+  {% for item in autogen_normal_proxies -%}
+    {{ "%-16s"|format(item.masterip) }} # {{ item.autogen_realname }}
+  {% endfor -%}
+  EOF`
+
   captive_portal_interfaces="{{ autogen_dhcp_interfaces|default('none', true) }}"
   externalif="{{ externalif|default('vr0', true) }}"
@@ -574 +582 @@
 # NODE iLeiden Configuration
 #
+
+# iLeiden Proxies {{ autogen_ileiden_proxies_names }}
+list_ileiden_proxies="{{ autogen_ileiden_proxies_ips }}"
+# normal Proxies {{ autogen_normal_proxies_names }}
+list_normal_proxies="{{ autogen_normal_proxies_ips }}"
+
 captive_portal_interfaces="{{ autogen_dhcp_interfaces }}"