Using VaultId and VaultLocation instead of Vault.

Author: Samuel Anudeep

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

@@ -16,7 +16,9 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
 {
     public enum VaultParams
     {
-        Vault,
+        VaultName,
+        ResourceGroupName,
+        VaultLocation,
     }
 
     public enum ContainerParams

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

@@ -88,10 +88,6 @@
       <Project>{b758fec1-35c1-4f93-a954-66dd33f6e0ec}</Project>
       <Name>Commands.RecoveryServices.Backup.ServiceClientAdapter</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Commands.RecoveryServices\Commands.RecoveryServices.csproj">
-      <Project>{604260dc-b392-4cf4-81ec-34b14591e2d2}</Project>
-      <Name>Commands.RecoveryServices</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="MSSharedLibKey.snk" />

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,7 +69,8 @@ public RestAzureNS.AzureOperationResponse EnableProtection()
         /// <returns>The job response returned from the service</returns>
         public RestAzureNS.AzureOperationResponse DisableProtection()
         {
-            ARSVault vault = (ARSVault)ProviderData[VaultParams.Vault];
+            string vaultName = (string)ProviderData[VaultParams.VaultName];
+            string resourceGroupName = (string)ProviderData[VaultParams.ResourceGroupName];
             bool deleteBackupData = (bool)ProviderData[ItemParams.DeleteBackupData];
 
             ItemBase itemBase = (ItemBase)ProviderData[ItemParams.Item];
@@ -87,8 +87,8 @@ public RestAzureNS.AzureOperationResponse DisableProtection()
                 return ServiceClientAdapter.DeleteProtectedItem(
                     containerUri,
                     protectedItemUri,
-                    vaultName: vault?.Name,
-                    resourceGroupName: vault?.ResourceGroupName);
+                    vaultName: vaultName,
+                    resourceGroupName: resourceGroupName);
             }
             else
             {
@@ -129,7 +129,8 @@ public void RevokeItemLevelRecoveryAccess()
         /// <returns>Recovery point detail as returned by the service</returns>
         public RecoveryPointBase GetRecoveryPointDetails()
         {
-            ARSVault vault = (ARSVault)ProviderData[VaultParams.Vault];
+            string vaultName = (string)ProviderData[VaultParams.VaultName];
+            string resourceGroupName = (string)ProviderData[VaultParams.ResourceGroupName];
             AzureSqlItem item = ProviderData[RecoveryPointParams.Item]
                 as AzureSqlItem;
 
@@ -140,11 +141,11 @@ public RecoveryPointBase GetRecoveryPointDetails()
             string protectedItemName = HelperUtils.GetProtectedItemUri(uriDict, item.Id);
 
             var rpResponse = ServiceClientAdapter.GetRecoveryPointDetails(
-                containerUri, 
-                protectedItemName, 
+                containerUri,
+                protectedItemName,
                 recoveryPointId,
-                vaultName: vault?.Name,
-                resourceGroupName: vault?.ResourceGroupName);
+                vaultName: vaultName,
+                resourceGroupName: resourceGroupName);
             return RecoveryPointConversions.GetPSAzureRecoveryPoints(rpResponse, item);
         }
 
@@ -154,7 +155,8 @@ public RecoveryPointBase GetRecoveryPointDetails()
         /// <returns>List of recovery point PowerShell model objects</returns>
         public List<RecoveryPointBase> ListRecoveryPoints()
         {
-            ARSVault vault = (ARSVault)ProviderData[VaultParams.Vault];
+            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]
@@ -184,8 +186,8 @@ public List<RecoveryPointBase> ListRecoveryPoints()
                 containerUri,
                 protectedItemName,
                 queryFilter,
-                vaultName: vault?.Name,
-                resourceGroupName: vault?.ResourceGroupName);
+                vaultName: vaultName,
+                resourceGroupName: resourceGroupName);
             return RecoveryPointConversions.GetPSAzureRecoveryPoints(rpListResponse, item);
         }
 
@@ -195,7 +197,8 @@ public List<RecoveryPointBase> ListRecoveryPoints()
         /// <returns>Created policy object as returned by the service</returns>
         public ProtectionPolicyResource CreatePolicy()
         {
-            ARSVault vault = (ARSVault)ProviderData[VaultParams.Vault];
+            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];
@@ -223,8 +226,8 @@ public ProtectionPolicyResource CreatePolicy()
             return ServiceClientAdapter.CreateOrUpdateProtectionPolicy(
                 policyName,
                 protectionPolicyResource,
-                vaultName: vault?.Name,
-                resourceGroupName: vault?.ResourceGroupName).Body;
+                vaultName: vaultName,
+                resourceGroupName: resourceGroupName).Body;
         }
 
         /// <summary>
@@ -233,7 +236,8 @@ public ProtectionPolicyResource CreatePolicy()
         /// <returns>Modified policy object as returned by the service</returns>
         public RestAzureNS.AzureOperationResponse<ProtectionPolicyResource> ModifyPolicy()
         {
-            ARSVault vault = (ARSVault)ProviderData[VaultParams.Vault];
+            string vaultName = (string)ProviderData[VaultParams.VaultName];
+            string resourceGroupName = (string)ProviderData[VaultParams.ResourceGroupName];
             RetentionPolicyBase retentionPolicy =
               ProviderData.ContainsKey(PolicyParams.RetentionPolicy) ?
               (RetentionPolicyBase)ProviderData[PolicyParams.RetentionPolicy] :
@@ -270,8 +274,8 @@ public RestAzureNS.AzureOperationResponse<ProtectionPolicyResource> ModifyPolicy
             return ServiceClientAdapter.CreateOrUpdateProtectionPolicy(
                 policy.Name,
                 protectionPolicyResource,
-                vaultName: vault?.Name,
-                resourceGroupName: vault?.ResourceGroupName);
+                vaultName: vaultName,
+                resourceGroupName: resourceGroupName);
         }
 
         /// <summary>
@@ -280,7 +284,8 @@ public RestAzureNS.AzureOperationResponse<ProtectionPolicyResource> ModifyPolicy
         /// <returns>List of protection containers</returns>
         public List<ContainerBase> ListProtectionContainers()
         {
-            ARSVault vault = (ARSVault)ProviderData[VaultParams.Vault];
+            string vaultName = (string)ProviderData[VaultParams.VaultName];
+            string resourceGroupName = (string)ProviderData[VaultParams.ResourceGroupName];
             string name = (string)ProviderData[ContainerParams.Name];
 
             ODataQuery<BMSContainerQueryObject> queryParams =
@@ -290,8 +295,8 @@ public List<ContainerBase> ListProtectionContainers()
 
             var listResponse = ServiceClientAdapter.ListContainers(
                 queryParams,
-                vaultName: vault?.Name,
-                resourceGroupName: vault?.ResourceGroupName);
+                vaultName: vaultName,
+                resourceGroupName: resourceGroupName);
 
             List<ContainerBase> containerModels =
                 ConversionHelpers.GetContainerModelList(listResponse);
@@ -340,7 +345,8 @@ public RetentionPolicyBase GetDefaultRetentionPolicyObject()
         /// <returns>List of protected items</returns>
         public List<ItemBase> ListProtectedItems()
         {
-            ARSVault vault = (ARSVault)ProviderData[VaultParams.Vault];
+            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 =
@@ -361,8 +367,8 @@ public List<ItemBase> ListProtectedItems()
             var listResponse = ServiceClientAdapter.ListProtectedItem(
                 queryParams,
                 skipToken,
-                vaultName: vault?.Name,
-                resourceGroupName: vault?.ResourceGroupName);
+                vaultName: vaultName,
+                resourceGroupName: resourceGroupName);
             protectedItems.AddRange(listResponse);
 
             // 1. Filter by container
@@ -409,8 +415,8 @@ public List<ItemBase> ListProtectedItems()
                         containerUri,
                         protectedItemUri,
                         getItemQueryParams,
-                        vaultName: vault?.Name,
-                        resourceGroupName: vault?.ResourceGroupName);
+                        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,16 +112,17 @@ public void RevokeItemLevelRecoveryAccess()
         /// <returns></returns>
         public List<BackupEngineBase> ListBackupManagementServers()
         {
-            ARSVault vault = (ARSVault)ProviderData[VaultParams.Vault];
+            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,
-                vaultName: vault?.Name,
-                resourceGroupName: vault?.ResourceGroupName);
+                vaultName: vaultName,
+                resourceGroupName: resourceGroupName);
 
             List<BackupEngineBase> backupEngineModels = ConversionHelpers.GetBackupEngineModelList(listResponse);