Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1151 from huazhihao/CA-218956

Browse Source 
CA-218956: Expose HIMN when showing hidden objects
This commit is contained in:
Mihaela Stoica 2016-09-08 13:10:38 +01:00 committed by GitHub
commit 1bb49758ff
8 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
XenAdmin/Actions/GUIActions/ExportResourceReportAction.cs
View File

@ -659,7 +659,8 @@ namespace XenAdmin.Actions
if (Cancelling)
throw new CancelledException();
if (network.IsGuestInstallerNetwork)
// CA-218956 - Expose HIMN when showing hidden objects
if (network.IsGuestInstallerNetwork && !XenAdmin.Properties.Settings.Default.ShowHiddenVMs)
{
PercentComplete = Convert.ToInt32((++itemIndex) * baseIndex / itemCount);
continue;

5
XenAdmin/Commands/Controls/ContextMenuBuilder.cs
View File

@ -387,7 +387,10 @@ namespace XenAdmin.Commands
public override bool IsValid(SelectedItemCollection selection)
{
return selection.ContainsOneItemOfType<XenAPI.Network>();
return selection.ContainsOneItemOfType<XenAPI.Network>() &&
!(selection.FirstAsXenObject as XenAPI.Network).IsGuestInstallerNetwork;
// CA-218956 - Expose HIMN when showing hidden objects
// HIMN should not be editable
}
}

15
XenAdmin/Controls/NetworkingTab/NetworkList.cs
View File

@ -292,7 +292,9 @@ namespace XenAdmin.Controls.NetworkingTab
foreach (var vif in vifs)
{
var network = vif.Connection.Resolve(vif.network);
if (network != null && network.IsGuestInstallerNetwork)
if (network != null &&
// CA-218956 - Expose HIMN when showing hidden objects
(network.IsGuestInstallerNetwork && !XenAdmin.Properties.Settings.Default.ShowHiddenVMs))
continue; // Don't show the guest installer network in the network tab (CA-73056)
vifRowsToAdd.Add(new VifRow(vif));
}
@ -394,7 +396,10 @@ namespace XenAdmin.Controls.NetworkingTab
XenAPI.Network TheNetwork = SelectedNetwork;
AddNetworkButton.Enabled = !locked;
EditNetworkButton.Enabled = !locked && !TheNetwork.Locked && !TheNetwork.IsSlave && !TheNetwork.CreateInProgress;
EditNetworkButton.Enabled = !locked && !TheNetwork.Locked && !TheNetwork.IsSlave && !TheNetwork.CreateInProgress
&& !TheNetwork.IsGuestInstallerNetwork;
// CA-218956 - Expose HIMN when showing hidden objects
// HIMN should not be editable
if (HasPhysicalNonBondNIC(TheNetwork))
{
@ -403,7 +408,11 @@ namespace XenAdmin.Controls.NetworkingTab
}
else
{
RemoveNetworkButton.Enabled = !locked && !TheNetwork.Locked && !TheNetwork.IsSlave && !TheNetwork.CreateInProgress;
RemoveNetworkButton.Enabled = !locked && !TheNetwork.Locked && !TheNetwork.IsSlave && !TheNetwork.CreateInProgress
&& !TheNetwork.IsGuestInstallerNetwork;
// CA-218956 - Expose HIMN when showing hidden objects
// HIMN should not be removable
RemoveButtonContainer.SetToolTip("");
}
}

1
XenAdmin/SettingsPanels/EditNetworkPage.cs
View File

@ -386,6 +386,7 @@ namespace XenAdmin.SettingsPanels
// Populate Automatic checkbox
autoCheckBox.Checked = network.AutoPlug;
autoCheckBox.Enabled = !network.IsGuestInstallerNetwork;
// in case some odd value has been set on the CLI
numericUpDownMTU.Maximum = Math.Max(network.MTU, XenAPI.Network.MTU_MAX);
numericUpDownMTU.Minimum = Math.Min(network.MTU, XenAPI.Network.MTU_MIN);

3
XenAdmin/Wizards/ImportWizard/ImportWizard.cs
View File

@ -478,7 +478,8 @@ namespace XenAdmin.Wizards.ImportWizard
{
var netref = new XenRef<XenAPI.Network>(vif.network);
var network = con.Resolve(netref);
if (network == null || network.IsGuestInstallerNetwork)
// CA-218956 - Expose HIMN when showing hidden objects
if (network == null || (network.IsGuestInstallerNetwork && !XenAdmin.Properties.Settings.Default.ShowHiddenVMs))
continue;
temp.Add(new Tuple(first ? Messages.FINISH_PAGE_NETWORK : "", network.Name));

3
XenAdmin/Wizards/ImportWizard/NetworkPickerPage.cs
View File

@ -295,7 +295,8 @@ namespace XenAdmin.Wizards.ImportWizard
// CA-73056: A row for the guest installer network shouldn't show up. But we still need
// it present but invisible, otherwise the corresponding VIF doesn't get created at all.
if (isGuestInstallerNetwork)
// CA-218956 - Expose HIMN when showing hidden objects
if (isGuestInstallerNetwork && !XenAdmin.Properties.Settings.Default.ShowHiddenVMs)
row.Visible = false;
m_networkGridView.Rows.Add(row);

5
XenAdmin/Wizards/NewVMWizard/Page_Networking.cs
View File

@ -139,7 +139,10 @@ namespace XenAdmin.Wizards.NewVMWizard
networks.Sort();
foreach (XenAPI.Network network in networks)
{
if (!network.AutoPlug || !network.Show(Properties.Settings.Default.ShowHiddenVMs) || network.IsSlave)
// CA-218956 - Expose HIMN when showing hidden objects
// HIMN shouldn't be autoplugged
if (network.IsGuestInstallerNetwork ||
!network.AutoPlug || !network.Show(Properties.Settings.Default.ShowHiddenVMs) || network.IsSlave)
continue;
if (NetworksGridView.Rows.Count < MAX_NETWORKS_FOR_DEFAULT_TEMPLATES)

4
XenModel/XenAPI-Extensions/Network.cs
View File

@ -147,8 +147,8 @@ namespace XenAPI
public override bool Show(bool showHiddenVMs)
{
if (IsGuestInstallerNetwork)
// CA-218956 - Expose HIMN when showing hidden objects
if (IsGuestInstallerNetwork && !showHiddenVMs)
return false;
if (!ShowAllPifs(showHiddenVMs))