diff --git a/inventory_provider/routes/msr.py b/inventory_provider/routes/msr.py index d1f24c342021bfa3ba31d5c0e7fb0d9ceb55857e..f4c03200dd4e7ec4786a0f6663f657fd5a4f826b 100644 --- a/inventory_provider/routes/msr.py +++ b/inventory_provider/routes/msr.py @@ -157,7 +157,6 @@ def _handle_peering_group_request(name, cache_key, group_key_base): if value: yield from json.loads(value.decode('utf-8')) - if name: cache_key = f'{cache_key}:{name}' @@ -196,7 +195,7 @@ def logical_system_peerings(name=None): logical system if no parameter is given. :return: see :meth:`inventory_provider.routes.msr._handle_peering_group_request` - """ + """ # noqa: E501 return _handle_peering_group_request( name=name, cache_key='classifier-cache:msr:logical-system-peerings', @@ -215,7 +214,7 @@ def bgp_group_peerings(name=None): logical system if no parameter is given. :return: see :meth:`inventory_provider.routes.msr._handle_peering_group_request` - """ + """ # noqa: E501 return _handle_peering_group_request( name=name, cache_key='classifier-cache:msr:group-peerings', @@ -276,7 +275,7 @@ def get_logical_systems(): information is available. :return: see :meth:`inventory_provider.routes.msr._handle_peering_group_list_request` - """ + """ # noqa: E501 return _handle_peering_group_list_request( cache_key='classifier-cache:msr:logical-systems', group_key_base='juniper-peerings:logical-system') @@ -292,7 +291,7 @@ def get_peering_groups(): information is available. :return: see :meth:`inventory_provider.routes.msr._handle_peering_group_list_request` - """ + """ # noqa: E501 return _handle_peering_group_list_request( cache_key='classifier-cache:msr:peering-groups', group_key_base='juniper-peerings:group') diff --git a/test/test_msr_routes.py b/test/test_msr_routes.py index 1a4ce29206c14d8090b2f6703a68b9e5ae1e558a..173cf1528a35ee8d051b17e1f6f6a7883d9a7e34 100644 --- a/test/test_msr_routes.py +++ b/test/test_msr_routes.py @@ -67,7 +67,7 @@ def test_logical_system_peerings_404(client, name): def test_group_peerings_all(client): rv = client.get( - f'/msr/bgp/group-peerings', + '/msr/bgp/group-peerings', headers=DEFAULT_REQUEST_HEADERS) assert rv.status_code == 200 assert rv.is_json @@ -92,7 +92,7 @@ def test_group_peerings_specific(client, name): @pytest.mark.parametrize('name', ['EGEANT', 'eGEANT mcast']) -def test_logical_system_peerings_404(client, name): +def test_group_peerings_404(client, name): rv = client.get( f'/msr/bgp/logical-system-peerings/{name}', headers=DEFAULT_REQUEST_HEADERS)