Set-VaultContext cleanup Part 2

Author: pragrawa

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

@@ -30,6 +30,9 @@ public partial class HydraAdapter
         /// <returns></returns>
         public IEnumerable<ProtectionContainerResource> ListContainers(string resourceGroupName, string resourceName, ProtectionContainerListQueryParams queryParams)
         {
+            resourceName = BmsAdapter.GetResourceName();
+            resourceGroupName = BmsAdapter.GetResourceName();
+
             var listResponse = BmsAdapter.Client.Container.ListAsync(resourceGroupName, resourceName, queryParams,
                 BmsAdapter.GetCustomRequestHeaders(), BmsAdapter.CmdletCancellationToken).Result;
             return listResponse.ItemList.ProtectionContainers;
@@ -39,10 +42,10 @@ public IEnumerable<ProtectionContainerResource> ListContainers(string resourceGr
         /// Triggers refresh of container catalog in service
         /// </summary>
         /// <returns></returns>
-        public BaseRecoveryServicesJobResponse RefreshContainers(string resourceGroupName, string resourceName)
+        public BaseRecoveryServicesJobResponse RefreshContainers()
         {
-            resourceName = BmsAdapter.GetResourceName();
-            resourceGroupName = BmsAdapter.GetResourceName();
+            string resourceName = BmsAdapter.GetResourceName();
+            string resourceGroupName = BmsAdapter.GetResourceName();
 
             var response = BmsAdapter.Client.Container.RefreshAsync(
                 resourceGroupName, resourceName,

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

@@ -44,6 +44,9 @@ public JobListResponse GetJobs(
             int? top = null,
             string skipToken = null)
         {
+            resourceName = BmsAdapter.GetResourceName();
+            resourceGroupName = BmsAdapter.GetResourceName();
+
             // build pagination request
             PaginationRequest pagReq = new PaginationRequest()
             {
@@ -77,6 +80,9 @@ public BaseRecoveryServicesJobResponse CancelJob(
             string resourceName, 
             string jobId)
         {
+            resourceName = BmsAdapter.GetResourceName();
+            resourceGroupName = BmsAdapter.GetResourceName();
+
             return BmsAdapter.Client.Job.CancelJobAsync(
                 resourceGroupName,
                 resourceName,
@@ -95,6 +101,9 @@ public BaseRecoveryServicesJobResponse ExportJobs(
             DateTime endTime,
             string backupManagementType)
         {
+            resourceName = BmsAdapter.GetResourceName();
+            resourceGroupName = BmsAdapter.GetResourceName();
+
             CommonJobQueryFilters filters = GetQueryObject(
                 backupManagementType,
                 startTime,

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

@@ -29,6 +29,9 @@ public ProtectionPolicyResponse CreateOrUpdateProtectionPolicy(
                 string policyName,
                 ProtectionPolicyRequest request)
         {
+            resourceName = BmsAdapter.GetResourceName();
+            resourceGroupName = BmsAdapter.GetResourceName();
+
             return BmsAdapter.Client.ProtectionPolicy.CreateOrUpdateAsync(
                                      resourceGroupName,
                                      resourceName, 
@@ -43,6 +46,9 @@ public ProtectionPolicyResponse GetProtectionPolicy(
                 string resourceName,
                 string policyName)
         {
+            resourceName = BmsAdapter.GetResourceName();
+            resourceGroupName = BmsAdapter.GetResourceName();
+
             return BmsAdapter.Client.ProtectionPolicy.GetAsync(
                                      resourceGroupName,
                                      resourceName,
@@ -56,6 +62,9 @@ public ProtectionPolicyListResponse ListProtectionPolicy(
                string resourceName,
                ProtectionPolicyQueryParameters queryFilter)
         {
+            resourceName = BmsAdapter.GetResourceName();
+            resourceGroupName = BmsAdapter.GetResourceName();
+
             return BmsAdapter.Client.ProtectionPolicy.ListAsync(
                                      resourceGroupName,
                                      resourceName,