From 83c12d27c1ade5b10a2c4a7fd768c9db19cc8ce2 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Sat, 19 Mar 2022 11:58:58 +0100
Subject: [PATCH] save pops by abbreviation instead of name
---
inventory_provider/tasks/worker.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py
index bbbd5934..3f8b7b21 100644
--- a/inventory_provider/tasks/worker.py
+++ b/inventory_provider/tasks/worker.py
@@ -1077,9 +1077,10 @@ def persist_ims_data(data, use_current=False):
sid_services = data['sid_services']
def _get_pops():
- # de-dupe the sites
+ # de-dupe the sites (by abbreviation)
pops = {
- equip['pop']['name']: equip['pop'] for equip in locations.values()}
+ equip['pop']['abbreviation']: equip['pop']
+ for equip in locations.values()}
return pops.values()
if use_current:
@@ -1110,7 +1111,7 @@ def persist_ims_data(data, use_current=False):
for h, d in locations.items():
rp.set(f'ims:location:{h}', json.dumps([d]))
for pop in _get_pops():
- rp.set(f'ims:pop:{pop["name"]}', json.dumps(pop))
+ rp.set(f'ims:pop:{pop["abbreviation"]}', json.dumps(pop))
rp.execute()
rp = r.pipeline()
for router in lg_routers:
--
GitLab