renamed function

inventory_provider/routes/msr.py

@@ -445,7 +445,7 @@ def _get_subnet_interfaces(address, r):
     return []
 
 
-def _get_peer_address_services(address: str, r: 'StrictRedis'):
+def _get_services_for_address(address: str, r: 'StrictRedis'):
 
     def _formatted_service(s):
         return {
@@ -499,7 +499,7 @@ def _load_address_services_proc(address_queue, results_queue, config_params):
             if not address:
                 break
 
-            for service_info in _get_peer_address_services(address, r):
+            for service_info in _get_services_for_address(address, r):
                 results_queue.put(service_info)
 
     except json.JSONDecodeError:
@@ -521,7 +521,7 @@ def _get_peering_services_multi_thread(addresses):
     (cf. _get_peering_services_single_thread)
 
     :param addresses: iterable of address strings
-    :return: yields dicts returned from _get_peer_address_services
+    :return: yields dicts returned from _get_services_for_address
     """
 
     response_queue = queue.Queue()
@@ -571,11 +571,11 @@ def _get_peering_services_single_thread(addresses):
     (cf. _get_peering_services_multi_thread)
 
     :param addresses: iterable of address strings
-    :return: yields dicts returned from _get_peer_address_services
+    :return: yields dicts returned from _get_services_for_address
     """
     r = common.get_current_redis()
     for a in addresses:
-        yield from _get_peer_address_services(a, r)
+        yield from _get_services_for_address(a, r)
 
 
 @routes.route('/bgp/peering-services', methods=['POST'])

test/test_msr_routes.py

@@ -5,7 +5,7 @@ import pytest
 
 from inventory_provider.routes.msr import PEERING_LIST_SCHEMA, \
     PEERING_GROUP_LIST_SCHEMA, PEERING_ADDRESS_SERVICES_LIST, \
-    _get_peer_address_services
+    _get_services_for_address
 from inventory_provider.routes.poller import SERVICES_LIST_SCHEMA
 from inventory_provider.tasks.common import _get_redis
 
@@ -152,7 +152,7 @@ def test_lookup_services_for_address(address, mocked_redis):
         'redis-databases': [9, 7, 5]
     })
 
-    info = list(_get_peer_address_services(address, r=_redis_instance))
+    info = list(_get_services_for_address(address, r=_redis_instance))
     jsonschema.validate(info, PEERING_ADDRESS_SERVICES_LIST)
 
     # sanity check to be sure we have interesting test data