ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Add zone definitions into the view grammar

Browse Source 
I cannot see a reasonable way to achieve this without the hack in this
commit.
This commit is contained in:
Petr Špaček
2022-06-24 14:06:39 +02:00
parent 1f5bc4fe3b
commit 435cbb61ba
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/arm/_ext/iscconf.py
View File

@@ -133,14 +133,14 @@ def domain_factory(domainname, domainlabel, todolist, grammar):
return ".".join(path[1:]) return ".".join(path[1:])
def format_paths(self, paths): def format_paths(self, paths):
zone_types = [] zone_types = set()
nozone_paths = [] nozone_paths = []
for path in paths: for path in paths:
try: try:
zone_idx = path.index("zone") zone_idx = path.index("zone")
zone_type_txt = path[zone_idx + 1] zone_type_txt = path[zone_idx + 1]
assert zone_type_txt.startswith("type "), zone_type_txt assert zone_type_txt.startswith("type "), zone_type_txt
zone_types.append(zone_type_txt[len("type ") :]) zone_types.add(zone_type_txt[len("type ") :])
except (ValueError, IndexError): except (ValueError, IndexError):
nozone_paths.append(path) nozone_paths.append(path)
condensed_paths = nozone_paths[:] condensed_paths = nozone_paths[:]

4
doc/arm/_ext/mergegrammar.py
View File

@@ -46,6 +46,10 @@ def combine():
assert rest assert rest
rest.update(zones) rest.update(zones)
# this is a terrible hack
# but cfg_test cannot print zone grammars inside view
rest["view"]["_mapbody"].update(zones)
return rest return rest