adding recovery service changes

Azure · Apr 28, 2021 · 38180c4 · 38180c4
1 parent 92f57a4
commit 38180c4
Show file tree

Hide file tree

Showing 121 changed files with 1,022,522 additions and 147,607 deletions.
diff --git a/...veryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj b/...veryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.3.1-preview" />
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.1.5-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Storage" Version="14.3.0" />
-    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.SiteRecovery" Version="2.1.2-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.SiteRecovery" Version="2.1.4-preview" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/ScenarioTests/A2A/A2ATestsHelper.ps1 b/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/ScenarioTests/A2A/A2ATestsHelper.ps1
@@ -21,27 +21,28 @@ function getVaultName{
     return "A2APowershellTest" + $seed;
 }
 
+# vault resource group.
 function getVaultRg{
     return "A2APowershellTestRg" + $seed;
 }
 
 
 function getVaultRgLocation{
-    return "eastus"
+    return "WestCentralUS"
 }
 
 function getVaultLocation{
-     return "eastus"
+     return "WestCentralUS"
 }
 
 function getPrimaryLocation
 {
-    return "westus"
+    return "EastUS"
 }
 
 function getPrimaryZoneLocation
 {
-    return "southeastasia"
+    return "EastUS"
 }
 
 function getPrimaryZone

diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/ScenarioTests/A2A/AsrA2ATests.cs b/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/ScenarioTests/A2A/AsrA2ATests.cs
@@ -61,22 +61,22 @@ public void TestNewA2AManagedDiskReplicationConfigWithCmk()
             this.RunPowerShellTest(_logger, Constants.NewModel, "Test-NewA2AManagedDiskReplicationConfigurationWithCmk");
         }
 
-#if NETSTANDARD
-        [Fact(Skip = "Needs investigation, TestManagementClientHelper class wasn't initialized with the ResourceManagementClient client.")]
-#else
+//#if NETSTANDARD
+//        [Fact(Skip = "Needs investigation, TestManagementClientHelper class wasn't initialized with the ResourceManagementClient client.")]
+//#else
         [Fact]
-#endif
+//#endif
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void A2ANewAsrFabric()
         {
             this.RunPowerShellTest(_logger, Constants.NewModel, "Test-NewAsrFabric");
         }
 
-#if NETSTANDARD
-        [Fact(Skip = "Needs investigation, TestManagementClientHelper class wasn't initialized with the ResourceManagementClient client.")]
-#else
+//#if NETSTANDARD
+//        [Fact(Skip = "Needs investigation, TestManagementClientHelper class wasn't initialized with the ResourceManagementClient client.")]
+//#else
         [Fact]
-#endif
+//#endif
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void A2ATestNewContainer()
         {
@@ -117,5 +117,12 @@ public void A2ARecoveryPlanReplication()
         {
             this.RunPowerShellTest(_logger, Constants.NewModel, "Test-RecoveryPlanReplication");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void A2AVMSSReplication()
+        {
+            this.RunPowerShellTest(_logger, Constants.NewModel, "Test-VMSSReplication");
+        }
     }
 }
diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/ScenarioTests/A2A/AsrA2ATests.ps1 b/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/ScenarioTests/A2A/AsrA2ATests.ps1
diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/ScenarioTests/B2A/AsrB2ATests.cs b/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/ScenarioTests/B2A/AsrB2ATests.cs
@@ -126,9 +126,6 @@ public void TestPlannedFailover()
             Category.CheckIn)]
         public void TestUpdateRPIWithDES()
         {
-            this.VaultSettingsFilePath = System.IO.Path.Combine(
-                System.AppDomain.CurrentDomain.BaseDirectory,
-                "ScenarioTests", "B2A", "CMKInput", "B2A.VaultCredentials");
             this.RunPowerShellTest(
                 _logger,
                 Constants.NewModel,
@@ -141,15 +138,12 @@ public void TestUpdateRPIWithDES()
         [Trait(
             Category.AcceptanceType,
             Category.CheckIn)]
-        public void TestCreateRPIWithPPG()
+        public void TestCreateRPIWithAdditionalProperties()
         {
-            this.VaultSettingsFilePath = System.IO.Path.Combine(
-                System.AppDomain.CurrentDomain.BaseDirectory,
-                "ScenarioTests", "B2A", "B2AInput", "B2A.VaultCredentials");
             this.RunPowerShellTest(
                 _logger,
                 Constants.NewModel,
-                "Test-CreateRPIWithProximityPlacementGroup -vaultSettingsFilePath \"" +
+                "Test-CreateRPIWithAdditionalProperties -vaultSettingsFilePath \"" +
                 this.VaultSettingsFilePath +
                 "\"");
         }
@@ -158,15 +152,12 @@ public void TestCreateRPIWithPPG()
         [Trait(
             Category.AcceptanceType,
             Category.CheckIn)]
-        public void TestUpdateRPIWithPPG()
+        public void TestUpdateRPIWithAdditionalProperties()
         {
-            this.VaultSettingsFilePath = System.IO.Path.Combine(
-                System.AppDomain.CurrentDomain.BaseDirectory,
-                "ScenarioTests", "B2A", "B2AInput", "B2A.VaultCredentials");
             this.RunPowerShellTest(
                 _logger,
                 Constants.NewModel,
-                "Test-UpdateRPIWithProximityPlacementGroup -vaultSettingsFilePath \"" +
+                "Test-UpdateRPIWithAdditionalProperties -vaultSettingsFilePath \"" +
                 this.VaultSettingsFilePath +
                 "\"");
         }
@@ -177,9 +168,6 @@ public void TestUpdateRPIWithPPG()
             Category.CheckIn)]
         public void TestCreateRPIWithAvZone()
         {
-            this.VaultSettingsFilePath = System.IO.Path.Combine(
-                System.AppDomain.CurrentDomain.BaseDirectory,
-                "ScenarioTests", "B2A", "B2AInput", "B2A.VaultCredentials");
             this.RunPowerShellTest(
                 _logger,
                 Constants.NewModel,
@@ -194,32 +182,12 @@ public void TestCreateRPIWithAvZone()
             Category.CheckIn)]
         public void TestUpdateRPIWithAvZone()
         {
-            this.VaultSettingsFilePath = System.IO.Path.Combine(
-                System.AppDomain.CurrentDomain.BaseDirectory,
-                "ScenarioTests", "B2A", "B2AInput", "B2A.VaultCredentials");
             this.RunPowerShellTest(
                 _logger,
                 Constants.NewModel,
                 "Test-UpdateRPIWithAvailabilityZone -vaultSettingsFilePath \"" +
                 this.VaultSettingsFilePath +
                 "\"");
         }
-
-        [Fact]
-        [Trait(
-            Category.AcceptanceType,
-            Category.CheckIn)]
-        public void TestCreateRPIWithManagedDisk()
-        {
-            this.VaultSettingsFilePath = System.IO.Path.Combine(
-                System.AppDomain.CurrentDomain.BaseDirectory,
-                "ScenarioTests", "B2A", "B2AInput", "B2A.VaultCredentials");
-            this.RunPowerShellTest(
-                _logger,
-                Constants.NewModel,
-                "Test-CreateRPIWithManagedDisk -vaultSettingsFilePath \"" +
-                this.VaultSettingsFilePath +
-                "\"");
-        }
     }
 }