Compare commits
No commits in common. "c692ff18d3885366a5b9be2f42b29184f2ac93a3" and "de1e67c6be5063c6dbed6483f232baf9420dcfa7" have entirely different histories.
c692ff18d3
...
de1e67c6be
7 changed files with 124 additions and 212 deletions
|
@ -1,16 +0,0 @@
|
|||
name: build and publish
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- "v*.*.*"
|
||||
|
||||
pull_request:
|
||||
branches: [main, master]
|
||||
|
||||
jobs:
|
||||
build-pypackage:
|
||||
uses: actions/workflows/.gitea/workflows/build_pypackage.yml@master
|
||||
secrets:
|
||||
username: __token__
|
||||
token: ${{ secrets.PACKAGE_TOKEN }}
|
|
@ -1,10 +0,0 @@
|
|||
name: update changelog
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- "v*.*.*"
|
||||
|
||||
jobs:
|
||||
update-changelog:
|
||||
uses: actions/workflows/.gitea/workflows/update_changelog.yml@master
|
|
@ -1,4 +1,4 @@
|
|||
name: check code
|
||||
name: check/lint python code with hatch
|
||||
|
||||
on:
|
||||
push:
|
||||
|
@ -8,7 +8,17 @@ on:
|
|||
branches: [main, master]
|
||||
|
||||
jobs:
|
||||
check-code:
|
||||
uses: actions/workflows/.gitea/workflows/check_python_hatch.yml@master
|
||||
with:
|
||||
run-tests: false
|
||||
check-python-hatch:
|
||||
runs-on: python311
|
||||
steps:
|
||||
- name: checkout code
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: install hatch
|
||||
run: pip install -U hatch
|
||||
|
||||
- name: test codestyle
|
||||
run: hatch run lint:style
|
||||
|
||||
- name: test typing
|
||||
run: hatch run lint:typing
|
||||
|
|
|
@ -31,12 +31,6 @@ providers:
|
|||
|
||||
## install
|
||||
|
||||
### via pip
|
||||
|
||||
```bash
|
||||
pip install octodns-netbox-dns
|
||||
```
|
||||
|
||||
### via pip + git
|
||||
|
||||
```bash
|
||||
|
|
|
@ -3,7 +3,7 @@ requires = ["hatchling>=1.18", "hatch-regex-commit>=0.0.3"]
|
|||
build-backend = "hatchling.build"
|
||||
|
||||
[project]
|
||||
name = "octodns-netbox-dns"
|
||||
name = "octodns_netbox_dns"
|
||||
description = "octodns netbox-dns provider"
|
||||
readme = "README.md"
|
||||
license = "MIT"
|
||||
|
|
|
@ -1 +1 @@
|
|||
__version__ = "0.3.0"
|
||||
__version__ = "0.2.1"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import logging
|
||||
from typing import Any, Literal
|
||||
from typing import Literal
|
||||
|
||||
import dns.rdata
|
||||
import octodns.record
|
||||
|
@ -16,7 +16,7 @@ class NetBoxDNSSource(octodns.source.base.BaseSource):
|
|||
|
||||
SUPPORTS_GEO = False
|
||||
SUPPORTS_DYNAMIC = False
|
||||
SUPPORTS: set[str] = { # noqa
|
||||
SUPPORTS: set[str] = {
|
||||
"A",
|
||||
"AAAA",
|
||||
"AFSDB",
|
||||
|
@ -49,7 +49,7 @@ class NetBoxDNSSource(octodns.source.base.BaseSource):
|
|||
|
||||
def __init__(
|
||||
self,
|
||||
id: int, # noqa
|
||||
id: int,
|
||||
url: str,
|
||||
token: str,
|
||||
view: str | None | Literal[False] = False,
|
||||
|
@ -63,49 +63,29 @@ class NetBoxDNSSource(octodns.source.base.BaseSource):
|
|||
self.log = logging.getLogger(f"NetboxDNSSource[{id}]")
|
||||
self.log.debug(f"__init__: {id=}, {url=}, {view=}, {replace_duplicates=}, {make_absolute=}")
|
||||
super().__init__(id)
|
||||
|
||||
self.api = pynetbox.core.api.Api(url, token)
|
||||
self.nb_view = self._get_nb_view(view)
|
||||
self.ttl = ttl
|
||||
self._api = pynetbox.core.api.Api(url, token)
|
||||
self._nb_view = self._get_view(view)
|
||||
self._ttl = ttl
|
||||
self.replace_duplicates = replace_duplicates
|
||||
self.make_absolute = make_absolute
|
||||
|
||||
def _make_absolute(self, value: str) -> str:
|
||||
"""
|
||||
Return dns name with trailing dot to make it absolute
|
||||
|
||||
@param value: dns record value
|
||||
|
||||
@return: absolute dns record value
|
||||
"""
|
||||
if not self.make_absolute or value.endswith("."):
|
||||
if not self.make_absolute or value[-1] == ".":
|
||||
return value
|
||||
return value + "."
|
||||
|
||||
absolute_value = value + "."
|
||||
self.log.debug(f"relative={value}, absolute={absolute_value}")
|
||||
|
||||
return absolute_value
|
||||
|
||||
def _get_nb_view(self, view: str | None | Literal[False]) -> dict[str, int | str]:
|
||||
"""
|
||||
Get the correct netbox view when requested
|
||||
|
||||
@param view: `False` for no view, `None` for zones without a view, else the view name
|
||||
|
||||
@return: the netbox view id in the netbox query format
|
||||
"""
|
||||
def _get_view(self, view: str | None | Literal[False]) -> dict[str, int | str]:
|
||||
if view is False:
|
||||
return {}
|
||||
if view is None:
|
||||
return {"view": "null"}
|
||||
|
||||
nb_view: pynetbox.core.response.Record = self.api.plugins.netbox_dns.views.get(name=view)
|
||||
nb_view: pynetbox.core.response.Record = self._api.plugins.netbox_dns.views.get(name=view)
|
||||
if nb_view is None:
|
||||
msg = f"dns view={view}, has not been found"
|
||||
msg = f"dns view: '{view}' has not been found"
|
||||
self.log.error(msg)
|
||||
raise ValueError(msg)
|
||||
|
||||
self.log.debug(f"found view={nb_view.name}, id={nb_view.id}")
|
||||
self.log.debug(f"found {nb_view.name} {nb_view.id}")
|
||||
|
||||
return {"view_id": nb_view.id}
|
||||
|
||||
|
@ -113,174 +93,128 @@ class NetBoxDNSSource(octodns.source.base.BaseSource):
|
|||
"""
|
||||
Given a zone name and a view name, look it up in NetBox.
|
||||
|
||||
@param name: name of the dns zone
|
||||
@param view: the netbox view id in the api query format
|
||||
|
||||
@raise pynetbox.RequestError: if declared view is not existent
|
||||
|
||||
@return: the netbox dns zone object
|
||||
"""
|
||||
query_params = {"name": name[:-1], **view}
|
||||
nb_zone = self.api.plugins.netbox_dns.zones.get(**query_params)
|
||||
|
||||
self.log.debug(f"found zone={nb_zone.name}, id={nb_zone.id}")
|
||||
nb_zone = self._api.plugins.netbox_dns.zones.get(**query_params)
|
||||
|
||||
return nb_zone
|
||||
|
||||
def _format_rdata(self, rdata: dns.Rdata, raw_value: str) -> dict[str, Any]:
|
||||
def populate(self, zone: octodns.zone.Zone, target: bool = False, lenient: bool = False):
|
||||
"""
|
||||
Format netbox record values to correct octodns record values
|
||||
|
||||
@param rdata: rrdata record value
|
||||
@param raw_value: raw record value
|
||||
|
||||
@return: formatted rrdata value
|
||||
Get all the records of a zone from NetBox and add them to the OctoDNS zone.
|
||||
"""
|
||||
match rdata.rdtype.name:
|
||||
case "A" | "AAAA":
|
||||
value = rdata.address
|
||||
self.log.debug(f"populate: name={zone.name}, target={target}, lenient={lenient}")
|
||||
|
||||
case "CNAME":
|
||||
value = self._make_absolute(rdata.target.to_text())
|
||||
records = {}
|
||||
|
||||
case "DNAME" | "NS" | "PTR":
|
||||
value = rdata.target.to_text()
|
||||
|
||||
case "CAA":
|
||||
value = {
|
||||
"flags": rdata.flags,
|
||||
"tag": rdata.tag,
|
||||
"value": rdata.value,
|
||||
}
|
||||
|
||||
case "LOC":
|
||||
value = {
|
||||
"lat_direction": "N" if rdata.latitude[4] >= 0 else "S",
|
||||
"lat_degrees": rdata.latitude[0],
|
||||
"lat_minutes": rdata.latitude[1],
|
||||
"lat_seconds": rdata.latitude[2] + rdata.latitude[3] / 1000,
|
||||
"long_direction": "W" if rdata.latitude[4] >= 0 else "E",
|
||||
"long_degrees": rdata.longitude[0],
|
||||
"long_minutes": rdata.longitude[1],
|
||||
"long_seconds": rdata.longitude[2] + rdata.longitude[3] / 1000,
|
||||
"altitude": rdata.altitude / 100,
|
||||
"size": rdata.size / 100,
|
||||
"precision_horz": rdata.horizontal_precision / 100,
|
||||
"precision_vert": rdata.veritical_precision / 100,
|
||||
}
|
||||
|
||||
case "MX":
|
||||
value = {
|
||||
"preference": rdata.preference,
|
||||
"exchange": self._make_absolute(rdata.exchange.to_text()),
|
||||
}
|
||||
|
||||
case "NAPTR":
|
||||
value = {
|
||||
"order": rdata.order,
|
||||
"preference": rdata.preference,
|
||||
"flags": rdata.flags,
|
||||
"service": rdata.service,
|
||||
"regexp": rdata.regexp,
|
||||
"replacement": rdata.replacement.to_text(),
|
||||
}
|
||||
|
||||
case "SSHFP":
|
||||
value = {
|
||||
"algorithm": rdata.algorithm,
|
||||
"fingerprint_type": rdata.fp_type,
|
||||
"fingerprint": rdata.fingerprint,
|
||||
}
|
||||
|
||||
case "SPF" | "TXT":
|
||||
value = raw_value.replace(";", r"\;")
|
||||
|
||||
case "SRV":
|
||||
value = {
|
||||
"priority": rdata.priority,
|
||||
"weight": rdata.weight,
|
||||
"port": rdata.port,
|
||||
"target": self._make_absolute(rdata.target.to_text()),
|
||||
}
|
||||
|
||||
case "SOA":
|
||||
self.log.warning("SOA record type not implemented")
|
||||
raise NotImplementedError
|
||||
|
||||
case _:
|
||||
self.log.error("invalid record type")
|
||||
raise ValueError
|
||||
|
||||
self.log.debug(f"formatted record value={value}")
|
||||
|
||||
return value
|
||||
|
||||
def _format_nb_records(self, zone: octodns.zone.Zone) -> list[dict[str, Any]]:
|
||||
"""
|
||||
Format netbox dns records to the octodns format
|
||||
|
||||
@param zone: octodns zone
|
||||
|
||||
@return: a list of octodns compatible record dicts
|
||||
"""
|
||||
records: dict[tuple[str, str], dict[str, Any]] = {}
|
||||
|
||||
nb_zone = self._get_nb_zone(zone.name, view=self.nb_view)
|
||||
nb_zone = self._get_nb_zone(zone.name, view=self._nb_view)
|
||||
if not nb_zone:
|
||||
self.log.error(f"zone={zone.name}, not found in view={self.nb_view}")
|
||||
self.log.error(f"Zone '{zone.name[:-1]}' not found in view: '{self._nb_view}'")
|
||||
raise LookupError
|
||||
|
||||
nb_records: pynetbox.core.response.RecordSet = self.api.plugins.netbox_dns.records.filter(
|
||||
zone_id=nb_zone.id
|
||||
)
|
||||
nb_records = self._api.plugins.netbox_dns.records.filter(zone_id=nb_zone.id)
|
||||
for nb_record in nb_records:
|
||||
nb_record: pynetbox.core.response.Record
|
||||
self.log.debug(f"{nb_record.name!r} {nb_record.type!r} {nb_record.value!r}")
|
||||
|
||||
rcd_name: str = nb_record.name if nb_record.name != "@" else ""
|
||||
raw_value: str = nb_record.value if nb_record.value != "@" else nb_record.zone.name
|
||||
rcd_type: str = nb_record.type
|
||||
rcd_ttl: int = nb_record.ttl or nb_zone.default_ttl
|
||||
if nb_record.type == "NS":
|
||||
rcd_ttl = nb_zone.soa_refresh
|
||||
rcd_value: str = nb_record.value if nb_record.value != "@" else nb_record.zone.name
|
||||
|
||||
rcd_data = {
|
||||
if nb_record.ttl:
|
||||
nb_ttl = nb_record.ttl
|
||||
elif nb_record.type == "NS":
|
||||
nb_ttl = nb_zone.soa_refresh
|
||||
else:
|
||||
nb_ttl = nb_zone.default_ttl
|
||||
|
||||
data = {
|
||||
"name": rcd_name,
|
||||
"type": rcd_type,
|
||||
"ttl": rcd_ttl,
|
||||
"type": nb_record.type,
|
||||
"ttl": nb_ttl,
|
||||
"values": [],
|
||||
}
|
||||
rdata = dns.rdata.from_text("IN", nb_record.type, rcd_value)
|
||||
match rdata.rdtype.name:
|
||||
case "A" | "AAAA":
|
||||
value = rdata.address
|
||||
|
||||
self.log.debug(f"record data={rcd_data}")
|
||||
case "CNAME":
|
||||
value = self._make_absolute(rdata.target.to_text())
|
||||
|
||||
rdata = dns.rdata.from_text("IN", nb_record.type, raw_value)
|
||||
try:
|
||||
rcd_value = self._format_rdata(rdata, raw_value)
|
||||
except NotImplementedError:
|
||||
continue
|
||||
except Exception as exc:
|
||||
raise exc
|
||||
case "DNAME" | "NS" | "PTR":
|
||||
value = rdata.target.to_text()
|
||||
|
||||
if (rcd_name, rcd_type) not in records:
|
||||
records[(rcd_name, rcd_type)] = rcd_data
|
||||
case "CAA":
|
||||
value = {
|
||||
"flags": rdata.flags,
|
||||
"tag": rdata.tag,
|
||||
"value": rdata.value,
|
||||
}
|
||||
|
||||
records[(rcd_name, rcd_type)]["values"].append(rcd_value)
|
||||
case "LOC":
|
||||
value = {
|
||||
"lat_direction": "N" if rdata.latitude[4] >= 0 else "S",
|
||||
"lat_degrees": rdata.latitude[0],
|
||||
"lat_minutes": rdata.latitude[1],
|
||||
"lat_seconds": rdata.latitude[2] + rdata.latitude[3] / 1000,
|
||||
"long_direction": "W" if rdata.latitude[4] >= 0 else "E",
|
||||
"long_degrees": rdata.longitude[0],
|
||||
"long_minutes": rdata.longitude[1],
|
||||
"long_seconds": rdata.longitude[2] + rdata.longitude[3] / 1000,
|
||||
"altitude": rdata.altitude / 100,
|
||||
"size": rdata.size / 100,
|
||||
"precision_horz": rdata.horizontal_precision / 100,
|
||||
"precision_vert": rdata.veritical_precision / 100,
|
||||
}
|
||||
|
||||
return list(records.values())
|
||||
case "MX":
|
||||
value = {
|
||||
"preference": rdata.preference,
|
||||
"exchange": self._make_absolute(rdata.exchange.to_text()),
|
||||
}
|
||||
|
||||
def populate(
|
||||
self, zone: octodns.zone.Zone, target: bool = False, lenient: bool = False
|
||||
) -> None:
|
||||
"""
|
||||
Get all the records of a zone from NetBox and add them to the OctoDNS zone
|
||||
case "NAPTR":
|
||||
value = {
|
||||
"order": rdata.order,
|
||||
"preference": rdata.preference,
|
||||
"flags": rdata.flags,
|
||||
"service": rdata.service,
|
||||
"regexp": rdata.regexp,
|
||||
"replacement": rdata.replacement.to_text(),
|
||||
}
|
||||
|
||||
@param zone: octodns zone
|
||||
@param target: when `True`, load the current state of the provider.
|
||||
@param lenient: when `True`, skip record validation and do a "best effort" load of data.
|
||||
"""
|
||||
self.log.info(f"populate -> name={zone.name}, target={target}, lenient={lenient}")
|
||||
case "SSHFP":
|
||||
value = {
|
||||
"algorithm": rdata.algorithm,
|
||||
"fingerprint_type": rdata.fp_type,
|
||||
"fingerprint": rdata.fingerprint,
|
||||
}
|
||||
|
||||
records = self._format_nb_records(zone)
|
||||
for data in records:
|
||||
case "SOA":
|
||||
self.log.debug("SOA")
|
||||
continue
|
||||
|
||||
case "SPF" | "TXT":
|
||||
value = rcd_value.replace(";", r"\;")
|
||||
|
||||
case "SRV":
|
||||
value = {
|
||||
"priority": rdata.priority,
|
||||
"weight": rdata.weight,
|
||||
"port": rdata.port,
|
||||
"target": self._make_absolute(rdata.target.to_text()),
|
||||
}
|
||||
|
||||
case _:
|
||||
raise ValueError
|
||||
|
||||
if (rcd_name, nb_record.type) not in records:
|
||||
records[(rcd_name, nb_record.type)] = data
|
||||
records[(rcd_name, nb_record.type)]["values"].append(value)
|
||||
|
||||
for data in records.values():
|
||||
if len(data["values"]) == 1:
|
||||
data["value"] = data.pop("values")[0]
|
||||
record = octodns.record.Record.new(
|
||||
zone=zone,
|
||||
name=data["name"],
|
||||
|
@ -290,4 +224,4 @@ class NetBoxDNSSource(octodns.source.base.BaseSource):
|
|||
)
|
||||
zone.add_record(record, lenient=lenient, replace=self.replace_duplicates)
|
||||
|
||||
self.log.info(f"populate -> found {len(zone.records)} records for zone {zone.name}")
|
||||
self.log.info(f"populate: found {len(zone.records)} records for zone {zone.name}")
|
||||
|
|
Loading…
Reference in a new issue