style: ruff format and the lint rules of the driver standard
Mechanical: ruff format, and ruff check --fix with the rule set every NAPALM driver uses (E, F, I, UP, B at line length 100, Python 3.10). What ruff cannot fix comes in the next commit.
This commit is contained in:
1 parent
692a584fd2
commit
571d9abb5f
15 files changed
+690
-419
No files matched your search
@@ -18,7 +18,9 @@ from napalm_opnsense.opnsense import OPNsenseDriver
|
||||
@pytest.fixture
|
||||
def driver():
|
||||
with patch("napalm_opnsense.opnsense.requests.Session"):
|
||||
drv = OPNsenseDriver(hostname="fw", username="k", password="s", optional_args={"verify": False})
|
||||
drv = OPNsenseDriver(
|
||||
hostname="fw", username="k", password="s", optional_args={"verify": False}
|
||||
)
|
||||
drv.session = MagicMock()
|
||||
yield drv
|
||||
|
||||
@@ -26,7 +28,13 @@ def driver():
|
||||
class TestUpdateProgress:
|
||||
@pytest.mark.parametrize(
|
||||
"status, state",
|
||||
[("running", "running"), ("done", "done"), ("error", "failed"), ("", "idle"), (None, "idle")],
|
||||
[
|
||||
("running", "running"),
|
||||
("done", "done"),
|
||||
("error", "failed"),
|
||||
("", "idle"),
|
||||
(None, "idle"),
|
||||
],
|
||||
)
|
||||
def test_the_upgrade_status_as_a_state(self, driver, status, state):
|
||||
st = {"status": status, "log": "***GOT REQUEST TO UPGRADE***\nfetching\n"}
|
||||
@@ -54,8 +62,22 @@ class TestUpdateProgress:
|
||||
|
||||
|
||||
ROWS = [
|
||||
{"uuid": "u1", "enabled": "1", "type": "forward", "domain": "lab.example", "server": "10.0.0.53", "port": "53"},
|
||||
{"uuid": "u2", "enabled": "0", "type": "forward", "domain": "old.example", "server": "10.0.0.9", "port": ""},
|
||||
{
|
||||
"uuid": "u1",
|
||||
"enabled": "1",
|
||||
"type": "forward",
|
||||
"domain": "lab.example",
|
||||
"server": "10.0.0.53",
|
||||
"port": "53",
|
||||
},
|
||||
{
|
||||
"uuid": "u2",
|
||||
"enabled": "0",
|
||||
"type": "forward",
|
||||
"domain": "old.example",
|
||||
"server": "10.0.0.9",
|
||||
"port": "",
|
||||
},
|
||||
{"uuid": "u3", "enabled": "1", "type": "dot", "domain": "", "server": "9.9.9.9", "port": "853"},
|
||||
]
|
||||
|
||||
@@ -86,9 +108,18 @@ class TestDnsForwards:
|
||||
driver.set_dns_forward("new.example.", "10.0.0.53")
|
||||
|
||||
paths = [p for p, _ in calls]
|
||||
assert paths[-2:] == ["/api/unbound/settings/addForward", "/api/unbound/service/reconfigure"]
|
||||
assert paths[-2:] == [
|
||||
"/api/unbound/settings/addForward",
|
||||
"/api/unbound/service/reconfigure",
|
||||
]
|
||||
added = calls[-2][1]["dot"]
|
||||
assert added == {"enabled": "1", "type": "forward", "domain": "new.example", "server": "10.0.0.53", "port": "53"}
|
||||
assert added == {
|
||||
"enabled": "1",
|
||||
"type": "forward",
|
||||
"domain": "new.example",
|
||||
"server": "10.0.0.53",
|
||||
"port": "53",
|
||||
}
|
||||
|
||||
def test_a_known_domain_is_changed_not_doubled(self, driver):
|
||||
calls = []
|
||||
@@ -105,7 +136,10 @@ class TestDnsForwards:
|
||||
return {"rows": []}
|
||||
return {"result": "failed", "validations": {"dot.server": "invalid"}}
|
||||
|
||||
with patch.object(driver, "_post", side_effect=post), pytest.raises(RuntimeError, match="invalid"):
|
||||
with (
|
||||
patch.object(driver, "_post", side_effect=post),
|
||||
pytest.raises(RuntimeError, match="invalid"),
|
||||
):
|
||||
driver.set_dns_forward("x.example", "not-an-ip")
|
||||
|
||||
def test_removing_deletes_every_forward_of_the_domain(self, driver):
|
||||
@@ -114,7 +148,10 @@ class TestDnsForwards:
|
||||
driver.remove_dns_forward("lab.example.")
|
||||
|
||||
paths = [p for p, _ in calls]
|
||||
assert paths[-2:] == ["/api/unbound/settings/delForward/u1", "/api/unbound/service/reconfigure"]
|
||||
assert paths[-2:] == [
|
||||
"/api/unbound/settings/delForward/u1",
|
||||
"/api/unbound/service/reconfigure",
|
||||
]
|
||||
|
||||
def test_removing_an_unknown_domain_changes_nothing(self, driver):
|
||||
calls = []
|
||||
|
||||
Reference in new issue
Block a user