Skip to content
Snippets Groups Projects
Commit a60f2733 authored by Erik Reid's avatar Erik Reid
Browse files

Finished feature DBOARD3-218-add-project-to-related-services.

parents 4571a77a d4789bfb
No related branches found
No related tags found
No related merge requests found
...@@ -110,7 +110,6 @@ def get_juniper_link_info(source_equipment, interface): ...@@ -110,7 +110,6 @@ def get_juniper_link_info(source_equipment, interface):
} }
def _related_services(): def _related_services():
all_rs = []
for related in related_interfaces(source_equipment, interface): for related in related_interfaces(source_equipment, interface):
rs = r.get('opsdb:interface_services:%s:%s' rs = r.get('opsdb:interface_services:%s:%s'
% (source_equipment, related)) % (source_equipment, related))
...@@ -118,15 +117,14 @@ def get_juniper_link_info(source_equipment, interface): ...@@ -118,15 +117,14 @@ def get_juniper_link_info(source_equipment, interface):
for s in json.loads(rs.decode('utf-8')): for s in json.loads(rs.decode('utf-8')):
top_level_services.extend( top_level_services.extend(
get_top_level_services(s['id'], r)) get_top_level_services(s['id'], r))
all_rs.append( yield {
{ 'name': s['name'],
'name': s['name'], 'status': s['status'],
'status': s['status'], 'circuit_type': s['circuit_type'],
'circuit_type': s['circuit_type'] 'project': s['project']
}) }
return all_rs
related_services = list(_related_services())
related_services = _related_services()
if related_services: if related_services:
top_level_services.extend(related_services) top_level_services.extend(related_services)
if top_level_services: if top_level_services:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment