bug1680974

Author: sriramvu

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

@@ -79,6 +79,8 @@ public RecoveryServicesManagementClient GetRecoveryServicesClient
         /// </summary>
         private RecoveryServicesManagementClient recoveryServicesClient;
 
+        private string currentSubscriptionId;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PSRecoveryServicesClient" /> class with 
         /// required current subscription.
@@ -87,6 +89,7 @@ public RecoveryServicesManagementClient GetRecoveryServicesClient
         public PSRecoveryServicesClient(AzureProfile azureProfile, AzureSubscription azureSubscription)
         {
             this.Profile = azureProfile;
+            this.currentSubscriptionId = azureSubscription.Id.ToString();
             this.recoveryServicesClient =
                 AzureSession.ClientFactory.CreateClient<RecoveryServicesManagementClient>(azureProfile, azureSubscription, AzureEnvironment.Endpoint.ServiceManagement);
         }
@@ -154,6 +157,17 @@ public bool ValidateVaultSettings(
             return true;
         }
 
+        public bool ValidateVaultContext(
+            string subscriptionId)
+        {
+            if (0 == string.CompareOrdinal(this.currentSubscriptionId, subscriptionId))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// Site Recovery requests that go to on-premise components (like the Provider installed
         /// in VMM) require an authentication token that is signed with the vault key to indicate
@@ -213,10 +227,10 @@ public CustomRequestHeaders GetRequestHeaders(bool shouldSignRequest = true)
         private SiteRecoveryManagementClient GetSiteRecoveryClient()
         {
             CloudServiceListResponse services = this.recoveryServicesClient.CloudServices.List();
-            this.ValidateVaultSettings(
-                asrVaultCreds.ResourceName,
-                asrVaultCreds.CloudServiceName,
-                services);
+            if (!this.ValidateVaultContext(asrVaultCreds.SubscriptionId))
+            {
+                throw new ArgumentException(Properties.Resources.InvalidVaultContext);
+            }
 
             CloudService selectedCloudService = null;
             Vault selectedResource = null;

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Properties/Resources.Designer.cs

@@ -256,4 +256,7 @@ Please provide a storage account with the same location as that of the vault.</v
   <data name="StorageAccountValidationUnsuccessful" xml:space="preserve">
     <value>The Subscription or Storage account couldn’t be validated. For failovers to be successful, the Subscription should belong to your account, the Storage account to the Subscription and Storage account location must be the same as location of your Vault.</value>
   </data>
+  <data name="InvalidVaultContext" xml:space="preserve">
+    <value>Imported Vault is not associated with the Current Subscription.</value>
+  </data>
 </root>

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Properties/Resources.resx

@@ -112,6 +112,8 @@ public static void UpdateVaultSettings(ASRVaultCreds asrVaultCreds)
                     asrVaultCreds.CloudServiceName;
                 PSRecoveryServicesClient.asrVaultCreds.ChannelIntegrityKey =
                     asrVaultCreds.ChannelIntegrityKey;
+                PSRecoveryServicesClient.asrVaultCreds.SubscriptionId =
+                    asrVaultCreds.SubscriptionId;
             }
         }