Rerecorded reservedIP tests

Author: Avijit Gupta

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Network/RemoveAzureVirtualIP.cs

@@ -27,8 +27,7 @@ public RemoveAzureVirtualIP()
         {
         }
 
-        public RemoveAzureVirtualIP(IClientProvider provider) 
-            : base(provider)
+        public RemoveAzureVirtualIP(IClientProvider provider) : base(provider)
         {
         }
 

src/ServiceManagement/Network/Commands.Network.Test/Commands.ServiceManagement.Network.Test.csproj

@@ -164,11 +164,11 @@
     <Compile Include="Routes\SetRouteTests.cs" />
     <Compile Include="Routes\SetSubnetRouteTableTests.cs" />
     <Compile Include="ScenarioTests\IPForwarding\IPForwardingScenarioTests.cs" />
-    <Compile Include="ScenarioTests\MultiVip\MultiVipScenarioTests.cs" />
+    <Compile Include="ScenarioTests\MultiVip\MultiVip.cs" />
     <Compile Include="ScenarioTests\NetworkSecurityGroup\NSGScenarioTests.cs" />
     <Compile Include="ScenarioTests\NetworkTests.cs" />
     <Compile Include="ScenarioTests\NetworkTestsBase.cs" />
-    <Compile Include="ScenarioTests\ReservedIPs\ReservedIPScenarioTests.cs" />
+    <Compile Include="ScenarioTests\ReservedIPs\ReservedIP.cs" />
     <Compile Include="TestInterfaces\TestClientProvider.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -231,18 +231,6 @@
     <None Include="ScenarioTests\ReservedIPs\ReservedIPTests.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.MultiVip.MultiVipScenarioTests\AdditionalVipLifecycle.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.MultiVip.MultiVipScenarioTests\AdditionalVipMobility.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.MultiVip.MultiVipScenarioTests\ReserveMultivipDepIP.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.MultiVip.MultiVipScenarioTests\SetLBEndpointMultivipDep.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.NSGScenarioTests\CreateAndRemoveNSG.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -270,22 +258,19 @@
     <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.NSGScenarioTests\SetNSRWithInvalidParameter.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.ReservedIPs.ReservedIPScenarioTests\AzureReservedIPSimpleOperations.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.ReservedIPs.ReservedIPScenarioTests\CreateVMWithReservedIP.json">
+    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.ReservedIP\AzureReservedIPSimpleOps.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.ReservedIPs.ReservedIPScenarioTests\NewAzureReservedIPSimple.json">
+    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.ReservedIP\CreateVMWithReservedIP.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.ReservedIPs.ReservedIPScenarioTests\RemoveReservedIPAssociationSimple.json">
+    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.ReservedIP\RemoveReservedIPAssocSimple.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.ReservedIPs.ReservedIPScenarioTests\ReserveExistingDeploymentIP.json">
+    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.ReservedIP\ReserveExistingDepIP.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.ReservedIPs.ReservedIPScenarioTests\SetReservedIPAssociationSimple.json">
+    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.ReservedIP\SetReservedIPAssocSimple.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="TestData\EmptyNetworkConfiguration.xml">

src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/MultiVip/MultiVipScenarioTests.cs renamed to src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/MultiVip/MultiVip.cs

@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.MultiVip
+namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests
 {
     using Microsoft.Azure.Common.Authentication;
     using Microsoft.Azure.Test;
@@ -31,15 +31,15 @@ public class MultiVipScenarioTests
         [Fact]
         [Trait(Category.Service, Category.Network)]
         [Trait(Category.RunType, Category.CheckIn)]
-        public void AdditionalVipLifecycle()
+        public void ExtraVipLifecycle()
         {
             RunPowerShellTest("Test-AdditionalVipLifecycle");
         }
 
         [Fact]
         [Trait(Category.Service, Category.Network)]
         [Trait(Category.RunType, Category.CheckIn)]
-        public void AdditionalVipMobility()
+        public void ExtraVipMobility()
         {
             RunPowerShellTest("Test-AdditionalVipMobility");
         }
@@ -55,7 +55,7 @@ public void ReserveMultivipDepIP()
         [Fact]
         [Trait(Category.Service, Category.Network)]
         [Trait(Category.RunType, Category.CheckIn)]
-        public void SetLBEndpointMultivipDep()
+        public void SetLbEpMultivipDep()
         {
             RunPowerShellTest("Test-SetLBEndpoint");
         }

src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/ReservedIPs/ReservedIPScenarioTests.cs renamed to src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/ReservedIPs/ReservedIP.cs

@@ -1,4 +1,18 @@
-namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.ReservedIPs
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests
 {
     using Microsoft.Azure.Common.Authentication;
     using Microsoft.Azure.Test;
@@ -10,14 +24,14 @@
     using System.Linq;
     using Xunit;
 
-    public class ReservedIPScenarioTests
+    public class ReservedIP
     {
         private readonly EnvironmentSetupHelper helper = new EnvironmentSetupHelper();
 
         [Fact]
         [Trait(Category.Service, Category.Network)]
         [Trait(Category.RunType, Category.CheckIn)]
-        public void AzureReservedIPSimpleOperations()
+        public void AzureReservedIPSimpleOps()
         {
             RunPowerShellTest("Test-AzureReservedIPSimpleOperations");
         }
@@ -33,23 +47,23 @@ public void CreateVMWithReservedIP()
         [Fact]
         [Trait(Category.Service, Category.Network)]
         [Trait(Category.RunType, Category.CheckIn)]
-        public void SetReservedIPAssociationSimple()
+        public void SetReservedIPAssocSimple()
         {
             RunPowerShellTest("Test-SetAzureReservedIPAssociationSingleVip");
         }
 
         [Fact]
         [Trait(Category.Service, Category.Network)]
         [Trait(Category.RunType, Category.CheckIn)]
-        public void RemoveReservedIPAssociationSimple()
+        public void RemoveReservedIPAssocSimple()
         {
             RunPowerShellTest("Test-RemoveAzureReservedIPAssociationSingleVip");
         }
 
         [Fact]
         [Trait(Category.Service, Category.Network)]
         [Trait(Category.RunType, Category.CheckIn)]
-        public void ReserveExistingDeploymentIP()
+        public void ReserveExistingDepIP()
         {
             RunPowerShellTest("Test-ReserveExistingDeploymentIP");
         }