Skip to content

Commit 479fc07

Browse files
committed
Part2; Powershell fix for new hydra changes
1 parent 3880dff commit 479fc07

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/ContainerAPIs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15+
using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
1516
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
1617
using System;
1718
using System.Collections.Generic;
@@ -57,7 +58,6 @@ public BaseRecoveryServicesJobResponse RefreshContainers()
5758
{
5859
string resourceName = BmsAdapter.GetResourceName();
5960
string resourceGroupName = BmsAdapter.GetResourceGroupName();
60-
6161
var response = BmsAdapter.Client.Containers.RefreshAsync(
6262
resourceGroupName, resourceName,
6363
BmsAdapter.GetCustomRequestHeaders(), AzureFabricName, BmsAdapter.CmdletCancellationToken).Result;

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/OperationStatusAPIs.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ public BaseRecoveryServicesJobResponse GetRefreshContainerOperationResultByURL(
3131

3232
return BmsAdapter.Client.Containers.GetRefreshOperationResultByURLAsync(
3333
operationResultLink,
34-
BmsAdapter.GetCustomRequestHeaders(),
3534
BmsAdapter.CmdletCancellationToken).Result;
3635
}
3736

@@ -41,7 +40,7 @@ public BackUpOperationStatusResponse GetProtectedItemOperationStatusByURL(
4140
string resourceName = BmsAdapter.GetResourceName();
4241
string resourceGroupName = BmsAdapter.GetResourceGroupName();
4342

44-
return BmsAdapter.Client.ProtectedItems.GetOperationStatusByURLAsync(
43+
return BmsAdapter.Client.GetOperationStatusByURLAsync(
4544
operationResultLink,
4645
BmsAdapter.GetCustomRequestHeaders(),
4746
BmsAdapter.CmdletCancellationToken).Result;

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/PolicyAPIs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public ProtectionPolicyListResponse ListProtectionPolicy(
5959

6060
public BackUpOperationStatusResponse GetProtectionPolicyOperationStatusByURL(string url)
6161
{
62-
return BmsAdapter.Client.ProtectionPolicies.GetOperationStatusByURLAsync(
62+
return BmsAdapter.Client.GetOperationStatusByURLAsync(
6363
url,
6464
BmsAdapter.GetCustomRequestHeaders(),
6565
BmsAdapter.CmdletCancellationToken).Result;

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/Commands.RecoveryServices.Backup.HydraAdapter.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
<Reference Include="System" />
4747
<Reference Include="System.Configuration" />
4848
<Reference Include="System.Core" />
49+
<Reference Include="System.Net" />
4950
<Reference Include="System.Net.Http" />
5051
<Reference Include="System.Xml.Linq" />
5152
<Reference Include="System.Data.DataSetExtensions" />

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -832,16 +832,14 @@ private bool IsDiscoveryNeeded(string vmName, string rgName, bool isComputeAzure
832832

833833
private void RefreshContainer()
834834
{
835-
bool isDiscoverySuccessful = false;
836835
string errorMessage = string.Empty;
837836
var refreshContainerJobResponse = HydraAdapter.RefreshContainers();
838837

839838
//Now wait for the operation to Complete
840-
WaitForDiscoveryToComplete(refreshContainerJobResponse.Location, out isDiscoverySuccessful, out errorMessage);
841-
842-
if (!isDiscoverySuccessful)
839+
if (refreshContainerJobResponse.StatusCode != System.Net.HttpStatusCode.NoContent)
843840
{
844-
Logger.Instance.ThrowTerminatingError(new ErrorRecord(new Exception(errorMessage), string.Empty, ErrorCategory.InvalidArgument, null));
841+
errorMessage = String.Format(Resources.DiscoveryFailureErrorCode, refreshContainerJobResponse.StatusCode);
842+
Logger.Instance.WriteDebug(errorMessage);
845843
}
846844
}
847845

0 commit comments

Comments
 (0)