Skip to content
This repository was archived by the owner on Feb 17, 2025. It is now read-only.

Commit 23138df

Browse files
kc284kc284
committed
CP-42155: Removed HealthCheck service and related dialogs.
Signed-off-by: Konstantina Chremmou <[email protected]>
1 parent f6ef46c commit 23138df

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+111
-14270
lines changed

Diff for: ‎Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* SUCH DAMAGE.
3232
*/
3333

34-
def XENADMIN_BRANDING_TAG = 'v2.6'
34+
def XENADMIN_BRANDING_TAG = 'v2.7'
3535

3636
@Library(['PacmanSharedLibrary', '[email protected]'])
3737
import com.citrix.pipeline.xencenter.*

Diff for: ‎XenAdmin.sln

-12
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XenOvfApi", "XenOvfApi\XenO
2424
EndProject
2525
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CFUValidator", "CFUValidator\CFUValidator.csproj", "{39308480-78C3-40B4-924D-06914F343ACD}"
2626
EndProject
27-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XenServerHealthCheck", "XenServerHealthCheck\XenServerHealthCheck.csproj", "{DEB3208D-1153-407C-8C99-0D8899BE25A5}"
28-
EndProject
2927
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xe", "xe\Xe.csproj", "{727E885D-14BE-40F0-9D0B-3853D44D3984}"
3028
EndProject
3129
Global
@@ -133,16 +131,6 @@ Global
133131
{39308480-78C3-40B4-924D-06914F343ACD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
134132
{39308480-78C3-40B4-924D-06914F343ACD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
135133
{39308480-78C3-40B4-924D-06914F343ACD}.Release|Win32.ActiveCfg = Release|Any CPU
136-
{DEB3208D-1153-407C-8C99-0D8899BE25A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
137-
{DEB3208D-1153-407C-8C99-0D8899BE25A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
138-
{DEB3208D-1153-407C-8C99-0D8899BE25A5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
139-
{DEB3208D-1153-407C-8C99-0D8899BE25A5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
140-
{DEB3208D-1153-407C-8C99-0D8899BE25A5}.Debug|Win32.ActiveCfg = Debug|Any CPU
141-
{DEB3208D-1153-407C-8C99-0D8899BE25A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
142-
{DEB3208D-1153-407C-8C99-0D8899BE25A5}.Release|Any CPU.Build.0 = Release|Any CPU
143-
{DEB3208D-1153-407C-8C99-0D8899BE25A5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
144-
{DEB3208D-1153-407C-8C99-0D8899BE25A5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
145-
{DEB3208D-1153-407C-8C99-0D8899BE25A5}.Release|Win32.ActiveCfg = Release|Any CPU
146134
{727E885D-14BE-40F0-9D0B-3853D44D3984}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
147135
{727E885D-14BE-40F0-9D0B-3853D44D3984}.Debug|Any CPU.Build.0 = Debug|Any CPU
148136
{727E885D-14BE-40F0-9D0B-3853D44D3984}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

Diff for: ‎XenAdmin/Commands/CallHomeCommand.cs

-65
This file was deleted.

Diff for: ‎XenAdmin/Core/HealthCheck.cs

-159
This file was deleted.

Diff for: ‎XenAdmin/Core/HiddenFeatures.cs

-7
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,6 @@ internal static bool CopyrightHidden
7575
{ return Registry.HiddenFeatures != null && Registry.HiddenFeatures.Contains(COPYRIGHT_HIDDEN); }
7676
}
7777

78-
internal static bool HealthCheckHidden
79-
{
80-
get
81-
{ return Registry.HiddenFeatures != null && Registry.HiddenFeatures.Contains(HEALTH_CHECK_HIDDEN); }
82-
}
83-
8478
internal static bool UploadOptionHidden
8579
{
8680
get
@@ -111,7 +105,6 @@ internal static bool WindowsUpdateHidden
111105
private const string TOOL_STRIP_MENU_ITEM_HIDDEN = "tool_strip_menu_item";
112106
private const string CROSS_SERVER_PRIVATE_NETWORK_HIDDEN = "cross_server_private_network";
113107
private const string COPYRIGHT_HIDDEN = "copyright";
114-
private const string HEALTH_CHECK_HIDDEN = "health_check";
115108
private const string UPLOAD_OPTION_HIDDEN = "upload_option";
116109
private const string LICENSE_NAG = "license_nag";
117110
private const string LICENSE_OPERATIONS_HIDDEN = "license_operations";

Diff for: ‎XenAdmin/Core/Metadata.cs

+4-5
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
using System.Reflection;
4040
using System.Threading;
4141
using System.Web.Script.Serialization;
42-
using XenAdmin.Model;
4342
using XenAdmin.Plugins;
4443
using XenAPI;
4544

@@ -115,7 +114,7 @@ internal struct Plugin
115114
public bool Enabled;
116115
}
117116

118-
public static string Generate(PluginManager pluginManager, bool isForXenCenter)
117+
public static string Generate(PluginManager pluginManager)
119118
{
120119
var metadata = new XenCenterMetadata
121120
{
@@ -127,7 +126,7 @@ public static string Generate(PluginManager pluginManager, bool isForXenCenter)
127126
OsVersion = Environment.OSVersion.ToString(),
128127
OsCulture = CultureInfo.CurrentUICulture.EnglishName,
129128
IpAddress = GetLocalIPAddress(),
130-
Uptime = isForXenCenter ? (DateTime.Now - Process.GetCurrentProcess().StartTime).ToString() : string.Empty
129+
Uptime = (DateTime.Now - Process.GetCurrentProcess().StartTime).ToString()
131130
},
132131
Settings = new XenCenterSettings
133132
{
@@ -158,9 +157,9 @@ public static string Generate(PluginManager pluginManager, bool isForXenCenter)
158157
Connected = ConnectionsManager.XenConnectionsCopy.Count(c => c.IsConnected)
159158
},
160159
Plugins = new List<Plugin>(),
161-
SourceOfData = isForXenCenter ? Messages.XENCENTER : Messages.HEALTH_CHECK,
160+
SourceOfData = Messages.XENCENTER,
162161
Created = DateTime.UtcNow.ToString("u"),
163-
Reported = isForXenCenter ? DateTime.UtcNow.ToString("u") : HealthCheckSettings.REPORT_TIME_PLACEHOLDER
162+
Reported = DateTime.UtcNow.ToString("u")
164163
};
165164

166165
if (pluginManager != null)

Diff for: ‎XenAdmin/Core/Registry.cs

-18
Original file line numberDiff line numberDiff line change
@@ -152,18 +152,6 @@ private static string ReadInstalledKey(string k, RegistryView rView = RegistryVi
152152
return string.IsNullOrEmpty(val) ? null : val;
153153
}
154154

155-
public static string HealthCheckIdentityTokenDomainName => ReadString(HEALTH_CHECK_IDENTITY_TOKEN_DOMAIN_NAME);
156-
157-
public static string HealthCheckUploadTokenDomainName => ReadString(HEALTH_CHECK_UPLOAD_TOKEN_DOMAIN_NAME);
158-
159-
public static string HealthCheckUploadGrantTokenDomainName => ReadString(HEALTH_CHECK_UPLOAD_GRANT_TOKEN_DOMAIN_NAME);
160-
161-
public static string HealthCheckUploadDomainName => ReadString(HEALTH_CHECK_UPLOAD_DOMAIN_NAME);
162-
163-
public static string HealthCheckDiagnosticDomainName => ReadString(HEALTH_CHECK_DIAGNOSTIC_DOMAIN_NAME);
164-
165-
public static string HealthCheckProductKey => ReadString(HEALTH_CHECK_PRODUCT_KEY);
166-
167155
public static string HiddenFeatures => ReadInstalledKey(HIDDEN_FEATURES, RegistryView.Registry32);
168156

169157
public static string AdditionalFeatures => ReadInstalledKey(ADDITIONAL_FEATURES, RegistryView.Registry32);
@@ -202,12 +190,6 @@ public static string GetCustomTokenUrl()
202190
private const string PSExecutionPolicyName = "ExecutionPolicy";
203191
private const string PowerShellKey = @"Software\Microsoft\PowerShell\1";
204192
private const string PowerShellStamp = "Install";
205-
private const string HEALTH_CHECK_IDENTITY_TOKEN_DOMAIN_NAME = "HealthCheckIdentityTokenDomainName";
206-
private const string HEALTH_CHECK_UPLOAD_TOKEN_DOMAIN_NAME = "HealthCheckUploadTokenDomainName";
207-
private const string HEALTH_CHECK_UPLOAD_GRANT_TOKEN_DOMAIN_NAME = "HealthCheckUploadGrantTokenDomainName";
208-
private const string HEALTH_CHECK_UPLOAD_DOMAIN_NAME = "HealthCheckUploadDomainName";
209-
private const string HEALTH_CHECK_DIAGNOSTIC_DOMAIN_NAME = "HealthCheckDiagnosticDomainName";
210-
private const string HEALTH_CHECK_PRODUCT_KEY = "HealthCheckProductKey";
211193
private const string HIDDEN_FEATURES = "HiddenFeatures";
212194
private const string ADDITIONAL_FEATURES = "AdditionalFeatures";
213195
private const string CUSTOM_UPDATES_XML_LOCATION = "CheckForUpdatesXmlLocationOverride";

0 commit comments

Comments
 (0)