Skip to content

Commit 2c31b74

Browse files
fix playback test
1 parent 8ad2ad8 commit 2c31b74

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

src/StorageSync/StorageSync/Interop/Clients/EcsManagementInteropClientPlayback.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,7 @@ public int GetSyncServerCertificate([In, MarshalAs(UnmanagedType.Bool)] bool isP
341341
/// <returns>System.Int32.</returns>
342342
public int GetSyncServerId([MarshalAs(UnmanagedType.BStr), Out] out string serverId)
343343
{
344-
Guid serverGuid;
345-
if (!Guid.TryParse(Environment.GetEnvironmentVariable("REGISTEREDSERVER_SERVER_ID"), out serverGuid))
344+
if (!Guid.TryParse(Environment.GetEnvironmentVariable("REGISTEREDSERVER_SERVER_ID"), out Guid serverGuid))
346345
{
347346
serverGuid = Guid.NewGuid();
348347
}

src/StorageSync/StorageSync/Interop/Clients/SyncServerRegistrationClient.cs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ public override ServerRegistrationData Setup(Uri managementEndpointUri, Guid sub
203203
var serverRegistrationData = new ServerRegistrationData
204204
{
205205
Id = resourceId,
206-
ServerId = Guid.Empty,
206+
ServerId = serverGuid,
207207
ServerCertificate = syncServerCertificate.ToBase64Bytes(true),
208208
ServerRole = isInCluster ? ServerRoleType.ClusterNode : ServerRoleType.Standalone,
209209
ServerOSVersion = osVersion,
@@ -250,15 +250,14 @@ public override ServerRegistrationData Setup(Uri managementEndpointUri, Guid sub
250250
/// </exception>
251251
public override bool Persist(RegisteredServer registeredServerResource, Guid subscriptionId, string storageSyncServiceName, string resourceGroupName, string monitoringDataPath)
252252
{
253-
Guid storageSyncServiceUid = Guid.Empty;
253+
var storageSyncServiceUid = Guid.Empty;
254254
bool hasStorageSyncServiceUid = Guid.TryParse(registeredServerResource.StorageSyncServiceUid, out storageSyncServiceUid);
255255
if (!hasStorageSyncServiceUid)
256256
{
257257
throw new ArgumentException(nameof(registeredServerResource.StorageSyncServiceUid));
258258
}
259259

260-
ServerRoleType serverRole;
261-
bool hasServerRole = Enum.TryParse(registeredServerResource.ServerRole, out serverRole);
260+
bool hasServerRole = Enum.TryParse(registeredServerResource.ServerRole, out ServerRoleType serverRole);
262261
if (!hasServerRole)
263262
{
264263
throw new ArgumentException(nameof(registeredServerResource.ServerRole));
@@ -292,7 +291,12 @@ public override bool Persist(RegisteredServer registeredServerResource, Guid sub
292291
throw new ServerRegistrationException(ServerRegistrationErrorCode.PersistSyncServerRegistrationFailed, hr, ErrorCategory.InvalidResult);
293292
}
294293

295-
var monitoringConfiguration = JsonConvert.DeserializeObject<HybridMonitoringConfigurationResource>(registeredServerResource.MonitoringConfiguration);
294+
var monitoringConfiguration = default(HybridMonitoringConfigurationResource);
295+
296+
if (!string.IsNullOrEmpty(registeredServerResource.MonitoringConfiguration))
297+
{
298+
monitoringConfiguration = JsonConvert.DeserializeObject<HybridMonitoringConfigurationResource>(registeredServerResource.MonitoringConfiguration);
299+
}
296300
var registrationInfo = new ServerRegistrationInformation(
297301
serviceEndpoint: registeredServerResource.ManagementEndpointUri,
298302
subscriptionId: subscriptionId,

0 commit comments

Comments
 (0)