From eb86e8b009df22860b40ce02f07ae948af2a622a Mon Sep 17 00:00:00 2001
From: Robert Latta <robert.latta@geant.org>
Date: Fri, 26 Mar 2021 14:44:33 +0000
Subject: [PATCH] removed redundant function
---
inventory_provider/db/ims_data.py | 54 -------------------------------
1 file changed, 54 deletions(-)
diff --git a/inventory_provider/db/ims_data.py b/inventory_provider/db/ims_data.py
index 8dbf60b4..8c265846 100644
--- a/inventory_provider/db/ims_data.py
+++ b/inventory_provider/db/ims_data.py
@@ -32,60 +32,6 @@ def get_service_types(ds: IMS):
yield d['selection']
-def get_fibre_info(ds: IMS):
- # get all the wdm ots circuits where each node is in a different location
-
- circuit_nav_props = [
- ims.CIRCUIT_PROPERTIES['SubCircuits'],
- ims.CIRCUIT_PROPERTIES['CalculatedNode'],
- ims.CIRCUIT_PROPERTIES['PortA'],
- ims.CIRCUIT_PROPERTIES['PortB'],
- ]
-
- ignore_status_str = ''.join([
- f'inventoryStatusId != {s} | ' for s in STATUSES_TO_IGNORE
- ])
-
- ne_details = {}
- for c in ds.get_filtered_entities(
- 'Circuit',
- ignore_status_str +
- 'product.name == "wdm" | speed.name == "ots" | '
- 'vendor == "infinera"',
- circuit_nav_props,
- step_count=1000):
- if c["nodeaid"] and c["nodebid"] and \
- c["siteaid"] and c["sitebid"] and c["siteaid"] != c["sitebid"]:
- if c['subcircuits']:
- subs = [s['subcircuit'] for s in c['subcircuits']]
- if len(subs) > 1:
- # not sure if this is possible in IMS
- logger.info('There is more than one Sub-Circuit for'
- f'{c["name"]}')
-
- for s in subs:
- shelf = c['porta']['shelf']['sequencenumber']
- t = {
- 'ne': c['nodea']['name'] + f'-{shelf}',
- 'circuit_id': c['id'],
- 'df_route': s['name'],
- 'df_route_id': s['id'],
- 'df_status': IMS_OPSDB_STATUS_MAP.get(
- InventoryStatus(s['inventorystatusid']), 'unknown')
- }
- ne_details[f"{c['nodea']['name']}_{s['id']}"] = t
- t = t.copy()
- shelf = c['portb']['shelf']['sequencenumber']
- t['ne'] = c['nodeb']['name'] + f'-{shelf}'
- ne_details[f"{c['nodeb']['name']}_{s['id']}"] = t
-
- by_ne = defaultdict(lambda: [])
- for d in ne_details.values():
- by_ne[d['ne']].append(d)
-
- yield from by_ne.items()
-
-
def get_port_id_services(ds: IMS):
circuit_nav_props = [
ims.CIRCUIT_PROPERTIES['Ports'],
--
GitLab