Merge pull request #278 from MabOneSdk/mkheranidev1

powershell fix for new hydra changes

Author: mkherani

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

@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
 using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
 using System;
 using System.Collections.Generic;
@@ -30,7 +31,7 @@ public partial class HydraAdapter
         /// <returns></returns>
         public IEnumerable<ProtectionContainerResource> ListContainers(ProtectionContainerListQueryParams queryParams)
         {
-            var listResponse = BmsAdapter.Client.Container.ListAsync(BmsAdapter.GetResourceGroupName(), BmsAdapter.GetResourceName(), queryParams,
+            var listResponse = BmsAdapter.Client.Containers.ListAsync(BmsAdapter.GetResourceGroupName(), BmsAdapter.GetResourceName(), queryParams,
                 BmsAdapter.GetCustomRequestHeaders(), BmsAdapter.CmdletCancellationToken).Result;
             return listResponse.ItemList.ProtectionContainers;
         }
@@ -44,7 +45,7 @@ public IEnumerable<BackupEngineResource> ListBackupEngines(BackupEngineListQuery
         {
             PaginationRequest paginationParam = new PaginationRequest();
             paginationParam.Top = "200";
-            var listResponse = BmsAdapter.Client.BackupEngine.ListAsync(BmsAdapter.GetResourceGroupName(), BmsAdapter.GetResourceName(), queryParams, paginationParam,
+            var listResponse = BmsAdapter.Client.BackupEngines.ListAsync(BmsAdapter.GetResourceGroupName(), BmsAdapter.GetResourceName(), queryParams, paginationParam,
                 BmsAdapter.GetCustomRequestHeaders(), BmsAdapter.CmdletCancellationToken).Result;
             return listResponse.ItemList.BackupEngines;
         }
@@ -57,8 +58,7 @@ public BaseRecoveryServicesJobResponse RefreshContainers()
         {
             string resourceName = BmsAdapter.GetResourceName();
             string resourceGroupName = BmsAdapter.GetResourceGroupName();
-
-            var response = BmsAdapter.Client.Container.RefreshAsync(
+            var response = BmsAdapter.Client.Containers.RefreshAsync(
                 resourceGroupName, resourceName,
                 BmsAdapter.GetCustomRequestHeaders(), AzureFabricName, BmsAdapter.CmdletCancellationToken).Result;
             return response;
@@ -73,7 +73,7 @@ public AzureOperationResponse UnregisterContainers(string containerName)
             string resourceName = BmsAdapter.GetResourceName();
             string resourceGroupName = BmsAdapter.GetResourceGroupName();
 
-            var response = BmsAdapter.Client.Container.UnregisterAsync(
+            var response = BmsAdapter.Client.Containers.UnregisterAsync(
                 resourceGroupName, resourceName, containerName,
                 BmsAdapter.GetCustomRequestHeaders(), BmsAdapter.CmdletCancellationToken).Result;
             return response;

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

@@ -31,7 +31,7 @@ public BaseRecoveryServicesJobResponse CreateOrUpdateProtectedItem(
             string resourceName = BmsAdapter.GetResourceName();
             string resourceGroupName = BmsAdapter.GetResourceGroupName();
 
-            return BmsAdapter.Client.ProtectedItem.CreateOrUpdateProtectedItemAsync(
+            return BmsAdapter.Client.ProtectedItems.CreateOrUpdateProtectedItemAsync(
                                      resourceGroupName,
                                      resourceName,
                                      AzureFabricName,
@@ -49,7 +49,7 @@ public BaseRecoveryServicesJobResponse DeleteProtectedItem(
             string resourceName = BmsAdapter.GetResourceName();
             string resourceGroupName = BmsAdapter.GetResourceGroupName();
 
-            return BmsAdapter.Client.ProtectedItem.DeleteProtectedItemAsync(
+            return BmsAdapter.Client.ProtectedItems.DeleteProtectedItemAsync(
                                      resourceGroupName,
                                      resourceName,
                                      AzureFabricName,
@@ -67,7 +67,7 @@ public ProtectedItemResponse GetProtectedItem(
             string resourceName = BmsAdapter.GetResourceName();
             string resourceGroupName = BmsAdapter.GetResourceGroupName();
 
-            return BmsAdapter.Client.ProtectedItem.GetAsync(
+            return BmsAdapter.Client.ProtectedItems.GetAsync(
                                      resourceGroupName,
                                      resourceName,
                                      AzureFabricName,
@@ -85,7 +85,7 @@ public ProtectedItemListResponse ListProtectedItem(
             string resourceName = BmsAdapter.GetResourceName();
             string resourceGroupName = BmsAdapter.GetResourceGroupName();
 
-            return BmsAdapter.Client.ProtectedItem.ListAsync(
+            return BmsAdapter.Client.ProtectedItems.ListAsync(
                                      resourceGroupName,
                                      resourceName, 
                                      queryFilter,

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

@@ -24,7 +24,7 @@ public JobResponse GetJob(string jobId)
             string resourceName = BmsAdapter.GetResourceName();
             string resourceGroupName = BmsAdapter.GetResourceGroupName();
 
-            return BmsAdapter.Client.Job.GetAsync(
+            return BmsAdapter.Client.Jobs.GetAsync(
                 resourceGroupName,
                 resourceName,
                 jobId,
@@ -64,7 +64,7 @@ public JobListResponse GetJobs(
                 status,
                 operation);
 
-            return BmsAdapter.Client.Job.ListAsync(
+            return BmsAdapter.Client.Jobs.ListAsync(
                 resourceGroupName,
                 resourceName,
                 commonFilters,
@@ -78,7 +78,7 @@ public BaseRecoveryServicesJobResponse CancelJob(string jobId)
             string resourceName = BmsAdapter.GetResourceName();
             string resourceGroupName = BmsAdapter.GetResourceGroupName();
 
-            return BmsAdapter.Client.Job.CancelJobAsync(
+            return BmsAdapter.Client.Jobs.CancelJobAsync(
                 resourceGroupName,
                 resourceName,
                 jobId,
@@ -91,7 +91,7 @@ public JobResponse GetJobOperationStatus(string jobId, string operationId)
             string resourceName = BmsAdapter.GetResourceName();
             string resourceGroupName = BmsAdapter.GetResourceGroupName();
 
-            return BmsAdapter.Client.Job.GetOperationResultAsync(
+            return BmsAdapter.Client.Jobs.GetOperationResultAsync(
                 resourceGroupName,
                 resourceName,
                 jobId,

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

@@ -29,9 +29,8 @@ public BaseRecoveryServicesJobResponse GetRefreshContainerOperationResultByURL(
             string resourceName = BmsAdapter.GetResourceName();
             string resourceGroupName = BmsAdapter.GetResourceGroupName();
 
-            return BmsAdapter.Client.Container.GetRefreshOperationResultByURLAsync(
+            return BmsAdapter.Client.Containers.GetRefreshOperationResultByURLAsync(
                                      operationResultLink,
-                                     BmsAdapter.GetCustomRequestHeaders(),
                                      BmsAdapter.CmdletCancellationToken).Result;
         }
 
@@ -41,7 +40,7 @@ public BackUpOperationStatusResponse GetProtectedItemOperationStatusByURL(
             string resourceName = BmsAdapter.GetResourceName();
             string resourceGroupName = BmsAdapter.GetResourceGroupName();
 
-            return BmsAdapter.Client.ProtectedItem.GetOperationStatusByURLAsync(
+            return BmsAdapter.Client.GetOperationStatusByURLAsync(
                                      operationResultLink,
                                      BmsAdapter.GetCustomRequestHeaders(),
                                      BmsAdapter.CmdletCancellationToken).Result;

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

@@ -27,7 +27,7 @@ public ProtectionPolicyResponse CreateOrUpdateProtectionPolicy(
                 string policyName,
                 ProtectionPolicyRequest request)
         {           
-            return BmsAdapter.Client.ProtectionPolicy.CreateOrUpdateAsync(
+            return BmsAdapter.Client.ProtectionPolicies.CreateOrUpdateAsync(
                                      BmsAdapter.GetResourceGroupName(),
                                      BmsAdapter.GetResourceName(), 
                                      policyName, 
@@ -38,7 +38,7 @@ public ProtectionPolicyResponse CreateOrUpdateProtectionPolicy(
 
         public ProtectionPolicyResponse GetProtectionPolicy(string policyName)
         {
-            return BmsAdapter.Client.ProtectionPolicy.GetAsync(
+            return BmsAdapter.Client.ProtectionPolicies.GetAsync(
                                      BmsAdapter.GetResourceGroupName(),
                                      BmsAdapter.GetResourceName(),
                                      policyName,
@@ -49,7 +49,7 @@ public ProtectionPolicyResponse GetProtectionPolicy(string policyName)
         public ProtectionPolicyListResponse ListProtectionPolicy(
                                             ProtectionPolicyQueryParameters queryFilter)
         {           
-            return BmsAdapter.Client.ProtectionPolicy.ListAsync(
+            return BmsAdapter.Client.ProtectionPolicies.ListAsync(
                                      BmsAdapter.GetResourceGroupName(),
                                      BmsAdapter.GetResourceName(),
                                      queryFilter,
@@ -59,7 +59,7 @@ public ProtectionPolicyListResponse ListProtectionPolicy(
 
         public BackUpOperationStatusResponse GetProtectionPolicyOperationStatusByURL(string url)
         {
-            return BmsAdapter.Client.ProtectionPolicy.GetOperationStatusByURLAsync(
+            return BmsAdapter.Client.GetOperationStatusByURLAsync(
                               url,
                               BmsAdapter.GetCustomRequestHeaders(),
                               BmsAdapter.CmdletCancellationToken).Result;                              
@@ -68,7 +68,7 @@ public BackUpOperationStatusResponse GetProtectionPolicyOperationStatusByURL(str
         public AzureOperationResponse RemoveProtectionPolicy(
                 string policyName)
         {
-            return BmsAdapter.Client.ProtectionPolicy.DeleteAsync(
+            return BmsAdapter.Client.ProtectionPolicies.DeleteAsync(
                                      BmsAdapter.GetResourceGroupName(),
                                      BmsAdapter.GetResourceName(),
                                      policyName,

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

@@ -30,7 +30,7 @@ public ProtectableObjectListResponse ListProtectableItem(
             string resourceName = BmsAdapter.GetResourceName();
             string resourceGroupName = BmsAdapter.GetResourceGroupName();
 
-            return BmsAdapter.Client.ProtectableObject.ListAsync(
+            return BmsAdapter.Client.ProtectableObjects.ListAsync(
                                      resourceGroupName,
                                      resourceName,
                                      queryFilter,
@@ -41,7 +41,7 @@ public ProtectableObjectListResponse ListProtectableItem(
 
         public BaseRecoveryServicesJobResponse TriggerBackup(string containerName, string itemName)
         {
-            return BmsAdapter.Client.Backup.TriggerBackupAsync(
+            return BmsAdapter.Client.Backups.TriggerBackupAsync(
                 BmsAdapter.GetResourceGroupName(),
                 BmsAdapter.GetResourceName(),
                 BmsAdapter.GetCustomRequestHeaders(),

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

@@ -37,7 +37,7 @@ public RecoveryPointResponse GetRecoveryPointDetails(string containerName, strin
             string resourceGroupName = BmsAdapter.GetResourceGroupName();
             string resourceName = BmsAdapter.GetResourceName();
 
-            var response = BmsAdapter.Client.RecoveryPoint.GetAsync(resourceGroupName, resourceName,
+            var response = BmsAdapter.Client.RecoveryPoints.GetAsync(resourceGroupName, resourceName,
                 BmsAdapter.GetCustomRequestHeaders(), AzureFabricName, containerName, protectedItemName, recoveryPointId, BmsAdapter.CmdletCancellationToken).Result;
 
             return response;
@@ -57,7 +57,7 @@ public RecoveryPointListResponse GetRecoveryPoints(string containerName, string
             string resourceGroupName = BmsAdapter.GetResourceGroupName();
             string resourceName = BmsAdapter.GetResourceName();
 
-            var response = BmsAdapter.Client.RecoveryPoint.ListAsync(resourceGroupName, resourceName,
+            var response = BmsAdapter.Client.RecoveryPoints.ListAsync(resourceGroupName, resourceName,
                 BmsAdapter.GetCustomRequestHeaders(), AzureFabricName, containerName, protectedItemName, queryFilter, BmsAdapter.CmdletCancellationToken).Result;
 
             return response;

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

@@ -60,7 +60,7 @@ public BaseRecoveryServicesJobResponse RestoreDisk(AzureRmRecoveryServicesIaasVm
             triggerRestoreRequest.Item.Properties = new RestoreRequest();
             triggerRestoreRequest.Item.Properties = restoreRequest;
 
-            var response = BmsAdapter.Client.Restore.TriggerRestoreAsync(resourceGroupName, resourceName, BmsAdapter.GetCustomRequestHeaders(),
+            var response = BmsAdapter.Client.Restores.TriggerRestoreAsync(resourceGroupName, resourceName, BmsAdapter.GetCustomRequestHeaders(),
                 AzureFabricName, containerName, protectedItemName, recoveryPointId, triggerRestoreRequest, BmsAdapter.CmdletCancellationToken).Result;
 
             return response;

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/Resources/Microsoft.Azure.Management.RecoveryServices.Backup.dll

@@ -832,30 +832,13 @@ private bool IsDiscoveryNeeded(string vmName, string rgName, bool isComputeAzure
 
         private void RefreshContainer()
         {
-            bool isDiscoverySuccessful = false;
             string errorMessage = string.Empty;
             var refreshContainerJobResponse = HydraAdapter.RefreshContainers();
 
             //Now wait for the operation to Complete
-            WaitForDiscoveryToComplete(refreshContainerJobResponse.Location, out isDiscoverySuccessful, out errorMessage);
-
-            if (!isDiscoverySuccessful)
-            {
-                Logger.Instance.ThrowTerminatingError(new ErrorRecord(new Exception(errorMessage), string.Empty, ErrorCategory.InvalidArgument, null));
-            }
-        }
-
-        private void WaitForDiscoveryToComplete(string locationUri, out bool isDiscoverySuccessful, out string errorMessage)
-        {
-            var status = TrackRefreshContainerOperation(locationUri);
-            errorMessage = String.Empty;
-
-            isDiscoverySuccessful = true;
-            //If operation fails check if retry is needed or not
-            if (status != HttpStatusCode.NoContent)
+            if (refreshContainerJobResponse.StatusCode != System.Net.HttpStatusCode.NoContent)
             {
-                isDiscoverySuccessful = false;
-                errorMessage = String.Format(Resources.DiscoveryFailureErrorCode, status);
+                errorMessage = String.Format(Resources.DiscoveryFailureErrorCode, refreshContainerJobResponse.StatusCode);
                 Logger.Instance.WriteDebug(errorMessage);
             }
         }