Changeset 13863 in genesis

Timestamp:

May 9, 2017, 6:43:17 AM (8 years ago)

Author:

rick

Message:

Add ability to provide comments for tracking.

Files:

• nodes/global_rdr_rules.yaml (modified) (1 diff)
• tools/gformat.py (modified) (1 diff)

nodes/global_rdr_rules.yaml

@@ -1 +1 @@
 global_rdr_rules :
-- ['tcp', 9070, '172.16.16.2', 80]
-- ['tcp', 9080, '172.17.0.41', 80]
-- ['tcp', 9081, '172.17.0.42', 554]
-- ['tcp', 9082, '172.17.0.43', 554]
-- ['tcp', 9083, '172.17.0.44', 80]
-- ['tcp', 9084, '172.17.0.43', 80]
-- ['tcp', 9085, '172.17.0.42', 80]
-- ['tcp', 9086, '172.17.0.45', 21]
-- ['tcp', 9087, '172.17.0.45', 3389]
-- ['tcp', 9088, '172.16.6.229', 9081]
-- ['tcp', 9090, '172.17.2.67', 80]
-- ['tcp', 9091, '172.16.9.237', 88]
-- ['tcp', 9092, '172.17.51.5', 80]
-- ['tcp', 9093, '172.17.51.5', 554]
-- ['tcp', 9096, '172.17.13.66', 88]
-- ['tcp', 9097, '172.17.52.10', 88]
-- ['tcp', 9099, '172.16.9.116', 80]
-- ['tcp', 9100, '172.16.9.202', 88]
-- ['tcp', 9101, '172.17.192.2', 88]
+- ['tcp', 9070, '172.16.16.2', 80, '']
+- ['tcp', 9080, '172.17.0.41', 80, '']
+- ['tcp', 9081, '172.17.0.42', 554, '']
+- ['tcp', 9082, '172.17.0.43', 554, '']
+- ['tcp', 9083, '172.17.0.44', 80, '']
+- ['tcp', 9084, '172.17.0.43', 80, '']
+- ['tcp', 9085, '172.17.0.42', 80, '']
+- ['tcp', 9086, '172.17.0.45', 21, '']
+- ['tcp', 9087, '172.17.0.45', 3389, '']
+- ['tcp', 9088, '172.16.6.229', 9081, '']
+- ['tcp', 9090, '172.17.2.67', 80, '']
+- ['tcp', 9091, '172.16.9.237', 88, '']
+- ['tcp', 9092, '172.17.51.5', 80, '']
+- ['tcp', 9093, '172.17.51.5', 554, '']
+- ['tcp', 9096, '172.17.13.66', 88, '']
+- ['tcp', 9097, '172.17.52.10', 88, '']
+- ['tcp', 9099, '172.16.9.116', 80, '']
+- ['tcp', 9100, '172.16.9.202', 88, '']
+- ['tcp', 9101, '172.17.192.2', 88, 'Koe Klara']

tools/gformat.py

@@ -1179 +1179 @@
 # Redirect some internal facing services outside (7)
 # INFO: {{ global_rdr_rules|count }} global_rdr_rules active on this node.
-{% for protocol, src_port,dest_ip,dest_port in global_rdr_rules -%}
-rdr on $ext_if inet proto {{ protocol }} from any to $ext_if port {{ src_port }} tag SRV -> {{ dest_ip }} port {{ dest_port }}
+{% for protocol, src_port,dest_ip,dest_port,comment in global_rdr_rules -%}
+rdr on $ext_if inet proto {{ protocol }} from any to $ext_if port {{ src_port }} tag SRV -> {{ "-%14s"|format(dest_ip) }} port {{ "%4s"|format(dest_port) }} # {{ comment }}
 {% endfor -%}
 # INFO: {{ rdr_rules|count }} node specific rdr_rules defined.
-{% for protocol, src_port,dest_ip,dest_port in rdr_rules -%}
-rdr on $ext_if inet proto {{ protocol }} from any to $ext_if port {{ src_port }} tag SRV -> {{ dest_ip }} port {{ dest_port }}
+{% for protocol, src_port,dest_ip,dest_port,comment in rdr_rules -%}
+rdr on $ext_if inet proto {{ protocol }} from any to $ext_if port {{ src_port }} tag SRV -> {{ dest_ip }} port {{ dest_port }} # {{ comment }}
 {% endfor -%}
 """).render(datadump)