From fb40877d2e959a4089c774e787e656514795e07f Mon Sep 17 00:00:00 2001 From: Gabor Apati-Nagy Date: Thu, 31 Jul 2014 11:30:22 +0100 Subject: [PATCH] CA-141163: EN: Fail to show Single-Server Private network. -Reverted changes of CA-109242 (PR-62 on GitHub) -Network tab: now to show '' instead of '-' as Link Status (for pools: when the network has no PIFs; for hosts: when the network has no PIF ) Signed-off-by: Gabor Apati-Nagy --- XenAdmin/Controls/NetworkingTab/NetworkList.cs | 5 ++--- XenModel/XenAPI-Extensions/Network.cs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/XenAdmin/Controls/NetworkingTab/NetworkList.cs b/XenAdmin/Controls/NetworkingTab/NetworkList.cs index 8bbb698dd..34a5b265f 100644 --- a/XenAdmin/Controls/NetworkingTab/NetworkList.cs +++ b/XenAdmin/Controls/NetworkingTab/NetworkList.cs @@ -341,8 +341,7 @@ namespace XenAdmin.Controls.NetworkingTab List networkRowsToAdd = new List(); for (int i = 0; i < networks.Length; i++) { - if (!networks[i].Show(XenAdmin.Properties.Settings.Default.ShowHiddenVMs) || - Helpers.FindPIF(networks[i], XenObject as Host) == null) + if (!networks[i].Show(XenAdmin.Properties.Settings.Default.ShowHiddenVMs)) continue; networkRowsToAdd.Add(new NetworkRow(networks[i], XenObject)); } @@ -933,7 +932,7 @@ namespace XenAdmin.Controls.NetworkingTab VlanCell.Value = Helpers.VlanString(Pif); AutoCell.Value = Network.AutoPlug ? Messages.YES : Messages.NO; LinkStatusCell.Value = Xmo is Pool ? Network.LinkStatusString : - Pif == null ? Messages.SPACED_HYPHEN : Pif.LinkStatusString; + Pif == null ? Messages.NONE : Pif.LinkStatusString; MacCell.Value = Pif != null && Pif.IsPhysical ? Pif.MAC : Messages.SPACED_HYPHEN; MtuCell.Value = Network.CanUseJumboFrames ? Network.MTU.ToString() : Messages.SPACED_HYPHEN; } diff --git a/XenModel/XenAPI-Extensions/Network.cs b/XenModel/XenAPI-Extensions/Network.cs index 70fc24c42..68e0ed0a3 100644 --- a/XenModel/XenAPI-Extensions/Network.cs +++ b/XenModel/XenAPI-Extensions/Network.cs @@ -305,7 +305,7 @@ namespace XenAPI get { if (PIFs.Count == 0) - return Messages.SPACED_HYPHEN; + return Messages.NONE; List states = new List(); foreach (PIF p in Connection.ResolveAll(PIFs))