Merge pull request #1427 from geosharath/CA-241810

CA-241810: [VMSS] VM scheduled snapshot options visible on XC on host with Dundee XS
This commit is contained in:
Mihaela Stoica 2017-02-06 12:11:23 +00:00 committed by GitHub
commit 0d1862feff
3 changed files with 4 additions and 4 deletions

View File

@ -194,8 +194,8 @@ namespace XenAdmin.Core
{
if (typeof(T) == typeof(VMPP) && (Helpers.ClearwaterOrGreater(connection)))
return false;
//VMSS is enabled Dundee onwards
if ((typeof(T) == typeof(VMSS)) && !Helpers.DundeeOrGreater(connection))
//VMSS is enabled Falcon onwards
if ((typeof(T) == typeof(VMSS)) && !Helpers.FalconOrGreater(connection))
return false;
return typeof(T) == typeof(VMPP) ?

View File

@ -1669,7 +1669,7 @@ namespace XenAdmin
IXenConnection conn;
conn = SelectionManager.Selection.GetConnectionOfAllItems();
if (SelectionManager.Selection.Count > 0 && (Helpers.GetMaster(conn) != null) && (Helpers.DundeeOrGreater(conn))) /* hide VMPP */
if (SelectionManager.Selection.Count > 0 && (Helpers.GetMaster(conn) != null) && (Helpers.FalconOrGreater(conn))) /* hide VMPP */
{
assignSnapshotScheduleToolStripMenuItem.Available = true;
VMSnapshotScheduleToolStripMenuItem.Available = true;

View File

@ -191,7 +191,7 @@ namespace XenAdmin.TabPages
linkLabelVMPPInfo.Text = Messages.VIEW_POLICIES;
}
}
else if (Helpers.DundeeOrGreater(VM.Connection))
else if (Helpers.FalconOrGreater(VM.Connection))
{
panelVMPP.Visible = true;
var vmss = VM.Connection.Resolve(VM.snapshot_schedule);