Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 15:29:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Typo.

Browse Source 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2020-06-01 14:14:50 +01:00
parent 9ec3dc3127
commit ec7fc14c18
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
XenAdmin/Dialogs/HealthCheck/HealthCheckOverviewDialog.cs
View File

@ -367,10 +367,10 @@ namespace XenAdmin.Dialogs.HealthCheck
if (healthCheckSettings.CanRequestNewUpload)
{
healthCheckSettings.NewUploadRequest = HealthCheckSettings.DateTimeToString(DateTime.UtcNow);
var token = healthCheckSettings.GetSecretyInfo(poolRow.Pool.Connection, HealthCheckSettings.UPLOAD_TOKEN_SECRET);
var diagnosticToken = healthCheckSettings.GetSecretyInfo(poolRow.Pool.Connection, HealthCheckSettings.DIAGNOSTIC_TOKEN_SECRET);
var user = healthCheckSettings.GetSecretyInfo(poolRow.Pool.Connection, HealthCheckSettings.UPLOAD_CREDENTIAL_USER_SECRET);
var password = healthCheckSettings.GetSecretyInfo(poolRow.Pool.Connection, HealthCheckSettings.UPLOAD_CREDENTIAL_PASSWORD_SECRET);
var token = healthCheckSettings.GetSecretInfo(poolRow.Pool.Connection, HealthCheckSettings.UPLOAD_TOKEN_SECRET);
var diagnosticToken = healthCheckSettings.GetSecretInfo(poolRow.Pool.Connection, HealthCheckSettings.DIAGNOSTIC_TOKEN_SECRET);
var user = healthCheckSettings.GetSecretInfo(poolRow.Pool.Connection, HealthCheckSettings.UPLOAD_CREDENTIAL_USER_SECRET);
var password = healthCheckSettings.GetSecretInfo(poolRow.Pool.Connection, HealthCheckSettings.UPLOAD_CREDENTIAL_PASSWORD_SECRET);
new SaveHealthCheckSettingsAction(poolRow.Pool, healthCheckSettings, token, diagnosticToken, user, password, false).RunAsync();
}
}

6
XenAdmin/Dialogs/HealthCheck/HealthCheckSettingsDialog.cs
View File

@ -66,8 +66,8 @@ namespace XenAdmin.Dialogs.HealthCheck
healthCheckSettings.Status = HealthCheckStatus.Enabled;
authenticated = healthCheckSettings.TryGetExistingTokens(pool.Connection, out authenticationToken, out diagnosticToken);
authenticationRequired = !authenticated;
xsUserName = healthCheckSettings.GetSecretyInfo(pool.Connection, HealthCheckSettings.UPLOAD_CREDENTIAL_USER_SECRET);
xsPassword = healthCheckSettings.GetSecretyInfo(pool.Connection, HealthCheckSettings.UPLOAD_CREDENTIAL_PASSWORD_SECRET);
xsUserName = healthCheckSettings.GetSecretInfo(pool.Connection, HealthCheckSettings.UPLOAD_CREDENTIAL_USER_SECRET);
xsPassword = healthCheckSettings.GetSecretInfo(pool.Connection, HealthCheckSettings.UPLOAD_CREDENTIAL_PASSWORD_SECRET);
InitializeComponent();
PopulateControls();
InitializeControls();
@ -157,7 +157,7 @@ namespace XenAdmin.Dialogs.HealthCheck
return true;
if (timeOfDayComboBox.SelectedIndex != healthCheckSettings.TimeOfDay)
return true;
if (authenticationToken != healthCheckSettings.GetSecretyInfo(pool.Connection, HealthCheckSettings.UPLOAD_TOKEN_SECRET))
if (authenticationToken != healthCheckSettings.GetSecretInfo(pool.Connection, HealthCheckSettings.UPLOAD_TOKEN_SECRET))
return true;
if (textboxXSUserName.Text != xsUserName)
return true;

4
XenAdmin/MainWindow.cs
View File

@ -992,8 +992,8 @@ namespace XenAdmin
return;
var newHealthCheckSSettings = pool.HealthCheckSettings();
new TransferHealthCheckSettingsAction(pool, newHealthCheckSSettings,
newHealthCheckSSettings.GetSecretyInfo(pool.Connection, HealthCheckSettings.UPLOAD_CREDENTIAL_USER_SECRET),
newHealthCheckSSettings.GetSecretyInfo(pool.Connection, HealthCheckSettings.UPLOAD_CREDENTIAL_PASSWORD_SECRET), true).RunAsync();
newHealthCheckSSettings.GetSecretInfo(pool.Connection, HealthCheckSettings.UPLOAD_CREDENTIAL_USER_SECRET),
newHealthCheckSSettings.GetSecretInfo(pool.Connection, HealthCheckSettings.UPLOAD_CREDENTIAL_PASSWORD_SECRET), true).RunAsync();
}
private static bool SameProductBrand(Host host)

2
XenModel/Actions/HealthCheck/GetHealthCheckAnalysisResultAction.cs
View File

@ -71,7 +71,7 @@ namespace XenAdmin.Actions
{
var healthCheckSettings = Pool.HealthCheckSettings();
var diagnosticToken = healthCheckSettings.GetSecretyInfo(Session, HealthCheckSettings.DIAGNOSTIC_TOKEN_SECRET);
var diagnosticToken = healthCheckSettings.GetSecretInfo(Session, HealthCheckSettings.DIAGNOSTIC_TOKEN_SECRET);
if (string.IsNullOrEmpty(diagnosticToken))
{
log.DebugFormat("Cannot get the diagnostic result for {0}, because couldn't retrieve the diagnostic token", Pool.Name());

14
XenModel/HealthCheckSettings.cs
View File

@ -298,7 +298,7 @@ namespace XenAdmin.Model
#endregion
public string GetSecretyInfo(Session session, string secretType)
public string GetSecretInfo(Session session, string secretType)
{
string UUID = string.Empty;
switch (secretType)
@ -334,11 +334,11 @@ namespace XenAdmin.Model
}
}
public string GetSecretyInfo(IXenConnection connection, string secretType)
public string GetSecretInfo(IXenConnection connection, string secretType)
{
if (connection == null)
return null;
return GetSecretyInfo(connection.Session, secretType);
return GetSecretInfo(connection.Session, secretType);
}
public bool TryGetExistingTokens(IXenConnection connection, out string uploadToken, out string diagnosticToken)
@ -348,8 +348,8 @@ namespace XenAdmin.Model
if (connection == null)
return false;
uploadToken = GetSecretyInfo(connection, UPLOAD_TOKEN_SECRET);
diagnosticToken = GetSecretyInfo(connection, DIAGNOSTIC_TOKEN_SECRET);
uploadToken = GetSecretInfo(connection, UPLOAD_TOKEN_SECRET);
diagnosticToken = GetSecretInfo(connection, DIAGNOSTIC_TOKEN_SECRET);
if (!String.IsNullOrEmpty(uploadToken) && !String.IsNullOrEmpty(diagnosticToken))
return true;
@ -369,8 +369,8 @@ namespace XenAdmin.Model
if (poolOfOne != null)
{
var healthCheckSettings = poolOfOne.HealthCheckSettings();
uploadToken = healthCheckSettings.GetSecretyInfo(connection, UPLOAD_TOKEN_SECRET);
diagnosticToken = healthCheckSettings.GetSecretyInfo(connection, DIAGNOSTIC_TOKEN_SECRET);
uploadToken = healthCheckSettings.GetSecretInfo(connection, UPLOAD_TOKEN_SECRET);
diagnosticToken = healthCheckSettings.GetSecretInfo(connection, DIAGNOSTIC_TOKEN_SECRET);
if (!String.IsNullOrEmpty(uploadToken) && !String.IsNullOrEmpty(diagnosticToken))
return true;
}