removed unused test data

mapping_provider/api/map.py

@@ -76,44 +76,6 @@ INPROV_EQUIPMENT_LIST_SCHEMA = {
     'items': {'$ref': '#/definitions/router'}
 }
 
-# INPROV_SERVICE_LIST_SCHEMA = {
-#     '$schema': 'https://json-schema.org/draft/2020-12/schema',
-
-#     'definitions': {
-#         'endpoint': {
-#             'type': 'object',
-#             'properties': {
-#                 'hostname': {'type': 'string'},
-#                 'interface': {'type': 'string'},
-#             },
-#         },
-#         'service': {
-#             'type': 'object',
-#             'properties': {
-#                 'sid': {'type': 'string'},
-#                 'name': {'type': 'string'},
-#                 'type': {'type': 'string'},
-#                 'endpoints': {
-#                     'type': 'array',
-#                     'items': {'$ref': '#/definitions/endpoint'},
-#                     'minItems': 1,
-#                 },
-#                 'overlays': {
-#                     'type': 'object', 'properties': {
-#                         'speed': {'type': 'number'},
-#                     },
-#                     'required': ['speed'],
-#                 },
-#             },
-#             'required': ['sid', 'name', 'type', 'endpoints', 'overlays'],
-#         },
-#     },
-
-#     'type': 'array',
-#     'items': {'$ref': '#/definitions/service'}
-# }
-
-INPROV_API_URL_TODO = 'https://test-inprov01.geant.org'
 
 @router.get("/pops")
 def get_pops() -> PopList:

mapping_provider/backends/inventory.py

@@ -11,9 +11,7 @@ from . import cache
 
 logger = logging.getLogger(__name__)
 
-# INPROV_POLLER_INTERFACES_CACHE_FILENAME = 'inprov-poller-interfaces.json'
 REPORTING_SCID_CURRENT_CACHE_FILENAME = 'reporting-scid-current.json'
-# INPROV_MAP_SERVICES_CACHE_FILENAME = 'inprov-map-services.json'
 INPROV_EQUIPMENT_CACHE_FILENAME = 'inprov-equipment.json'
 
 
@@ -141,11 +139,6 @@ def _load_all_inventory(inventory_base_uri: str, reporting_base_uri: str) -> dic
 
     with concurrent.futures.ThreadPoolExecutor(max_workers=1) as executor:
         futures = [
-            # executor.submit(
-            #     _load_and_cache_json,
-            #     key='poller-interfaces',
-            #     url=f'{inventory_base_uri}/poller/interfaces',
-            #     cache_filename=INPROV_POLLER_INTERFACES_CACHE_FILENAME),
             executor.submit(
                 _load_and_cache_json,
                 key='map-services',

mapping_provider/backends/services.py

@@ -70,11 +70,8 @@ def _services(service_type: str | None = None) -> Generator[Service]:
 
     only return operational services that match the service type, if provided
     """
-    # TOOD: maybe remove loading of inventory/poller/interfaces & /map/services
     try:
-        # inprov_map_services = cache.get(inventory.INPROV_MAP_SERVICES_CACHE_FILENAME)
         scid_current = cache.get(inventory.REPORTING_SCID_CURRENT_CACHE_FILENAME)
-        # poller_interfaces = cache.get(inventory.INPROV_POLLER_INTERFACES_CACHE_FILENAME)
         correlator_state = cache.get(correlator.CACHED_CORRELATOR_STATE_FILENAME)
         brian_rates = cache.get(brian.CACHED_BRIAN_SCID_RATES_FILENAME)
         equipment_list = cache.get(inventory.INPROV_EQUIPMENT_CACHE_FILENAME)

test/conftest.py

@@ -58,10 +58,8 @@ def client(dummy_config_filename):
 
         # there's no rmq in the test config data, so cache won't be initialized
         cache.init(tmp_dir)
-        # cache.set(inventory.INPROV_MAP_SERVICES_CACHE_FILENAME, load_test_data('inprov-services.json'))
         cache.set(inventory.REPORTING_SCID_CURRENT_CACHE_FILENAME, load_test_data('scid-current.json'))
         cache.set(inventory.INPROV_EQUIPMENT_CACHE_FILENAME, load_test_data('inprov-equipment.json'))
-        # cache.set(inventory.INPROV_POLLER_INTERFACES_CACHE_FILENAME, load_test_data('poller-interfaces.json'))
         cache.set(correlator.CACHED_CORRELATOR_STATE_FILENAME, load_test_data('correlator-state.json'))
         cache.set(brian.CACHED_BRIAN_SCID_RATES_FILENAME, load_test_data('brian-scid-rates.json'))
  

test/test_inventory.py

@@ -16,11 +16,6 @@ def test_inventory_service_download():
     inventory_base_uri = 'https://dummy-hostname.dummy.domain'
     reporting_base_uri = 'https://another-dummy-hostname.dummy.domain'
 
-    # responses.add(
-    #     method=responses.GET,
-    #     url=f'{inventory_base_uri}/poller/interfaces',
-    #     json=load_test_data('poller-interfaces.json')
-    # )
     responses.add(
         method=responses.GET,
         url=f'{reporting_base_uri}/scid/current',
@@ -39,11 +34,6 @@ def test_inventory_service_download():
             inventory_base_uri=inventory_base_uri,
             reporting_base_uri=reporting_base_uri)
 
-        # assert os.path.exists(os.path.join(tmp_dir, services.POLLER_INTERFACES_CACHE_FILENAME))
-
-        # cached_data = cache.get(inventory.INPROV_POLLER_INTERFACES_CACHE_FILENAME)
-        # assert cached_data == load_test_data('poller-interfaces.json')
-
         cached_data = cache.get(inventory.INPROV_EQUIPMENT_CACHE_FILENAME)
         assert cached_data == load_test_data('inprov-equipment.json')
 

test/test_map_endpoints.py

@@ -40,13 +40,6 @@ def test_get_equipment(client):
 
 @responses.activate
 def test_get_trunks(client):
-
-    responses.add(
-        method=responses.GET,
-        url=re.compile(r'.*/map/services.*'),
-        json=load_test_data('inprov-services.json')
-    )
-
     rv = client.get("/map/trunks")
     assert rv.status_code == 200
     service_list = ServiceList.model_validate(rv.json())