From 462447495c07723df58b26980ef19242a719f408 Mon Sep 17 00:00:00 2001 From: Andrey Danin Date: Thu, 15 Nov 2012 17:10:36 +0400 Subject: [PATCH] [astute] Fix wrong network_check behaviour when some vlans broken. --- astute/lib/astute/orchestrator.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/astute/lib/astute/orchestrator.rb b/astute/lib/astute/orchestrator.rb index 004f2e1d80..8442cecbe7 100644 --- a/astute/lib/astute/orchestrator.rb +++ b/astute/lib/astute/orchestrator.rb @@ -44,7 +44,7 @@ module Astute end result.map! { |node| {'uid' => node['sender'], - 'networks' => check_vlans_by_traffic(node['data'][:neighbours]) } + 'networks' => check_vlans_by_traffic(node['sender'], node['data'][:neighbours]) } } return {'networks' => result} end @@ -99,8 +99,8 @@ module Astute {'nodes' => nodes.map { |n| {'uid' => n['uid'], 'status' => status} }} end - def check_vlans_by_traffic(data) - return data.map{|iface, vlans| {'iface' => iface, 'vlans' => vlans.keys.map{|n| n.to_i} } } + def check_vlans_by_traffic(uid, data) + return data.map{|iface, vlans| {'iface' => iface, 'vlans' => vlans.reject{|k,v| v.size==1 and v.has_key?(uid)}.keys.map{|n| n.to_i} } } end end end