Removed dependency to org id

This commit is contained in:
2016-03-22 21:13:07 +01:00
parent 1438a6553b
commit 606345fa17
6 changed files with 30 additions and 21 deletions
@@ -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<Objects.Peer> 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<Objects.Peer> 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();
@@ -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<Objects.Peer> 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<Objects.Peer> 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();