From d8a5c83b34053fc1f519057f08d9066488692487 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Tue, 5 Jan 2021 09:24:19 +0100
Subject: [PATCH] added md (Jira) table output
---
test/data/check-snmp-agent-configs.py | 69 ++++++++++++++++++---------
1 file changed, 46 insertions(+), 23 deletions(-)
diff --git a/test/data/check-snmp-agent-configs.py b/test/data/check-snmp-agent-configs.py
index c371908e..d1dcd466 100644
--- a/test/data/check-snmp-agent-configs.py
+++ b/test/data/check-snmp-agent-configs.py
@@ -6,26 +6,49 @@ from lxml import etree
import socket
COMMUNITY_STRING = '0pBiFbD'
-COLLECTORS = [
- 'prod-noc-alarms01.geant.org',
- 'prod-noc-alarms02.geant.org',
- 'prod-noc-alarms03.geant.org',
- 'uat-noc-alarms01.geant.org',
- 'uat-noc-alarms02.geant.org',
- 'uat-noc-alarms03.geant.org',
- 'test-noc-alarms01.geant.org',
- 'test-noc-alarms02.geant.org',
- 'test-noc-alarms03.geant.org'
-]
+
+
+def write_row_csv(columns, header=False):
+ print(','.join(columns))
+
+
+def write_row_md(columns, header=False):
+ delimiter = '||' if header else '|'
+ print(delimiter + delimiter.join(columns) + delimiter)
+
+
+write_row = write_row_csv
+#write_row = write_row_md
# COLLECTORS = [
-# 'prod-poller-admin.geant.org',
-# 'uat-poller-admin.geant.org',
-# 'test-poller-admin.geant.org',
-# 'test-poller-sensu-agent01.geant.org',
-# 'test-poller-sensu-agent02.geant.org'
+# 'prod-noc-alarms01.geant.org',
+# 'prod-noc-alarms02.geant.org',
+# 'prod-noc-alarms03.geant.org',
+# 'uat-noc-alarms01.geant.org',
+# 'uat-noc-alarms02.geant.org',
+# 'uat-noc-alarms03.geant.org',
+# 'test-noc-alarms01.geant.org',
+# 'test-noc-alarms02.geant.org',
+# 'test-noc-alarms03.geant.org'
# ]
+COLLECTORS = [
+# 'prod-poller-admin.geant.org',
+# 'uat-poller-admin.geant.org',
+# 'test-poller-admin.geant.org',
+# 'test-poller-sensu-agent01.geant.org',
+# 'test-poller-sensu-agent02.geant.org'
+ 'prod-noc-alarms01.geant.org',
+ 'prod-noc-alarms02.geant.org',
+ 'prod-noc-alarms03.geant.org',
+ 'uat-noc-alarms01.geant.org',
+ 'uat-noc-alarms02.geant.org',
+ 'uat-noc-alarms03.geant.org',
+ 'test-noc-alarms01.geant.org',
+ 'test-noc-alarms02.geant.org',
+ 'test-noc-alarms03.geant.org'
+]
+
def v4_address(hostname):
for a in socket.getaddrinfo(hostname, None):
@@ -59,9 +82,9 @@ def client_addresses(netconf_string, community):
columns = [''] + COLLECTORS
-print(','.join(columns))
+write_row(columns, header=True)
columns = [''] + [ADDRESS[c] for c in COLLECTORS]
-print(','.join(columns))
+write_row(columns, header=True)
def _c(b):
@@ -84,10 +107,10 @@ for k in r.scan_iter('netconf:*'):
with open(f'{router}.xml', 'w') as f:
f.write(data)
- agents = agent_addresses(data)
- columns += [_c(ADDRESS[c] in agents) for c in COLLECTORS]
+ # agents = agent_addresses(data)
+ # columns += [_c(ADDRESS[c] in agents) for c in COLLECTORS]
- # acl_subnets = list(client_addresses(data, community=COMMUNITY_STRING))
- # columns += [_c(_in_any_subnet(c, acl_subnets)) for c in COLLECTORS]
+ acl_subnets = list(client_addresses(data, community=COMMUNITY_STRING))
+ columns += [_c(_in_any_subnet(c, acl_subnets)) for c in COLLECTORS]
- print(','.join(columns))
+ write_row(columns)
--
GitLab