From dc926a2ab0178485b1440094173eeedbb9c60b91 Mon Sep 17 00:00:00 2001 From: Erik Reid <erik.reid@geant.org> Date: Tue, 8 Dec 2020 13:47:01 +0100 Subject: [PATCH] qfx* & gts* shold be internal --- inventory_provider/db/opsdb.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/inventory_provider/db/opsdb.py b/inventory_provider/db/opsdb.py index ac8958a5..cdf49bdc 100644 --- a/inventory_provider/db/opsdb.py +++ b/inventory_provider/db/opsdb.py @@ -414,15 +414,20 @@ WHERE """ def _public(row): + # cf. LGR-73 + if row['pop_name'] in INTERNAL_POP_NAMES: return False - if row['router_name'].startswith('sw'): + + router_name_lower = row['router_name'].lower() + if any(router_name_lower.startswith(prefix) + for prefix in ['srx', 'gts', 'sw', 'qfx']): return False + if row['pop_city'].lower() == 'slough' \ and not row['equipment_model'].upper().startswith('MX'): return False - if row['router_name'].startswith('srx'): - return False + return True def _row2rsp(row): -- GitLab