Skip to content
Snippets Groups Projects
Commit d626ea75 authored by Erik Reid's avatar Erik Reid
Browse files

pep8

parent 8f1f783b
No related branches found
No related tags found
No related merge requests found
...@@ -54,6 +54,7 @@ async def load_router_interfaces(fqdn: str) -> InterfacesSummary: ...@@ -54,6 +54,7 @@ async def load_router_interfaces(fqdn: str) -> InterfacesSummary:
} }
} }
@router.post('/next-lag/{fqdn}') @router.post('/next-lag/{fqdn}')
async def reserve_next_lag(fqdn: str) -> NextLAG: async def reserve_next_lag(fqdn: str) -> NextLAG:
""" """
...@@ -86,7 +87,8 @@ async def reserve_next_lag(fqdn: str) -> NextLAG: ...@@ -86,7 +87,8 @@ async def reserve_next_lag(fqdn: str) -> NextLAG:
@router.post('/next-physical/{fqdn}/{lag_name}') @router.post('/next-physical/{fqdn}/{lag_name}')
async def reserve_physical_bundle_member(fqdn: str, lag_name: str) -> NextPhysicalInterface: async def reserve_physical_bundle_member(
fqdn: str, lag_name: str) -> NextPhysicalInterface:
""" """
compute the next available lag name for the given router compute the next available lag name for the given router
......
...@@ -12,7 +12,6 @@ from ncclient.manager import Manager, make_device_handler ...@@ -12,7 +12,6 @@ from ncclient.manager import Manager, make_device_handler
from ncclient.transport import SSHSession from ncclient.transport import SSHSession
from ncclient.xml_ import NCElement from ncclient.xml_ import NCElement
import httpx
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from resource_management.db import model from resource_management.db import model
...@@ -76,8 +75,6 @@ HOSTNAMES = [ ...@@ -76,8 +75,6 @@ HOSTNAMES = [
] ]
@pytest.fixture @pytest.fixture
def resources_db(): def resources_db():
...@@ -109,6 +106,7 @@ class _namespace(object): ...@@ -109,6 +106,7 @@ class _namespace(object):
def pytest_generate_tests(metafunc): def pytest_generate_tests(metafunc):
metafunc.parametrize("router_name", HOSTNAMES) metafunc.parametrize("router_name", HOSTNAMES)
@pytest.fixture @pytest.fixture
def config_data(router_name): def config_data(router_name):
return { return {
...@@ -196,7 +194,6 @@ def mocked_router(netconf_rpc_replies): ...@@ -196,7 +194,6 @@ def mocked_router(netconf_rpc_replies):
yield # wait here until parent context ends yield # wait here until parent context ends
@pytest.fixture @pytest.fixture
def client(config_file): def client(config_file):
app = resource_management.create_app() app = resource_management.create_app()
......
...@@ -16,7 +16,8 @@ def test_version_request(client): ...@@ -16,7 +16,8 @@ def test_version_request(client):
jsonschema.validate(rv.json(), Version.schema()) jsonschema.validate(rv.json(), Version.schema())
def test_update_router_interfaces(client, resources_db, mocked_router, router_name): def test_update_router_interfaces(
client, resources_db, mocked_router, router_name):
rv = client.post(f'/api/interfaces/import/{router_name}') rv = client.post(f'/api/interfaces/import/{router_name}')
assert rv.status_code == 200 assert rv.status_code == 200
jsonschema.validate(rv.json(), interfaces.InterfacesSummary.schema()) jsonschema.validate(rv.json(), interfaces.InterfacesSummary.schema())
......
...@@ -7,6 +7,7 @@ from resource_management import router_interfaces, juniper ...@@ -7,6 +7,7 @@ from resource_management import router_interfaces, juniper
from resource_management import db from resource_management import db
from resource_management.db import model from resource_management.db import model
def _remove_ns(xml): def _remove_ns(xml):
# cf. https://stackoverflow.com/a/51972010 # cf. https://stackoverflow.com/a/51972010
doc = etree.fromstring(xml) doc = etree.fromstring(xml)
...@@ -76,7 +77,8 @@ def test_no_db_load_interfaces(mocked_router): ...@@ -76,7 +77,8 @@ def test_no_db_load_interfaces(mocked_router):
assert aggregates assert aggregates
def test_load_interfaces(mocked_router, resources_db, config_file, router_name): def test_load_interfaces(
mocked_router, resources_db, config_file, router_name):
""" """
new design for this app: no chassis info for now new design for this app: no chassis info for now
""" """
...@@ -88,5 +90,5 @@ def test_load_interfaces(mocked_router, resources_db, config_file, router_name): ...@@ -88,5 +90,5 @@ def test_load_interfaces(mocked_router, resources_db, config_file, router_name):
assert router assert router
assert router.physical assert router.physical
assert router.lags assert router.lags
assert all(l.physical for l in router.lags) assert all(_l.physical for _l in router.lags)
assert any(p.logical for p in router.physical) assert any(_p.logical for _p in router.physical)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment