Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More fixes including CA-381728, CA-381618, CA-381225 #3205

Merged
merged 6 commits into from
Aug 21, 2023
Merged

More fixes including CA-381728, CA-381618, CA-381225 #3205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
04a9340
CA-381728: If no post-update tasks exist, XenCenter should explicitly…
kc284 Aug 18, 2023
5ff86d4
Missing placeholders for building locally without applying branding.
kc284 Aug 19, 2023
3a9b54d
Missing help links.
kc284 Aug 19, 2023
2ce8d8c
CA-381618: The HA/WLB off check is a pool, not a host check.
kc284 Aug 19, 2023
ce417b2
CA-381225: Corrected order of running update guidance (also uses inpu…
kc284 Aug 20, 2023
d1a0142
UPDATES_URL has been renamed to XC_UPDATES_URL.
kc284 Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion Branding/branding.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,11 @@ BRANDING_PV_TOOLS="[Guest Tools]"
BRANDING_PRODUCT_VERSION_TEXT=0.0.0
BRANDING_XC_PRODUCT_VERSION=0.0.0
BRANDING_XC_PRODUCT_VERSION_INSTALLER=0.0.0
UPDATES_URL="[Updates url]"
XC_UPDATES_URL="[Xc updates url]"
CFU_URL="[Cfu url]"
CitrixChris marked this conversation as resolved.
Show resolved Hide resolved
YUM_REPO_BASE_BIN="[YumRepoBaseBin]"
YUM_REPO_BASE_SRC="[YumRepoBaseSource]"
YUM_REPO_EARLY_ACCESS_BIN="[YumRepoEarlyAccessBin]"
YUM_REPO_EARLY_ACCESS_SRC="[YumRepoEarlyAccessSource]"
YUM_REPO_NORMAL_BIN="[YumRepoNormalBin]"
YUM_REPO_NORMAL_SRC="[YumRepoNormalSource]"
4 changes: 2 additions & 2 deletions XenAdmin/Alerts/Types/OutOfSyncWithCdnAlert.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public override Action FixLinkAction

public override string FixLinkText => Messages.UPDATES_GENERAL_TAB_SYNC_NOW;

public override string HelpID => "TODO";
public override string HelpID => "OutOfSyncWithCdnAlert";

public override string Title => _outOfSyncSpan == TimeSpan.Zero
? Messages.ALERT_CDN_NEVER_SYNC_TITLE
Expand Down Expand Up @@ -159,7 +159,7 @@ public override Action FixLinkAction

public override string FixLinkText => Messages.ALERT_CDN_REPO_NOT_CONFIGURED_ACTION_LINK;

public override string HelpID => "TODO";
public override string HelpID => "YumRepoNotConfiguredAlert";

public override string Title => string.Format(Messages.ALERT_CDN_REPO_NOT_CONFIGURED_TITLE, Connection.Name);
}
Expand Down
2 changes: 1 addition & 1 deletion XenAdmin/Controls/ComboBoxes/VgpuComboBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ private void UpdateDisplayName()
if (GpuGroup == null)
{
//this refers to the item "None"
displayName = Messages.GPU_NONE;
displayName = Messages.NONE_UPPER;
}
else if (VgpuTypes == null || VgpuTypes.Length == 0 || VgpuTypes[0] == null)
{
Expand Down
2 changes: 1 addition & 1 deletion XenAdmin/Controls/XenTabPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public override string Text
/// Gets the value by which the help files section for this page is identified
/// Most derived classes override it to return a fixed string
/// </summary>
public virtual string HelpID => "";
public virtual string HelpID => string.Empty;

public virtual string NextText(bool isLastPage)
{
Expand Down
71 changes: 0 additions & 71 deletions XenAdmin/Diagnostics/Checks/HAOffCheck.cs
View file
Open in desktop

This file was deleted.

31 changes: 19 additions & 12 deletions ...zard/PlanActions/BringBabiesBackAction.cs → XenAdmin/Diagnostics/Checks/HaWlbOffCheck.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,34 @@
* SUCH DAMAGE.
*/

using System.Collections.Generic;
using XenAdmin.Core;
using XenAdmin.Diagnostics.Problems;
using XenAdmin.Diagnostics.Problems.PoolProblem;
using XenAPI;


namespace XenAdmin.Wizards.PatchingWizard.PlanActions
namespace XenAdmin.Diagnostics.Checks
{
public class BringBabiesBackAction : HostPlanAction
class HaWlbOffCheck : PoolCheck
{
private readonly List<XenRef<VM>> _vms;
private readonly bool _enableOnly;

public BringBabiesBackAction(List<XenRef<VM>> vms, Host host, bool enableOnly)
: base(host)
public HaWlbOffCheck(Pool pool)
: base(pool)
{
_vms = vms;
_enableOnly = enableOnly;
}

protected override void RunWithSession(ref Session session)
protected override Problem RunCheck()
{
BringBabiesBack(ref session, _vms, _enableOnly);
if (Pool.ha_enabled)
return new HAEnabledProblem(this, Pool);

if (Helpers.WlbEnabled(Pool.Connection))
return new WLBEnabledProblem(this, Pool);

return null;
}

public override string Description => Messages.HA_WLB_CHECK_DESCRIPTION;

public override string SuccessfulCheckDescription => string.Format(Messages.PATCHING_WIZARD_CHECK_ON_XENOBJECT_OK, Pool.Name(), Description);
}
}
2 changes: 2 additions & 0 deletions XenAdmin/Dialogs/ServerUpdates/ConfigUpdatesDialog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ public void SelectLcmTab()
tabControl1.SelectTab(_configLcmTab);
}

internal override string HelpName => "ConfigureUpdatesDialog";


private sealed class OptionsTabPage : TabPage
{
Expand Down
65 changes: 25 additions & 40 deletions XenAdmin/Help/HelpManager.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,17 @@
<value>pools-rootpassword</value>
</data>
<data name="ClientIdDialog" xml:space="preserve">
<value>updates-applying</value>
<value>updates-applying-ch</value>
</data>
<data name="CloseXenCenterWarningDialog" xml:space="preserve">
<value>intro-start</value>
</data>
<data name="ConfigureAdDialogAccessChanged" xml:space="preserve">
<value>users-overview</value>
</data>
<data name="ConfigureUpdatesDialog" xml:space="preserve">
<value>updates-autoconfig</value>
</data>
<data name="ConfirmTemplateConvertDialog" xml:space="preserve">
<value>templates-new</value>
</data>
Expand Down Expand Up @@ -271,7 +274,7 @@
<value>vms-relocate</value>
</data>
<data name="CssExpiryAlert" xml:space="preserve">
<value></value>
<value>systemalerts</value>
</data>
<data name="CustomFieldsDialog" xml:space="preserve">
<value>resources-customfields</value>
Expand Down Expand Up @@ -300,9 +303,6 @@
<data name="DRFailoverWizard_Dryrun_PrechecksPane" xml:space="preserve">
<value>dr-testfailover</value>
</data>
<data name="DRFailoverWizard_Dryrun_RbacPane" xml:space="preserve">
<value>9830</value>
</data>
<data name="DRFailoverWizard_Dryrun_RecoverPane" xml:space="preserve">
<value>dr-testfailover</value>
</data>
Expand Down Expand Up @@ -411,9 +411,6 @@
<data name="EditVmNetworkSettingsDialog" xml:space="preserve">
<value>vms-network-properties</value>
</data>
<data name="EditVMPPGeneralSettingsDialog" xml:space="preserve">
<value>6536</value>
</data>
<data name="EditVMSSGeneralSettingsDialog" xml:space="preserve">
<value>vms-snapshotschedule-manage-policy</value>
</data>
Expand Down Expand Up @@ -588,6 +585,9 @@
<data name="IscsiDeviceConfigDialog" xml:space="preserve">
<value>dr-testfailover</value>
</data>
<data name="LeafCoalesceAlert" xml:space="preserve">
<value>systemalerts</value>
</data>
<data name="LicenseKeyDialog" xml:space="preserve">
<value>licensing-about</value>
</data>
Expand All @@ -603,8 +603,11 @@
<data name="LVMoHBAWarningDialog" xml:space="preserve">
<value>storage-pools-add-hba</value>
</data>
<data name="ManageUpdatesDialog" xml:space="preserve">
<value>updates-applying</value>
<data name="ManageCdnUpdatesTabPage" xml:space="preserve">
<value>updates-applying-xs</value>
</data>
<data name="ManageUpdatesTabPage" xml:space="preserve">
<value>updates-applying-ch</value>
</data>
<data name="MemoryUsageMessageAlert" xml:space="preserve">
<value>systemalerts</value>
Expand Down Expand Up @@ -846,32 +849,14 @@
<data name="OptionsDialog" xml:space="preserve">
<value>intro-options</value>
</data>
<data name="PatchingWizard_ApplyUpdatePane" xml:space="preserve">
<value>updates-applying</value>
</data>
<data name="PatchingWizard_BeforeyoustartPane" xml:space="preserve">
<value>updates-applying</value>
</data>
<data name="PatchingWizard_InstallUpdatePane" xml:space="preserve">
<value>updates-applying</value>
</data>
<data name="PatchingWizard_SelectPatchPane" xml:space="preserve">
<value>updates-applying</value>
</data>
<data name="PatchingWizard_SelectServersPane" xml:space="preserve">
<value>updates-applying</value>
</data>
<data name="PatchingWizard_SelectUpdatePane" xml:space="preserve">
<value>updates-applying</value>
</data>
<data name="PatchingWizard_UpdateModePane" xml:space="preserve">
<value>updates-applying</value>
<data name="OutOfSyncWithCdnAlert" xml:space="preserve">
<value>systemalerts</value>
</data>
<data name="PatchingWizard_UpdatePrechecksPane" xml:space="preserve">
<value>updates-applying</value>
<data name="PatchingWizard_ch" xml:space="preserve">
<value>updates-applying-ch</value>
</data>
<data name="PatchingWizard_UploadPatchPane" xml:space="preserve">
<value>updates-applying</value>
<data name="PatchingWizard_xs" xml:space="preserve">
<value>updates-applying-xs</value>
</data>
<data name="PoolJoinAdConfiguring" xml:space="preserve">
<value>pools-add-host</value>
Expand Down Expand Up @@ -1074,9 +1059,6 @@
<data name="UnknownCertificateDialog" xml:space="preserve">
<value>hosts-reconnect</value>
</data>
<data name="UpdatesDialog" xml:space="preserve">
<value>updates-applying</value>
</data>
<data name="VcpuWarningDialog" xml:space="preserve">
<value>vms-properties</value>
</data>
Expand Down Expand Up @@ -1135,12 +1117,15 @@
<value>updates-xencenter</value>
</data>
<data name="XenServerPatchAlert" xml:space="preserve">
<value>updates-applying</value>
<value>updates-applying-ch</value>
</data>
<data name="XenServerUpdateAlert" xml:space="preserve">
<value>updates-applying</value>
<value>updates-applying-ch</value>
</data>
<data name="StorageReadCaching" xml:space="preserve">
<value>storage-readcaching</value>
</data>
</root>
<data name="YumRepoNotConfiguredAlert" xml:space="preserve">
<value>systemalerts</value>
</data>
</root>
8 changes: 0 additions & 8 deletions XenAdmin/Help/extract-help-numbers
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions XenAdmin/Help/extract-help-numbers-csv
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion XenAdmin/MainWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2563,7 +2563,7 @@ private string TabHelpID()
foreach (var page in _notificationPages)
{
if (page.Visible)
return alertPage.HelpID;
return page.HelpID;
}

if (TheTabControl.SelectedTab.Controls.Count > 0 && TheTabControl.SelectedTab.Controls[0] is IControlWithHelp ctrl)
Expand Down
2 changes: 1 addition & 1 deletion XenAdmin/SettingsPanels/GpuEditPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public string SubText
if (Helpers.GpusAvailable(Connection))
{
var vGpus = VGpus;
txt = vGpus.Count > 0 ? string.Join(",", vGpus.Select(v => v.VGpuTypeDescription())) : Messages.GPU_NONE;
txt = vGpus.Count > 0 ? string.Join(",", vGpus.Select(v => v.VGpuTypeDescription())) : Messages.NONE_UPPER;
}

return txt;
Expand Down
Loading
Loading