From 88344727ae3f2f7bfe8366613fb24d0522a57edc Mon Sep 17 00:00:00 2001
From: Robert Latta <robert.latta@geant.org>
Date: Fri, 14 Aug 2020 12:23:31 +0000
Subject: [PATCH] added bundle_members to classified Juniper interface data
---
inventory_provider/routes/classifier.py | 7 +++++++
test/test_classifier_routes.py | 6 ++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/inventory_provider/routes/classifier.py b/inventory_provider/routes/classifier.py
index 2043dace..1673e807 100644
--- a/inventory_provider/routes/classifier.py
+++ b/inventory_provider/routes/classifier.py
@@ -176,6 +176,13 @@ def get_juniper_link_info(source_equipment, interface):
'ipv4': [],
'ipv6': []
}
+ bundle_members = r.get(
+ 'netconf-interface-bundles:%s:%s' % (source_equipment, interface))
+ if bundle_members:
+ result['interface']['bundle_members'] = \
+ json.loads(bundle_members.decode('utf-8'))
+ else:
+ result['interface']['bundle_members'] = []
def _related_services():
for related in related_interfaces(source_equipment, interface):
diff --git a/test/test_classifier_routes.py b/test/test_classifier_routes.py
index f9ccb307..4afac359 100644
--- a/test/test_classifier_routes.py
+++ b/test/test_classifier_routes.py
@@ -65,7 +65,8 @@ JUNIPER_LINK_METADATA_DEFINITIONS = {
},
# TODO: check what's changed: added to make tests pass
- 'bundle': {"type": "array"}
+ 'bundle': {"type": "array"},
+ 'bundle_members': {"type": "array"}
},
"required": ["name", "description", "ipv4", "ipv6"],
"additionalProperties": False
@@ -203,7 +204,8 @@ def test_juniper_link_info_not_found(client):
'description': '',
'ipv4': [],
'ipv6': [],
- 'bundle': []
+ 'bundle': [],
+ 'bundle_members': []
},
'locations': [{
'a': {
--
GitLab