From 606345fa17abb9bce511fc1465da5d9798f99354 Mon Sep 17 00:00:00 2001 From: llsth Date: Tue, 22 Mar 2016 21:13:07 +0100 Subject: [PATCH] Removed dependency to org id --- Ntp.Analyzer.Process/Description/PeerGraphJob.cs | 6 +++++- .../Description/PeerGraphPageJob.cs | 8 ++++++-- Ntp.Analyzer.Process/Description/PeerPageJob.cs | 5 ++--- Ntp.Analyzer.sln | 2 +- .../Render/Summery/BootstrapSummeryGraphRender.cs | 15 ++++++++------- .../Summery/DefaultPeerSummeryGraphRender.cs | 15 ++++++++------- 6 files changed, 30 insertions(+), 21 deletions(-) diff --git a/Ntp.Analyzer.Process/Description/PeerGraphJob.cs b/Ntp.Analyzer.Process/Description/PeerGraphJob.cs index 1ca25908..64990d89 100644 --- a/Ntp.Analyzer.Process/Description/PeerGraphJob.cs +++ b/Ntp.Analyzer.Process/Description/PeerGraphJob.cs @@ -65,12 +65,16 @@ namespace Ntp.Analyzer.Process.Description foreach (NtpConfEntry entry in DataFace.Instance.NtpConfigCache[config.ConfigFile]) { IEnumerable peers = DataFace.Instance.Peers.Where(p => p.Ip == entry.Address.ToString()); - if (peers.Count() == 0) { Log.WriteLine("Peer not found in database: " + entry.Name, Severity.Warn); continue; } + else if (peers.Count() > 1) + { + Log.WriteLine("Ambiguous peer IP. Multiple occurrence found in database: " + entry.Name, Severity.Warn); + continue; + } Peer peer = peers.Single(); diff --git a/Ntp.Analyzer.Process/Description/PeerGraphPageJob.cs b/Ntp.Analyzer.Process/Description/PeerGraphPageJob.cs index dfd06198..5bc4f365 100644 --- a/Ntp.Analyzer.Process/Description/PeerGraphPageJob.cs +++ b/Ntp.Analyzer.Process/Description/PeerGraphPageJob.cs @@ -70,13 +70,17 @@ namespace Ntp.Analyzer.Process.Description { foreach (NtpConfEntry entry in DataFace.Instance.NtpConfigCache[config.ConfigFile]) { - IEnumerable peers = DataFace.Instance.Peers.Where(p => p.OrgId == entry.OrgId.Value); - + IEnumerable peers = DataFace.Instance.Peers.Where(p => p.Ip == entry.Address.ToString()); if (peers.Count() == 0) { Log.WriteLine("Peer not found in database: " + entry.Name, Severity.Warn); continue; } + else if (peers.Count() > 1) + { + Log.WriteLine("Ambiguous peer IP. Multiple occurrence found in database: " + entry.Name, Severity.Warn); + continue; + } Peer peer = peers.Single(); diff --git a/Ntp.Analyzer.Process/Description/PeerPageJob.cs b/Ntp.Analyzer.Process/Description/PeerPageJob.cs index 3cec7948..4cdf76af 100644 --- a/Ntp.Analyzer.Process/Description/PeerPageJob.cs +++ b/Ntp.Analyzer.Process/Description/PeerPageJob.cs @@ -71,8 +71,7 @@ namespace Ntp.Analyzer.Process.Description foreach (NtpConfEntry entry in DataFace.Instance.NtpConfigCache[page.ConfigFile]) { - IEnumerable peers = DataFace.Instance.Peers.Where(p => p.OrgId == entry.OrgId.Value); - + IEnumerable peers = DataFace.Instance.Peers.Where(p => p.Ip == entry.Address.ToString()); if (peers.Count() == 0) { Log.WriteLine("Peer not found in database. Creating peer: " + entry.Name, Severity.Warn); @@ -85,7 +84,7 @@ namespace Ntp.Analyzer.Process.Description } else if (peers.Count() > 1) { - Log.WriteLine("Ambiguous peer name. Multiple occurrence found in database: " + entry.Name, Severity.Warn); + Log.WriteLine("Ambiguous peer IP. Multiple occurrence found in database: " + entry.Name, Severity.Warn); continue; } diff --git a/Ntp.Analyzer.sln b/Ntp.Analyzer.sln index 495781c0..735e25bd 100644 --- a/Ntp.Analyzer.sln +++ b/Ntp.Analyzer.sln @@ -169,7 +169,7 @@ Global GlobalSection(NestedProjects) = preSolution EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = Ntp.Analyzer.Validate.Cli\Ntp.Analyzer.Validate.Cli.csproj + StartupItem = Ntp.Analyzer.Cli\Ntp.Analyzer.Cli.csproj Policies = $0 $0.DotNetNamingPolicy = $1 $1.DirectoryNamespaceAssociation = PrefixedHierarchical diff --git a/Ntp.Analyzer/Render/Summery/BootstrapSummeryGraphRender.cs b/Ntp.Analyzer/Render/Summery/BootstrapSummeryGraphRender.cs index bb3c050e..1a45b9a7 100644 --- a/Ntp.Analyzer/Render/Summery/BootstrapSummeryGraphRender.cs +++ b/Ntp.Analyzer/Render/Summery/BootstrapSummeryGraphRender.cs @@ -28,11 +28,11 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; +using Ntp.Analyzer.Data; +using Ntp.Analyzer.Objects; using Ntp.Analyzer.Config.Destination; using Ntp.Analyzer.Config.Graph; using Ntp.Analyzer.Config.Page; -using Ntp.Analyzer.Data; -using Ntp.Analyzer.Objects; namespace Ntp.Analyzer.Render.Summery { @@ -96,11 +96,12 @@ namespace Ntp.Analyzer.Render.Summery foreach (NtpConfEntry entry in DataFace.Instance.NtpConfigCache[page.ConfigFile]) { - IEnumerable peers = DataFace.Instance.Peers.Where(p => p.OrgId == entry.OrgId.Value); - - if (peers.Count() == 0) - { - throw new ApplicationException("Peer not found in database: " + entry.Name); + IEnumerable peers = DataFace.Instance.Peers.Where(p => p.Ip == entry.Address.ToString()); + if (peers.Count () == 0) { + throw new ApplicationException (String.Format ( + "Peer with IP {0} was not found in database.", + entry.Address.ToString () + )); } Objects.Peer peer = peers.Single(); diff --git a/Ntp.Analyzer/Render/Summery/DefaultPeerSummeryGraphRender.cs b/Ntp.Analyzer/Render/Summery/DefaultPeerSummeryGraphRender.cs index 48c6783a..cb8e1a3d 100644 --- a/Ntp.Analyzer/Render/Summery/DefaultPeerSummeryGraphRender.cs +++ b/Ntp.Analyzer/Render/Summery/DefaultPeerSummeryGraphRender.cs @@ -28,11 +28,11 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; +using Ntp.Analyzer.Data; +using Ntp.Analyzer.Objects; using Ntp.Analyzer.Config.Destination; using Ntp.Analyzer.Config.Graph; using Ntp.Analyzer.Config.Page; -using Ntp.Analyzer.Data; -using Ntp.Analyzer.Objects; namespace Ntp.Analyzer.Render.Summery { @@ -63,11 +63,12 @@ namespace Ntp.Analyzer.Render.Summery foreach (NtpConfEntry entry in DataFace.Instance.NtpConfigCache[page.ConfigFile]) { - IEnumerable peers = DataFace.Instance.Peers.Where(p => p.OrgId == entry.OrgId.Value); - - if (peers.Count() == 0) - { - throw new ApplicationException("Peer not found in database: " + entry.Name); + IEnumerable peers = DataFace.Instance.Peers.Where(p => p.Ip == entry.Address.ToString()); + if (peers.Count () == 0) { + throw new ApplicationException (String.Format ( + "Peer with IP {0} was not found in database.", + entry.Address.ToString () + )); } Objects.Peer peer = peers.Single();