From cb35725dd755127c689343ec00ec557b301d692c Mon Sep 17 00:00:00 2001 From: Mihaela Stoica Date: Thu, 20 Aug 2015 16:59:58 +0100 Subject: [PATCH] CP-13074: Finalize the CIS domain names and product key used for retrieving the authentication tokens and upload - change the URLs to the production site - for development and testing these settings should be changed to the staging site via registry keys Signed-off-by: Mihaela Stoica --- .../HealthCheck/HealthCheckAuthenticationAction.cs | 8 ++++---- .../Actions/HealthCheck/UploadServerStatusReportAction.cs | 2 +- .../Actions/HealthCheck/XenServerHealthCheckUpload.cs | 2 +- XenServerHealthCheck/Registry.cs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/XenModel/Actions/HealthCheck/HealthCheckAuthenticationAction.cs b/XenModel/Actions/HealthCheck/HealthCheckAuthenticationAction.cs index 41752cb3c..a8376f083 100644 --- a/XenModel/Actions/HealthCheck/HealthCheckAuthenticationAction.cs +++ b/XenModel/Actions/HealthCheck/HealthCheckAuthenticationAction.cs @@ -57,11 +57,11 @@ namespace XenAdmin.Actions private const string uploadGrantTokenUrl = "/feeds/api/create_grant/"; private const string uploadTokenUrl = "/feeds/api/create_upload/"; - private readonly string identityTokenDomainName = "http://cis-daily.citrite.net"; - private readonly string uploadGrantTokenDomainName = "https://rttf-daily.citrite.net"; - private readonly string uploadTokenDomainName = "https://rttf-daily.citrite.net"; + private readonly string identityTokenDomainName = "https://cis.citrix.com"; + private readonly string uploadGrantTokenDomainName = "https://rttf.citrix.com"; + private readonly string uploadTokenDomainName = "https://rttf.citrix.com"; - private readonly string productKey = "eb1b224c461038baf1f08dfba6b8d4b4413f96c7"; + private readonly string productKey = "1a2d94a4263cd016dd7a7d510bde87f058a0b75d"; public HealthCheckAuthenticationAction(Pool pool, string username, string password, bool saveTokenAsSecret, long tokenExpiration, bool suppressHistory) : base(pool != null ? pool.Connection : null, Messages.ACTION_HEALTHCHECK_AUTHENTICATION, Messages.ACTION_HEALTHCHECK_AUTHENTICATION_PROGRESS, suppressHistory) diff --git a/XenModel/Actions/HealthCheck/UploadServerStatusReportAction.cs b/XenModel/Actions/HealthCheck/UploadServerStatusReportAction.cs index 02e94d48a..e1bc7c296 100644 --- a/XenModel/Actions/HealthCheck/UploadServerStatusReportAction.cs +++ b/XenModel/Actions/HealthCheck/UploadServerStatusReportAction.cs @@ -44,7 +44,7 @@ namespace XenAdmin.Actions private readonly string bundleToUpload; private const string UPLOAD_URL = "/feeds/api/"; - private readonly string UPLOAD_DOMAIN_NAME = "http://cis-daily.citrite.com"; + private readonly string UPLOAD_DOMAIN_NAME = "https://rttf.citrix.com"; private CancellationTokenSource cts; diff --git a/XenModel/Actions/HealthCheck/XenServerHealthCheckUpload.cs b/XenModel/Actions/HealthCheck/XenServerHealthCheckUpload.cs index 76e8b34c5..338023e3e 100644 --- a/XenModel/Actions/HealthCheck/XenServerHealthCheckUpload.cs +++ b/XenModel/Actions/HealthCheck/XenServerHealthCheckUpload.cs @@ -44,7 +44,7 @@ namespace XenServerHealthCheck public class XenServerHealthCheckUpload { private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); - public string UPLOAD_URL = "https://rttf-staging.citrix.com/feeds/api/"; + public string UPLOAD_URL = "https://rttf.citrix.com/feeds/api/"; public const int CHUNK_SIZE = 1 * 1024 * 1024; private JavaScriptSerializer serializer; private int verbosityLevel; diff --git a/XenServerHealthCheck/Registry.cs b/XenServerHealthCheck/Registry.cs index 51866be99..1c07ccf01 100755 --- a/XenServerHealthCheck/Registry.cs +++ b/XenServerHealthCheck/Registry.cs @@ -107,7 +107,7 @@ namespace XenServerHealthCheck { string domain_name = ReadKey(HEALTH_CHECK_UPLOAD_DOMAIN_NAME); if (string.IsNullOrEmpty(domain_name)) - return "https://rttf-staging.citrix.com/feeds/api/"; + return "https://rttf.citrix.com/feeds/api/"; return domain_name; } }