Added -Vault parameter to RecoveryServices.Backup cmdlets (#6327)

* Added -Vault parameter to RecoveryServices.Backup cmdlets

* Updating changelog

* Updating help files

* Updating help

* Added test case for Set Vault Context cmdlet usage.

* Undoing unwanted changes to tools/AzureRM/AzureRM.psm1

* Using VaultId and VaultLocation instead of Vault.

* Fixing test failures

* Moved VaultLocation to Restore cmdlet only.

* Update Backup-AzureRmRecoveryServicesBackupItem.md

* Update Disable-AzureRmRecoveryServicesBackupProtection.md

* Update Disable-AzureRmRecoveryServicesBackupRPMountScript.md

* Update Wait-AzureRmRecoveryServicesBackupJob.md

* Update Unregister-AzureRmRecoveryServicesBackupManagementServer.md

* Update Get-AzureRmRecoveryServicesBackupProtectionPolicy.md

* Update Enable-AzureRmRecoveryServicesBackupProtection.md

* Update Get-AzureRmRecoveryServicesBackupJob.md

* Update Get-AzureRmRecoveryServicesBackupContainer.md

* Update Unregister-AzureRmRecoveryServicesBackupContainer.md

* Update Restore-AzureRmRecoveryServicesBackupItem.md

* Update Set-AzureRmRecoveryServicesBackupProtectionPolicy.md

* Update Get-AzureRmRecoveryServicesBackupItem.md

* Update Get-AzureRmRecoveryServicesBackupJobDetails.md

* Update Get-AzureRmRecoveryServicesBackupRPMountScript.md

* Update Get-AzureRmRecoveryServicesBackupManagementServer.md

* Update Get-AzureRmRecoveryServicesBackupRecoveryPoint.md

* Update New-AzureRmRecoveryServicesBackupProtectionPolicy.md

* Update Remove-AzureRmRecoveryServicesBackupProtectionPolicy.md

* Update Stop-AzureRmRecoveryServicesBackupJob.md

Author: Samuel Anudeep

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Models/CmdletParamEnums.cs

@@ -14,6 +14,13 @@
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
 {
+    public enum VaultParams
+    {
+        VaultName,
+        ResourceGroupName,
+        VaultLocation,
+    }
+
     public enum ContainerParams
     {
         Vault,

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

@@ -24,7 +24,6 @@
 using CmdletModel = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
 using RestAzureNS = Microsoft.Rest.Azure;
 using ServiceClientModel = Microsoft.Azure.Management.RecoveryServices.Backup.Models;
-using System.Net.Http;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
 {
@@ -70,6 +69,8 @@ public RestAzureNS.AzureOperationResponse EnableProtection()
         /// <returns>The job response returned from the service</returns>
         public RestAzureNS.AzureOperationResponse DisableProtection()
         {
+            string vaultName = (string)ProviderData[VaultParams.VaultName];
+            string resourceGroupName = (string)ProviderData[VaultParams.ResourceGroupName];
             bool deleteBackupData = (bool)ProviderData[ItemParams.DeleteBackupData];
 
             ItemBase itemBase = (ItemBase)ProviderData[ItemParams.Item];
@@ -84,8 +85,10 @@ public RestAzureNS.AzureOperationResponse DisableProtection()
             if (deleteBackupData)
             {
                 return ServiceClientAdapter.DeleteProtectedItem(
-                                containerUri,
-                                protectedItemUri);
+                    containerUri,
+                    protectedItemUri,
+                    vaultName: vaultName,
+                    resourceGroupName: resourceGroupName);
             }
             else
             {
@@ -126,6 +129,8 @@ public void RevokeItemLevelRecoveryAccess()
         /// <returns>Recovery point detail as returned by the service</returns>
         public RecoveryPointBase GetRecoveryPointDetails()
         {
+            string vaultName = (string)ProviderData[VaultParams.VaultName];
+            string resourceGroupName = (string)ProviderData[VaultParams.ResourceGroupName];
             AzureSqlItem item = ProviderData[RecoveryPointParams.Item]
                 as AzureSqlItem;
 
@@ -136,7 +141,11 @@ public RecoveryPointBase GetRecoveryPointDetails()
             string protectedItemName = HelperUtils.GetProtectedItemUri(uriDict, item.Id);
 
             var rpResponse = ServiceClientAdapter.GetRecoveryPointDetails(
-                containerUri, protectedItemName, recoveryPointId);
+                containerUri,
+                protectedItemName,
+                recoveryPointId,
+                vaultName: vaultName,
+                resourceGroupName: resourceGroupName);
             return RecoveryPointConversions.GetPSAzureRecoveryPoints(rpResponse, item);
         }
 
@@ -146,6 +155,8 @@ public RecoveryPointBase GetRecoveryPointDetails()
         /// <returns>List of recovery point PowerShell model objects</returns>
         public List<RecoveryPointBase> ListRecoveryPoints()
         {
+            string vaultName = (string)ProviderData[VaultParams.VaultName];
+            string resourceGroupName = (string)ProviderData[VaultParams.ResourceGroupName];
             DateTime startDate = (DateTime)(ProviderData[RecoveryPointParams.StartDate]);
             DateTime endDate = (DateTime)(ProviderData[RecoveryPointParams.EndDate]);
             AzureSqlItem item = ProviderData[RecoveryPointParams.Item]
@@ -172,7 +183,11 @@ public List<RecoveryPointBase> ListRecoveryPoints()
             queryFilter.Filter = queryFilterString;
 
             List<RecoveryPointResource> rpListResponse = ServiceClientAdapter.GetRecoveryPoints(
-                containerUri, protectedItemName, queryFilter);
+                containerUri,
+                protectedItemName,
+                queryFilter,
+                vaultName: vaultName,
+                resourceGroupName: resourceGroupName);
             return RecoveryPointConversions.GetPSAzureRecoveryPoints(rpListResponse, item);
         }
 
@@ -182,6 +197,8 @@ public List<RecoveryPointBase> ListRecoveryPoints()
         /// <returns>Created policy object as returned by the service</returns>
         public ProtectionPolicyResource CreatePolicy()
         {
+            string vaultName = (string)ProviderData[VaultParams.VaultName];
+            string resourceGroupName = (string)ProviderData[VaultParams.ResourceGroupName];
             string policyName = (string)ProviderData[PolicyParams.PolicyName];
             CmdletModel.WorkloadType workloadType =
                 (CmdletModel.WorkloadType)ProviderData[PolicyParams.WorkloadType];
@@ -197,7 +214,7 @@ public ProtectionPolicyResource CreatePolicy()
             Logger.Instance.WriteDebug("Validation of Retention policy is successful");
 
             // construct Hydra policy request            
-            ProtectionPolicyResource hydraRequest = new ProtectionPolicyResource()
+            ProtectionPolicyResource protectionPolicyResource = new ProtectionPolicyResource()
             {
                 Properties = new AzureSqlProtectionPolicy()
                 {
@@ -207,8 +224,10 @@ public ProtectionPolicyResource CreatePolicy()
             };
 
             return ServiceClientAdapter.CreateOrUpdateProtectionPolicy(
-                                 policyName,
-                                 hydraRequest).Body;
+                policyName,
+                protectionPolicyResource,
+                vaultName: vaultName,
+                resourceGroupName: resourceGroupName).Body;
         }
 
         /// <summary>
@@ -217,6 +236,8 @@ public ProtectionPolicyResource CreatePolicy()
         /// <returns>Modified policy object as returned by the service</returns>
         public RestAzureNS.AzureOperationResponse<ProtectionPolicyResource> ModifyPolicy()
         {
+            string vaultName = (string)ProviderData[VaultParams.VaultName];
+            string resourceGroupName = (string)ProviderData[VaultParams.ResourceGroupName];
             RetentionPolicyBase retentionPolicy =
               ProviderData.ContainsKey(PolicyParams.RetentionPolicy) ?
               (RetentionPolicyBase)ProviderData[PolicyParams.RetentionPolicy] :
@@ -241,7 +262,7 @@ public RestAzureNS.AzureOperationResponse<ProtectionPolicyResource> ModifyPolicy
 
             CmdletModel.SimpleRetentionPolicy sqlRetentionPolicy =
                 (CmdletModel.SimpleRetentionPolicy)((AzureSqlPolicy)policy).RetentionPolicy;
-            ProtectionPolicyResource hydraRequest = new ProtectionPolicyResource()
+            ProtectionPolicyResource protectionPolicyResource = new ProtectionPolicyResource()
             {
                 Properties = new AzureSqlProtectionPolicy()
                 {
@@ -250,8 +271,11 @@ public RestAzureNS.AzureOperationResponse<ProtectionPolicyResource> ModifyPolicy
                 }
             };
 
-            return ServiceClientAdapter.CreateOrUpdateProtectionPolicy(policy.Name,
-                                                               hydraRequest);
+            return ServiceClientAdapter.CreateOrUpdateProtectionPolicy(
+                policy.Name,
+                protectionPolicyResource,
+                vaultName: vaultName,
+                resourceGroupName: resourceGroupName);
         }
 
         /// <summary>
@@ -260,15 +284,19 @@ public RestAzureNS.AzureOperationResponse<ProtectionPolicyResource> ModifyPolicy
         /// <returns>List of protection containers</returns>
         public List<ContainerBase> ListProtectionContainers()
         {
-            string name = (string)this.ProviderData[ContainerParams.Name];
+            string vaultName = (string)ProviderData[VaultParams.VaultName];
+            string resourceGroupName = (string)ProviderData[VaultParams.ResourceGroupName];
+            string name = (string)ProviderData[ContainerParams.Name];
 
             ODataQuery<BMSContainerQueryObject> queryParams =
                 new ODataQuery<BMSContainerQueryObject>(
                     q => q.BackupManagementType
                             == ServiceClientModel.BackupManagementType.AzureSql);
 
-
-            var listResponse = ServiceClientAdapter.ListContainers(queryParams);
+            var listResponse = ServiceClientAdapter.ListContainers(
+                queryParams,
+                vaultName: vaultName,
+                resourceGroupName: resourceGroupName);
 
             List<ContainerBase> containerModels =
                 ConversionHelpers.GetContainerModelList(listResponse);
@@ -317,6 +345,8 @@ public RetentionPolicyBase GetDefaultRetentionPolicyObject()
         /// <returns>List of protected items</returns>
         public List<ItemBase> ListProtectedItems()
         {
+            string vaultName = (string)ProviderData[VaultParams.VaultName];
+            string resourceGroupName = (string)ProviderData[VaultParams.ResourceGroupName];
             ContainerBase container = (ContainerBase)ProviderData[ItemParams.Container];
             string name = (string)ProviderData[ItemParams.AzureVMName];
             ItemProtectionStatus protectionStatus =
@@ -334,10 +364,13 @@ public List<ItemBase> ListProtectedItems()
 
             List<ProtectedItemResource> protectedItems = new List<ProtectedItemResource>();
             string skipToken = null;
-            var listResponse = ServiceClientAdapter.ListProtectedItem(queryParams, skipToken);
+            var listResponse = ServiceClientAdapter.ListProtectedItem(
+                queryParams,
+                skipToken,
+                vaultName: vaultName,
+                resourceGroupName: resourceGroupName);
             protectedItems.AddRange(listResponse);
 
-
             // 1. Filter by container
             if (container != null)
             {
@@ -379,7 +412,11 @@ public List<ItemBase> ListProtectedItems()
                         HelperUtils.GetProtectedItemUri(dictionary, protectedItems[i].Id);
 
                     var getResponse = ServiceClientAdapter.GetProtectedItem(
-                        containerUri, protectedItemUri, getItemQueryParams);
+                        containerUri,
+                        protectedItemUri,
+                        getItemQueryParams,
+                        vaultName: vaultName,
+                        resourceGroupName: resourceGroupName);
                     protectedItemGetResponses.Add(getResponse.Body);
                 }
             }

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

@@ -20,7 +20,6 @@
 using Microsoft.Rest.Azure.OData;
 using RestAzureNS = Microsoft.Rest.Azure;
 using ServiceClientModel = Microsoft.Azure.Management.RecoveryServices.Backup.Models;
-using System.Net.Http;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
 {
@@ -113,12 +112,17 @@ public void RevokeItemLevelRecoveryAccess()
         /// <returns></returns>
         public List<BackupEngineBase> ListBackupManagementServers()
         {
+            string vaultName = (string)ProviderData[VaultParams.VaultName];
+            string resourceGroupName = (string)ProviderData[VaultParams.ResourceGroupName];
             string name = (string)ProviderData[ContainerParams.Name];
 
             ODataQuery<ServiceClientModel.BMSBackupEnginesQueryObject> queryParams =
                 new ODataQuery<ServiceClientModel.BMSBackupEnginesQueryObject>();
 
-            var listResponse = ServiceClientAdapter.ListBackupEngines(queryParams);
+            var listResponse = ServiceClientAdapter.ListBackupEngines(
+                queryParams,
+                vaultName: vaultName,
+                resourceGroupName: resourceGroupName);
 
             List<BackupEngineBase> backupEngineModels = ConversionHelpers.GetBackupEngineModelList(listResponse);