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

nsd-control parser update, zone transfer status (#607)

Browse Source 
* add more parsing functionality for transfering state

* add additional/conditional fields into the schema

---------

Co-authored-by: Kelly Brazil <kellyjonbrazil@gmail.com>
This commit is contained in:
pettai
2024-11-19 21:12:43 +01:00
committed by GitHub
parent 2278c7ecab
commit a8b231da81
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
jc/parsers/nsd_control.py
View File

@ -28,9 +28,13 @@ Schema:
"zone": string
"status": {
"state": string,
"pattern": string, # Additional
"catalog-member-id": string, # Additional
"served-serial": string,
"commit-serial": string,
"wait": string
"notified-serial": string, # Conditional
"wait": string,
"transfer": string # Conditional
}
}
]
@ -89,7 +93,7 @@ def _process(proc_data):
List of Dictionaries. Structured to conform to the schema.
"""
int_list = {'verbosity', 'ratelimit', 'wait'}
int_list = {'verbosity', 'ratelimit', 'wait', 'transfer'}
for entry in proc_data:
for key in entry:
@ -229,6 +233,20 @@ def parse(data: str, raw: bool = False, quiet: bool = False):
raw_output.append(zonename)
continue
if line.startswith('notified-serial:'):
linedata = line.split(': ', maxsplit=1)
notified = linedata[1].strip('"').rstrip('"')
zstatus.update({'notified-serial': notified})
continue
if line.startswith('transfer:'):
linedata = line.split(': ', maxsplit=1)
transfer = linedata[1].strip('"').rstrip('"')
zstatus.update({'transfer': transfer})
zonename.update({'status': zstatus})
raw_output.append(zonename)
continue
# stats
if line.startswith('server') or line.startswith('num.') or line.startswith('size.') or line.startswith('time.') or line.startswith('zone.'):
itrparse = True

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":"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"}}]
[{"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.dev","status":{"state":"refreshing","served-serial":"2023095893 since 2024-10-10T10:10:35","commit-serial":"2023095893 since 2024-10-18T10:00:45","notified-serial":"2023095880 since 2024-10-19T06:11:35","transfer":"TCP connected to 192.168.1.100"}},{"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"}}]

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

@ -3,6 +3,12 @@ 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: sunet.dev
state: refreshing
served-serial: "2023095893 since 2024-10-10T10:10:35"
commit-serial: "2023095893 since 2024-10-18T10:00:45"
notified-serial: "2023095880 since 2024-10-19T06:11:35"
transfer: "TCP connected to 192.168.1.100"
zone: catz.sunet.se
pattern: example.catalog
catalog-member-id: 4b6f6ce2de5929e4.zones.example.catalog.