Update vault settings back after generating file

Author: sriramvu

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/PSRecoveryServicesClient/PSRecoveryServicesVaultExtendedInfoClient.cs

@@ -71,6 +71,10 @@ public async Task<UploadCertificateResponse> UpdateVaultCertificate(CertificateA
         /// <returns>credential object</returns>
         public ASRVaultCreds GenerateVaultCredential(X509Certificate2 managementCert, ASRVault vault, Site site)
         {
+            string currentResourceName = PSRecoveryServicesClient.asrVaultCreds.ResourceName;
+            string currentCloudServiceName = PSRecoveryServicesClient.asrVaultCreds.CloudServiceName;
+
+            // Update vault settings with the working vault to generate file
             Utilities.UpdateVaultSettings(new ASRVaultCreds()
             {
                 CloudServiceName = vault.CloudServiceName,
@@ -100,6 +104,13 @@ public ASRVaultCreds GenerateVaultCredential(X509Certificate2 managementCert, AS
                                                 vault,
                                                 site);
 
+            // Update back the original vault settings
+            Utilities.UpdateVaultSettings(new ASRVaultCreds()
+            {
+                CloudServiceName = currentCloudServiceName,
+                ResourceName = currentResourceName
+            });
+
             return asrVaultCreds;
         }
 

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/ImportAzureSiteRecoveryVaultSettingsFile.cs

@@ -107,7 +107,7 @@ public override void ExecuteCmdlet()
                     asrVaultCreds.ResourceName,
                     asrVaultCreds.CloudServiceName);
 
-                this.ImportAzureSiteRecoveryVaultSettings(asrVaultCreds);
+                Utilities.UpdateVaultSettings(asrVaultCreds);
                 this.WriteObject(new ASRVaultSettings(
                     asrVaultCreds.ResourceName,
                     asrVaultCreds.CloudServiceName));
@@ -117,23 +117,5 @@ public override void ExecuteCmdlet()
                 this.HandleException(exception);
             }
         }
-
-        /// <summary>
-        /// Imports Azure Site Recovery Vault settings.
-        /// </summary>
-        /// <param name="asrVaultCreds">ASR Vault credentials</param>
-        public void ImportAzureSiteRecoveryVaultSettings(ASRVaultCreds asrVaultCreds)
-        {
-            object updateVaultSettingsOneAtATime = new object();
-            lock (updateVaultSettingsOneAtATime)
-            {
-                PSRecoveryServicesClient.asrVaultCreds.ResourceName =
-                    asrVaultCreds.ResourceName;
-                PSRecoveryServicesClient.asrVaultCreds.CloudServiceName =
-                    asrVaultCreds.CloudServiceName;
-                PSRecoveryServicesClient.asrVaultCreds.ChannelIntegrityKey =
-                    asrVaultCreds.ChannelIntegrityKey;
-            }
-        }
     }
 }