From dc9a75a0d8bf59f382c8bf9d89c398da8b8ec71a Mon Sep 17 00:00:00 2001
From: avjai <34567499+avjai@users.noreply.github.com>
Date: Sat, 15 Jan 2022 00:33:37 +0530
Subject: [PATCH] Adding the new paramaters zone/placementGroupId to
ForceRecoveryServiceFabricPlatformUpdateDomainWalk (#25897)
---
.../IVirtualMachineScaleSetsOperations.cs | 10 ++++++++-
.../VirtualMachineScaleSetsOperations.cs | 19 +++++++++++++++-
...ualMachineScaleSetsOperationsExtensions.cs | 22 +++++++++++++++----
.../VMScaleSetServiceFabricScenarioTests.cs | 12 +++++-----
4 files changed, 51 insertions(+), 12 deletions(-)
diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/IVirtualMachineScaleSetsOperations.cs b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/IVirtualMachineScaleSetsOperations.cs
index 3f374cc248d5..f7e63a1b2a60 100644
--- a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/IVirtualMachineScaleSetsOperations.cs
+++ b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/IVirtualMachineScaleSetsOperations.cs
@@ -584,6 +584,14 @@ public partial interface IVirtualMachineScaleSetsOperations
/// The platform update domain for which a manual recovery walk is
/// requested
///
+ ///
+ /// The zone in which the manual recovery walk is requested for cross
+ /// zone virtual machine scale set
+ ///
+ ///
+ /// The placement group id for which the manual recovery walk is
+ /// requested.
+ ///
///
/// The headers that will be added to request.
///
@@ -599,7 +607,7 @@ public partial interface IVirtualMachineScaleSetsOperations
///
/// Thrown when a required parameter is null
///
- Task> ForceRecoveryServiceFabricPlatformUpdateDomainWalkWithHttpMessagesAsync(string resourceGroupName, string vmScaleSetName, int platformUpdateDomain, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+ Task> ForceRecoveryServiceFabricPlatformUpdateDomainWalkWithHttpMessagesAsync(string resourceGroupName, string vmScaleSetName, int platformUpdateDomain, string zone = default(string), string placementGroupId = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
///
/// Converts SinglePlacementGroup property to false for a existing
/// virtual machine scale set.
diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/VirtualMachineScaleSetsOperations.cs b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/VirtualMachineScaleSetsOperations.cs
index 4a4a1ca0ffab..6fd786c49c0a 100644
--- a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/VirtualMachineScaleSetsOperations.cs
+++ b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/VirtualMachineScaleSetsOperations.cs
@@ -1768,6 +1768,13 @@ internal VirtualMachineScaleSetsOperations(ComputeManagementClient client)
///
/// The platform update domain for which a manual recovery walk is requested
///
+ ///
+ /// The zone in which the manual recovery walk is requested for cross zone
+ /// virtual machine scale set
+ ///
+ ///
+ /// The placement group id for which the manual recovery walk is requested.
+ ///
///
/// Headers that will be added to request.
///
@@ -1789,7 +1796,7 @@ internal VirtualMachineScaleSetsOperations(ComputeManagementClient client)
///
/// A response object containing the response body and response headers.
///
- public async Task> ForceRecoveryServiceFabricPlatformUpdateDomainWalkWithHttpMessagesAsync(string resourceGroupName, string vmScaleSetName, int platformUpdateDomain, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+ public async Task> ForceRecoveryServiceFabricPlatformUpdateDomainWalkWithHttpMessagesAsync(string resourceGroupName, string vmScaleSetName, int platformUpdateDomain, string zone = default(string), string placementGroupId = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
{
if (resourceGroupName == null)
{
@@ -1815,6 +1822,8 @@ internal VirtualMachineScaleSetsOperations(ComputeManagementClient client)
tracingParameters.Add("vmScaleSetName", vmScaleSetName);
tracingParameters.Add("apiVersion", apiVersion);
tracingParameters.Add("platformUpdateDomain", platformUpdateDomain);
+ tracingParameters.Add("zone", zone);
+ tracingParameters.Add("placementGroupId", placementGroupId);
tracingParameters.Add("cancellationToken", cancellationToken);
ServiceClientTracing.Enter(_invocationId, this, "ForceRecoveryServiceFabricPlatformUpdateDomainWalk", tracingParameters);
}
@@ -1830,6 +1839,14 @@ internal VirtualMachineScaleSetsOperations(ComputeManagementClient client)
_queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
}
_queryParameters.Add(string.Format("platformUpdateDomain={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(platformUpdateDomain, Client.SerializationSettings).Trim('"'))));
+ if (zone != null)
+ {
+ _queryParameters.Add(string.Format("zone={0}", System.Uri.EscapeDataString(zone)));
+ }
+ if (placementGroupId != null)
+ {
+ _queryParameters.Add(string.Format("placementGroupId={0}", System.Uri.EscapeDataString(placementGroupId)));
+ }
if (_queryParameters.Count > 0)
{
_url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/VirtualMachineScaleSetsOperationsExtensions.cs b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/VirtualMachineScaleSetsOperationsExtensions.cs
index 2464f42725f3..0a336a613878 100644
--- a/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/VirtualMachineScaleSetsOperationsExtensions.cs
+++ b/sdk/compute/Microsoft.Azure.Management.Compute/src/Generated/VirtualMachineScaleSetsOperationsExtensions.cs
@@ -952,9 +952,16 @@ public static void UpdateInstances(this IVirtualMachineScaleSetsOperations opera
///
/// The platform update domain for which a manual recovery walk is requested
///
- public static RecoveryWalkResponse ForceRecoveryServiceFabricPlatformUpdateDomainWalk(this IVirtualMachineScaleSetsOperations operations, string resourceGroupName, string vmScaleSetName, int platformUpdateDomain)
+ ///
+ /// The zone in which the manual recovery walk is requested for cross zone
+ /// virtual machine scale set
+ ///
+ ///
+ /// The placement group id for which the manual recovery walk is requested.
+ ///
+ public static RecoveryWalkResponse ForceRecoveryServiceFabricPlatformUpdateDomainWalk(this IVirtualMachineScaleSetsOperations operations, string resourceGroupName, string vmScaleSetName, int platformUpdateDomain, string zone = default(string), string placementGroupId = default(string))
{
- return operations.ForceRecoveryServiceFabricPlatformUpdateDomainWalkAsync(resourceGroupName, vmScaleSetName, platformUpdateDomain).GetAwaiter().GetResult();
+ return operations.ForceRecoveryServiceFabricPlatformUpdateDomainWalkAsync(resourceGroupName, vmScaleSetName, platformUpdateDomain, zone, placementGroupId).GetAwaiter().GetResult();
}
///
@@ -973,12 +980,19 @@ public static RecoveryWalkResponse ForceRecoveryServiceFabricPlatformUpdateDomai
///
/// The platform update domain for which a manual recovery walk is requested
///
+ ///
+ /// The zone in which the manual recovery walk is requested for cross zone
+ /// virtual machine scale set
+ ///
+ ///
+ /// The placement group id for which the manual recovery walk is requested.
+ ///
///
/// The cancellation token.
///
- public static async Task ForceRecoveryServiceFabricPlatformUpdateDomainWalkAsync(this IVirtualMachineScaleSetsOperations operations, string resourceGroupName, string vmScaleSetName, int platformUpdateDomain, CancellationToken cancellationToken = default(CancellationToken))
+ public static async Task ForceRecoveryServiceFabricPlatformUpdateDomainWalkAsync(this IVirtualMachineScaleSetsOperations operations, string resourceGroupName, string vmScaleSetName, int platformUpdateDomain, string zone = default(string), string placementGroupId = default(string), CancellationToken cancellationToken = default(CancellationToken))
{
- using (var _result = await operations.ForceRecoveryServiceFabricPlatformUpdateDomainWalkWithHttpMessagesAsync(resourceGroupName, vmScaleSetName, platformUpdateDomain, null, cancellationToken).ConfigureAwait(false))
+ using (var _result = await operations.ForceRecoveryServiceFabricPlatformUpdateDomainWalkWithHttpMessagesAsync(resourceGroupName, vmScaleSetName, platformUpdateDomain, zone, placementGroupId, null, cancellationToken).ConfigureAwait(false))
{
return _result.Body;
}
diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/tests/VMScaleSetTests/VMScaleSetServiceFabricScenarioTests.cs b/sdk/compute/Microsoft.Azure.Management.Compute/tests/VMScaleSetTests/VMScaleSetServiceFabricScenarioTests.cs
index db33550c9ade..87bfa714c419 100644
--- a/sdk/compute/Microsoft.Azure.Management.Compute/tests/VMScaleSetTests/VMScaleSetServiceFabricScenarioTests.cs
+++ b/sdk/compute/Microsoft.Azure.Management.Compute/tests/VMScaleSetTests/VMScaleSetServiceFabricScenarioTests.cs
@@ -32,23 +32,23 @@ private void TestVMScaleSetServiceFabricImpl(MockContext context)
string rgName = "crptestrgr97ryo0ni";
string vmssName = "crptesthtn39hve";
- var response = m_CrpClient.VirtualMachineScaleSets.ForceRecoveryServiceFabricPlatformUpdateDomainWalk(rgName, vmssName, 0);
+ var response = m_CrpClient.VirtualMachineScaleSets.ForceRecoveryServiceFabricPlatformUpdateDomainWalk(rgName, vmssName, 0, string.Empty, string.Empty);
Assert.True(response.WalkPerformed);
Assert.Equal(1, response.NextPlatformUpdateDomain);
- response = m_CrpClient.VirtualMachineScaleSets.ForceRecoveryServiceFabricPlatformUpdateDomainWalk(rgName, vmssName, 1);
+ response = m_CrpClient.VirtualMachineScaleSets.ForceRecoveryServiceFabricPlatformUpdateDomainWalk(rgName, vmssName, 1, string.Empty, string.Empty);
Assert.True(response.WalkPerformed);
Assert.Equal(2, response.NextPlatformUpdateDomain);
- response = m_CrpClient.VirtualMachineScaleSets.ForceRecoveryServiceFabricPlatformUpdateDomainWalk(rgName, vmssName, 2);
+ response = m_CrpClient.VirtualMachineScaleSets.ForceRecoveryServiceFabricPlatformUpdateDomainWalk(rgName, vmssName, 2, string.Empty, string.Empty);
Assert.True(response.WalkPerformed);
Assert.Equal(3, response.NextPlatformUpdateDomain);
- response= m_CrpClient.VirtualMachineScaleSets.ForceRecoveryServiceFabricPlatformUpdateDomainWalk(rgName, vmssName, 3);
+ response= m_CrpClient.VirtualMachineScaleSets.ForceRecoveryServiceFabricPlatformUpdateDomainWalk(rgName, vmssName, 3, string.Empty, string.Empty);
Assert.True(response.WalkPerformed);
Assert.Equal(4, response.NextPlatformUpdateDomain);
- response = m_CrpClient.VirtualMachineScaleSets.ForceRecoveryServiceFabricPlatformUpdateDomainWalk(rgName, vmssName, 4);
+ response = m_CrpClient.VirtualMachineScaleSets.ForceRecoveryServiceFabricPlatformUpdateDomainWalk(rgName, vmssName, 4, string.Empty, string.Empty);
Assert.True(response.WalkPerformed);
Assert.Equal(5, response.NextPlatformUpdateDomain);
- response = m_CrpClient.VirtualMachineScaleSets.ForceRecoveryServiceFabricPlatformUpdateDomainWalk(rgName, vmssName, 5);
+ response = m_CrpClient.VirtualMachineScaleSets.ForceRecoveryServiceFabricPlatformUpdateDomainWalk(rgName, vmssName, 5, string.Empty, string.Empty);
Assert.True(response.WalkPerformed);
Assert.Null(response.NextPlatformUpdateDomain);
}