diff --git a/resource_management/routes/interfaces.py b/resource_management/routes/interfaces.py index ca15f20d7de0cd47e7f560ce4d632057a477d6ae..8a480c3b49c2d63a5bd8b618281d4efde9999492 100644 --- a/resource_management/routes/interfaces.py +++ b/resource_management/routes/interfaces.py @@ -54,6 +54,7 @@ async def load_router_interfaces(fqdn: str) -> InterfacesSummary: } } + @router.post('/next-lag/{fqdn}') 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}') -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 diff --git a/test/conftest.py b/test/conftest.py index 5090be14184b7080fbea743b8f7edbf5a605d338..07d1714ac144a4298437e6d46860ab3e8117af0f 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -12,7 +12,6 @@ from ncclient.manager import Manager, make_device_handler from ncclient.transport import SSHSession from ncclient.xml_ import NCElement -import httpx from fastapi.testclient import TestClient from resource_management.db import model @@ -76,8 +75,6 @@ HOSTNAMES = [ ] - - @pytest.fixture def resources_db(): @@ -109,6 +106,7 @@ class _namespace(object): def pytest_generate_tests(metafunc): metafunc.parametrize("router_name", HOSTNAMES) + @pytest.fixture def config_data(router_name): return { @@ -196,7 +194,6 @@ def mocked_router(netconf_rpc_replies): yield # wait here until parent context ends - @pytest.fixture def client(config_file): app = resource_management.create_app() diff --git a/test/test_interfaces_routes.py b/test/test_interfaces_routes.py index 4b5ece456010c0c419c3c040815323f6d03cb2af..6ffc443aae121e94605d38562f41f650d7fc8a76 100644 --- a/test/test_interfaces_routes.py +++ b/test/test_interfaces_routes.py @@ -16,7 +16,8 @@ def test_version_request(client): 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}') assert rv.status_code == 200 jsonschema.validate(rv.json(), interfaces.InterfacesSummary.schema()) diff --git a/test/test_parse_router.py b/test/test_parse_router.py index 3aac49487eaab71f036efa7d264c327a910c5aa0..e6723d5f454de67d3a1b29c8d25266b17725ae41 100644 --- a/test/test_parse_router.py +++ b/test/test_parse_router.py @@ -7,6 +7,7 @@ from resource_management import router_interfaces, juniper from resource_management import db from resource_management.db import model + def _remove_ns(xml): # cf. https://stackoverflow.com/a/51972010 doc = etree.fromstring(xml) @@ -76,7 +77,8 @@ def test_no_db_load_interfaces(mocked_router): 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 """ @@ -88,5 +90,5 @@ def test_load_interfaces(mocked_router, resources_db, config_file, router_name): assert router assert router.physical assert router.lags - assert all(l.physical for l in router.lags) - assert any(p.logical for p in router.physical) + assert all(_l.physical for _l in router.lags) + assert any(_p.logical for _p in router.physical)