python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-06-17 00:07:37 +02:00
Code Issues Releases Activity

More nsd fixes (#523)

Browse Source 
* Update nsd_control.py

support catz output

* Update nsd_control.py

fix parsing of catz zones

* add testdata

add corresponding catz testdata
This commit is contained in:
pettai
2024-01-26 23:20:33 +01:00
committed by Kelly Brazil
parent 65e30c4440
commit ec0f2569e5
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jc/parsers/nsd_control.py
View File

@ -192,6 +192,18 @@ def parse(data: str, raw: bool = False, quiet: bool = False):
zonename.update({'zone': zone})
continue
if line.startswith('pattern:'):
linedata = line.split(': ', maxsplit=1)
catz_pattern = linedata[1]
zstatus.update({'pattern': catz_pattern})
continue
if line.startswith('catalog-member-id:'):
linedata = line.split(': ', maxsplit=1)
catz_member_id = linedata[1]
zstatus.update({'catalog-member-id': catz_member_id})
continue
if line.startswith('state:'):
linedata = line.split(': ', maxsplit=1)
state = linedata[1]

2
tests/fixtures/generic/nsd_control-zonestatus.json vendored
View File

@ -1 +1 @@
[{"zone":"sunet.se","status":{"state":"ok","served-serial":"2023091302 since 2023-09-14T00:50:11","commit-serial":"2023091302 since 2023-09-14T07:04:05","wait":"27023 sec between attempts"}}]
[{"zone":"sunet.se","status":{"state":"ok","served-serial":"2023091302 since 2023-09-14T00:50:11","commit-serial":"2023091302 since 2023-09-14T07:04:05","wait":"27023 sec between attempts"}},{"zone":"catz.sunet.se","status":{"pattern":"example.catalog","catalog-member-id":"4b6f6ce2de5929e4.zones.example.catalog.","state":"ok","served-serial":"1705484863 since 2024-01-17T13:06:02","commit-serial":"1705484863 since 2024-01-17T13:06:02","wait":"21341 sec between attempts"}}]

7
tests/fixtures/generic/nsd_control-zonestatus.out vendored
View File

@ -3,3 +3,10 @@ zone: sunet.se
served-serial: "2023091302 since 2023-09-14T00:50:11"
commit-serial: "2023091302 since 2023-09-14T07:04:05"
wait: "27023 sec between attempts"
zone: catz.sunet.se
pattern: example.catalog
catalog-member-id: 4b6f6ce2de5929e4.zones.example.catalog.
state: ok
served-serial: "1705484863 since 2024-01-17T13:06:02"
commit-serial: "1705484863 since 2024-01-17T13:06:02"
wait: "21341 sec between attempts"