Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nsd-control parser update, zone transfer status #607

Merged
merged 6 commits into from
Nov 19, 2024
Merged

nsd-control parser update, zone transfer status #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
abda873
Merge pull request #551 from kellyjonbrazil/dev
kellyjonbrazil Mar 23, 2024
5f8c65c
Merge branch 'dev'
kellyjonbrazil Jun 10, 2024
508437a
add more parsing functionality for transfering state
pettai Oct 19, 2024
8f28d3e
Merge branch 'dev' into nsd_update
kellyjonbrazil Oct 20, 2024
0c8d79f
add additional/conditional fields into the schema
pettai Oct 21, 2024
93bd184
Merge branch 'dev' into nsd_update
kellyjonbrazil Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions jc/parsers/nsd_control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,13 @@
"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
}
}
]
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/generic/nsd_control-zonestatus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 6 additions & 0 deletions tests/fixtures/generic/nsd_control-zonestatus.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading