Merge pull request #54 from AsrOneSdk/neha-dev

Storage account related validation changes.

Author: sriramvu

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

@@ -111,11 +111,14 @@ public void ValidateSubscriptionAccountAssociation(string azureSubscriptionId)
         /// <param name="azureSubscription">Subscription ID</param>
         /// <param name="azureStorageAccount">Storage Account details</param>
         /// <param name="vaultLocation">Current Vault Location</param>
-        /// <returns>Validation successful</returns>
-        public bool ValidateStorageAccountAssociation(
+        /// <param name="validationSuccessful">Out variable to indicate if validation was successful</param>
+        /// <param name="locationValid">Out variable to indicate if location of storage account is valid</param>
+        public void ValidateStorageAccountAssociation(
             string azureSubscription,
             string azureStorageAccount,
-            string vaultLocation)
+            string vaultLocation,
+            out bool validationSuccessful,
+            out bool locationValid)
         {
             if (string.IsNullOrEmpty(azureSubscription))
             {
@@ -142,7 +145,9 @@ public bool ValidateStorageAccountAssociation(
             }
             catch (Exception)
             {
-                return false;
+                validationSuccessful = false;
+                locationValid = false;
+                return;
             }
 
             foreach (var storage in azureStorageListResponse.StorageAccounts)
@@ -160,10 +165,31 @@ public bool ValidateStorageAccountAssociation(
 
             if (!associatedAccount)
             {
-                return false;
+                validationSuccessful = false;
+                locationValid = false;
+                return;
+            }
+
+            // Validate that the Geo Location of the storage account is the same as that of the vault.
+            if (string.IsNullOrEmpty(currentStorageAccount.Properties.Location))
+            {
+                validationSuccessful = false;
+                locationValid = false;
+                return;
+            }
+
+            if (0 != string.Compare(
+                currentStorageAccount.Properties.Location,
+                vaultLocation,
+                StringComparison.OrdinalIgnoreCase))
+            {
+                validationSuccessful = true;
+                locationValid = true;
+                return;
             }
 
-            return true;
+            validationSuccessful = true;
+            locationValid = true;
         }
     }
 }

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

@@ -250,7 +250,7 @@ ClientRequestId: {3}</value>
 Are you sure you want to continue {0}?</value>
   </data>
   <data name="StorageIsNotInTheSameLocationAsVault" xml:space="preserve">
-    <value>Storage account given is in {0} whereas the vault is in {1}.
+    <value>Storage account given is in a different location as compared to the current vault.
 Please provide a storage account with the same location as that of the vault.</value>
   </data>
   <data name="StorageAccountValidationUnsuccessful" xml:space="preserve">

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

@@ -207,15 +207,27 @@ private void EnterpriseToAzureProtectionProfileObject()
             }
 
             // Verify whether the storage account is associated with the subscription or not.
-            bool validationSuccessful = RecoveryServicesClient.ValidateStorageAccountAssociation(
+            bool validationSuccessful;
+            bool locationValid;
+            RecoveryServicesClient.ValidateStorageAccountAssociation(
                 this.RecoveryAzureSubscription,
                 this.RecoveryAzureStorageAccount,
-                this.GetCurrentValutLocation());
+                this.GetCurrentValutLocation(),
+                out validationSuccessful,
+                out locationValid);
 
             if (!validationSuccessful)
             {
                 this.WriteWarning(string.Format(Properties.Resources.StorageAccountValidationUnsuccessful));
+            }
 
+            if (validationSuccessful && !locationValid)
+            {
+                this.WriteWarning(string.Format(Properties.Resources.StorageIsNotInTheSameLocationAsVault));
+            }
+
+            if (!validationSuccessful || !locationValid)
+            {
                 this.ConfirmAction(
                     this.Force.IsPresent,
                     string.Format(Properties.Resources.ValidationUnsuccessfulWarning, this.targetName),