From 76898060c997971ec7be9005b98452668a06feb8 Mon Sep 17 00:00:00 2001 From: Erik Reid <erik.reid@geant.org> Date: Thu, 17 Jun 2021 11:10:08 +0200 Subject: [PATCH] changed ims services key names --- inventory_provider/routes/msr.py | 4 ++-- inventory_provider/tasks/worker.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inventory_provider/routes/msr.py b/inventory_provider/routes/msr.py index b85c5771..e5e4fa9a 100644 --- a/inventory_provider/routes/msr.py +++ b/inventory_provider/routes/msr.py @@ -159,7 +159,7 @@ def access_services(): redis = common.get_current_redis() def _services(): - for k in redis.scan_iter('ims:access_services:*'): + for k in redis.scan_iter('ims:services:access_services:*'): service = redis.get(k.decode('utf-8')).decode('utf-8') service = json.loads(service) @@ -212,7 +212,7 @@ def gws_indirect(): redis = common.get_current_redis() def _services(): - for k in redis.scan_iter('ims:gws_indirect:*'): + for k in redis.scan_iter('ims:services:gws_indirect:*'): service = redis.get(k.decode('utf-8')).decode('utf-8') service = json.loads(service) yield { diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py index a29f710f..5de676cf 100644 --- a/inventory_provider/tasks/worker.py +++ b/inventory_provider/tasks/worker.py @@ -806,7 +806,7 @@ def update_circuit_hierarchy_and_port_id_services(self, use_current=False): for service_type, services in services_by_type.items(): for v in services.values(): rp.set( - f'ims:{service_type}:{v["name"]}', + f'ims:services:{service_type}:{v["name"]}', json.dumps({ 'id': v['id'], 'name': v['name'], -- GitLab