[AzRecoveryServices.Backup] Adding null check for target storage acco…

…unt (#13681) * Adding null check for target storage account * fixing the operations delay * re-recorded failed tests
Azure · Feb 19, 2021 · 53fdcfe · 53fdcfe
1 parent 81e86e6
commit 53fdcfe
Show file tree

Hide file tree

Showing 7 changed files with 2,180 additions and 1,072 deletions.
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Helpers/TrackingHelpers.cs b/src/RecoveryServices/RecoveryServices.Backup.Helpers/TrackingHelpers.cs
@@ -48,10 +48,15 @@ public static T GetOperationStatus<T>(RestAzureNS.AzureOperationResponse respons
             while (opStatusResponse.Body.Status ==
                 ServiceClientModel.OperationStatusValues.InProgress)
             {
-                if (String.Compare(testMode, "Playback", StringComparison.OrdinalIgnoreCase) != 0 && !TestMockSupport.RunningMocked)
+                if (!TestMockSupport.RunningMocked)
+                {
+                    TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);                    
+                }
+                if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0)
                 {
                     Thread.Sleep(5000);
                 }
+
                 opStatusResponse = getOpStatus(operationId);
             }
 
@@ -79,7 +84,11 @@ public static T GetOperationStatus<T, S>(RestAzureNS.AzureOperationResponse<S> r
             while (opStatusResponse.Body.Status ==
                 ServiceClientModel.OperationStatusValues.InProgress)
             {
-                if (String.Compare(testMode, "Playback", StringComparison.OrdinalIgnoreCase) != 0 && !TestMockSupport.RunningMocked)
+                if (!TestMockSupport.RunningMocked)
+                {
+                    TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);
+                }
+                if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0)
                 {
                     Thread.Sleep(5000);
                 }
@@ -109,10 +118,15 @@ public static RestAzureNS.AzureOperationResponse GetOperationResult(
             string testMode = Environment.GetEnvironmentVariable("AZURE_TEST_MODE");
             while (opStatusResponse.Response.StatusCode == SystemNet.HttpStatusCode.Accepted)
             {
-                if (String.Compare(testMode, "Playback", StringComparison.OrdinalIgnoreCase) != 0 && !TestMockSupport.RunningMocked)
+                if (!TestMockSupport.RunningMocked)
+                {
+                    TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);
+                }
+                if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0)
                 {
                     Thread.Sleep(5000);
                 }
+
                 opStatusResponse = getOpStatus(operationId);
             }
 
@@ -139,10 +153,15 @@ public static RestAzureNS.AzureOperationResponse<T> GetOperationStatusDataMove<T
             string testMode = Environment.GetEnvironmentVariable("AZURE_TEST_MODE");
             while (opStatusResponse.Body.Status == "InProgress")
             {
-                if (String.Compare(testMode, "Playback", StringComparison.OrdinalIgnoreCase) != 0 && !TestMockSupport.RunningMocked)
+                if (!TestMockSupport.RunningMocked)
+                {
+                    TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);                    
+                }
+                if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0)
                 {
                     Thread.Sleep(5000);
                 }
+
                 opStatusResponse = getOpStatus(operationId);
             }
             opStatusResponse = getOpStatus(operationId);
@@ -168,10 +187,15 @@ public static RestAzureNS.AzureOperationResponse<T> GetOperationResult<T>(
             string testMode = Environment.GetEnvironmentVariable("AZURE_TEST_MODE");
             while (opStatusResponse.Response.StatusCode == SystemNet.HttpStatusCode.Accepted)
             {
-                if (String.Compare(testMode, "Playback", StringComparison.OrdinalIgnoreCase) != 0 && !TestMockSupport.RunningMocked)
+                if (!TestMockSupport.RunningMocked)
+                {
+                    TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);                    
+                }
+                if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0)
                 {
                     Thread.Sleep(5000);
                 }
+
                 opStatusResponse = getOpStatus(operationId);
             }
             opStatusResponse = getOpStatus(operationId);
@@ -212,10 +236,15 @@ public static RestAzureNS.AzureOperationResponse<T> GetOperationResult<T>(
             string testMode = Environment.GetEnvironmentVariable("AZURE_TEST_MODE");
             while (opStatusResponse.Response.StatusCode == SystemNet.HttpStatusCode.Accepted)
             {
-                if (String.Compare(testMode, "Playback", StringComparison.OrdinalIgnoreCase) != 0 && !TestMockSupport.RunningMocked)
+                if (!TestMockSupport.RunningMocked)
+                {
+                    TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);                    
+                }
+                if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0)
                 {
                     Thread.Sleep(5000);
                 }
+
                 opStatusResponse = getOpStatus(operationId);
             }
 

diff --git a/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.Designer.cs b/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.Designer.cs
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.resx b/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.resx
@@ -613,4 +613,7 @@ Please contact Microsoft for further assistance.</value>
   <data name="TargetResourcegroupNotSupported" xml:space="preserve">
     <value>Target ResourceGroup is not applicable and restore will proceed as unmanaged disk restore since this is unmanaged VM</value>
   </data>
+  <data name="InvalidTargetStorageAccount" xml:space="preserve">
+    <value>Please provide a vaild target storage account</value>
+  </data>
 </root>
diff --git a/...ecoveryServices/RecoveryServices.Backup.Providers/Providers/AzureFilesPsBackupProvider.cs b/...ecoveryServices/RecoveryServices.Backup.Providers/Providers/AzureFilesPsBackupProvider.cs
@@ -199,8 +199,14 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
             GenericResource targetStorageAccountResource = null;
             string targetStorageAccountLocation = null;
             if (targetStorageAccountName != null)
-            {
+            {                
                 targetStorageAccountResource = ServiceClientAdapter.GetStorageAccountResource(targetStorageAccountName);
+
+                if(targetStorageAccountResource == null)
+                {
+                    throw new ArgumentException(string.Format(Resources.InvalidTargetStorageAccount));
+                }
+
                 targetStorageAccountLocation = targetStorageAccountResource.Location;
             }
 
@@ -209,6 +215,7 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
             RestoreFileSpecs restoreFileSpec = new RestoreFileSpecs();
             AzureFileShareRestoreRequest restoreRequest = new AzureFileShareRestoreRequest();
             restoreRequest.CopyOptions = copyOptions;
+
             restoreRequest.SourceResourceId = storageAccountResource.Id;
             if (sourceFilePath != null)
             {