diff --git a/src/Network/Network.Test/Network.Test.csproj b/src/Network/Network.Test/Network.Test.csproj index f74d64abe06e..7db8952cce3b 100644 --- a/src/Network/Network.Test/Network.Test.csproj +++ b/src/Network/Network.Test/Network.Test.csproj @@ -25,7 +25,6 @@ - diff --git a/src/Network/Network.Test/NetworkResourcesController.cs b/src/Network/Network.Test/NetworkResourcesController.cs deleted file mode 100644 index f090c994bdec..000000000000 --- a/src/Network/Network.Test/NetworkResourcesController.cs +++ /dev/null @@ -1,218 +0,0 @@ -// ---------------------------------------------------------------------------------- -// -// 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. -// ---------------------------------------------------------------------------------- - -using Microsoft.Azure.Commands.Common.Authentication; -using Microsoft.Azure.Management.Compute; -using Microsoft.Azure.Management.ContainerInstance; -using Microsoft.Azure.Management.ManagedServiceIdentity; -using Microsoft.Azure.Management.Network; -using Microsoft.Azure.Management.Redis; -using Microsoft.Azure.Management.OperationalInsights; -using Microsoft.Azure.Test.HttpRecorder; -using Microsoft.WindowsAzure.Commands.ScenarioTest; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using Microsoft.Azure.Management.Internal.Resources; -using Microsoft.Azure.ServiceManagement.Common.Models; -using Microsoft.Rest.ClientRuntime.Azure.TestFramework; -using Microsoft.Azure.Management.Storage.Version2017_10_01; - -namespace Commands.Network.Test -{ - public sealed class NetworkResourcesController - { - private readonly EnvironmentSetupHelper _helper; - - public NetworkManagementClient NetworkManagementClient { get; private set; } - - public ComputeManagementClient ComputeManagementClient { get; private set; } - - public ContainerInstanceManagementClient ContainerInstanceManagementClient { get; set; } - - public StorageManagementClient StorageManagementClient { get; private set; } - - public RedisManagementClient RedisManagementClient { get; private set; } - - public OperationalInsightsManagementClient OperationalInsightsManagementClient { get; private set; } - - public ManagedServiceIdentityClient ManagedServiceIdentityClient { get; private set; } - - public static NetworkResourcesController NewInstance => new NetworkResourcesController(); - - public NetworkResourcesController() - { - _helper = new EnvironmentSetupHelper(); - } - - public void RunPsTest(XunitTracingInterceptor logger, params string[] scripts) - { - _helper.TracingInterceptor = logger; - var d = new Dictionary - { - {"Microsoft.Resources", null}, - {"Microsoft.Compute", null}, - {"Microsoft.Features", null}, - {"Microsoft.Authorization", null}, - {"Microsoft.Storage", null}, - {"Microsoft.ManagedServiceIdentity", null} - }; - var providersToIgnore = new Dictionary - { - {"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01"} - }; - HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(true, d, providersToIgnore); - - var sf = new StackTrace().GetFrame(1); - var callingClassType = sf.GetMethod().ReflectedType?.ToString(); - var mockName = sf.GetMethod().Name; - - RunPsTestWorkflow( - () => scripts, - // no custom cleanup - null, - callingClassType, - mockName); - } - - public void RunPsTestWorkflow( - Func scriptBuilder, - Action cleanup, - string callingClassType, - string mockName) - { - HttpMockServer.RecordsDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SessionRecords"); - using (var context = MockContext.Start(callingClassType, mockName)) - { - SetupManagementClients(context); - - _helper.SetupEnvironment(AzureModule.AzureResourceManager); - - var callingClassName = callingClassType.Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries).Last(); - var scenarioTestsDir = Path.Combine(Directory.GetCurrentDirectory(), "ScenarioTests"); - string psScriptPath = null; - - var testDirs = Directory.GetDirectories(scenarioTestsDir).ToList(); - testDirs.Insert(0, scenarioTestsDir); - - foreach (var dir in testDirs) - { - var testPath = Path.Combine(dir, callingClassName + ".ps1"); - if (File.Exists(testPath)) - { - psScriptPath = testPath; - break; - } - } - - if (psScriptPath == null) - { - throw new FileNotFoundException(string.Format("Couldn't find ps1 file for test class '{0}'", callingClassName)); - } - - _helper.SetupModules(AzureModule.AzureResourceManager, - "ScenarioTests\\Common.ps1", - psScriptPath, - _helper.RMProfileModule, - _helper.GetRMModulePath("AzureRM.Monitor.psd1"), - _helper.GetRMModulePath("AzureRM.Network.psd1"), - _helper.GetRMModulePath("AzureRM.Compute.psd1"), - _helper.GetRMModulePath("AzureRM.ContainerInstance.psd1"), - _helper.GetRMModulePath("AzureRM.OperationalInsights.psd1"), - _helper.GetRMModulePath("AzureRM.ManagedServiceIdentity.psd1"), - "AzureRM.Storage.ps1", - _helper.GetRMModulePath("AzureRM.Storage.psd1"), - "AzureRM.Resources.ps1"); - - try - { - var psScripts = scriptBuilder?.Invoke(); - if (psScripts != null) - { - _helper.RunPowerShellTest(psScripts); - } - } - finally - { - cleanup?.Invoke(); - } - } - } - - private static ResourceManagementClient GetResourceManagerResourceManagementClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } - - private void SetupManagementClients(MockContext context) - { - var resourceManagerResourceManagementClient = GetResourceManagerResourceManagementClient(context); - NetworkManagementClient = GetNetworkManagementClient(context); - ComputeManagementClient = GetComputeManagementClient(context); - ContainerInstanceManagementClient = GetContainerInstanceManagementClient(context); - StorageManagementClient = GetStorageManagementClient(context); - RedisManagementClient = GetRedisManagementClient(context); - OperationalInsightsManagementClient = GetOperationalInsightsManagementClient(context); - ManagedServiceIdentityClient = GetManagedServiceIdentityClient(context); - - _helper.SetupManagementClients( - resourceManagerResourceManagementClient, - NetworkManagementClient, - ComputeManagementClient, - ContainerInstanceManagementClient, - StorageManagementClient, - RedisManagementClient, - OperationalInsightsManagementClient, - ManagedServiceIdentityClient); - } - - private static ManagedServiceIdentityClient GetManagedServiceIdentityClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } - - private static NetworkManagementClient GetNetworkManagementClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } - - private static StorageManagementClient GetStorageManagementClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } - - private static RedisManagementClient GetRedisManagementClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } - - private static ComputeManagementClient GetComputeManagementClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } - - private static OperationalInsightsManagementClient GetOperationalInsightsManagementClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } - - private static ContainerInstanceManagementClient GetContainerInstanceManagementClient(MockContext context) - { - return context.GetServiceClient(TestEnvironmentFactory.GetTestEnvironment()); - } -} -} - diff --git a/src/Network/Network.Test/ScenarioTests/ApplicationGatewayTests.cs b/src/Network/Network.Test/ScenarioTests/ApplicationGatewayTests.cs index e63f5b586f03..6c35e9673017 100644 --- a/src/Network/Network.Test/ScenarioTests/ApplicationGatewayTests.cs +++ b/src/Network/Network.Test/ScenarioTests/ApplicationGatewayTests.cs @@ -13,22 +13,17 @@ // ---------------------------------------------------------------------------------- using System; -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class ApplicationGatewayTests : RMTestBase + public class ApplicationGatewayTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public ApplicationGatewayTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -36,7 +31,7 @@ public ApplicationGatewayTests(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.nvadev)] public void TestAvailableSslOptions() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-AvailableSslOptions")); + TestRunner.RunTestScript("Test-AvailableSslOptions"); } [Fact] @@ -44,7 +39,7 @@ public void TestAvailableSslOptions() [Trait(Category.Owner, NrpTeamAlias.nvadev)] public void TestAvailableWafRuleSets() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-AvailableWafRuleSets")); + TestRunner.RunTestScript("Test-AvailableWafRuleSets"); } [Fact] @@ -52,7 +47,7 @@ public void TestAvailableWafRuleSets() [Trait(Category.Owner, NrpTeamAlias.nvadev)] public void TestApplicationGatewayCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationGatewayCRUD -baseDir '{0}'", AppDomain.CurrentDomain.BaseDirectory)); + TestRunner.RunTestScript(string.Format("Test-ApplicationGatewayCRUD -baseDir '{0}'", AppDomain.CurrentDomain.BaseDirectory)); } [Fact] @@ -60,7 +55,7 @@ public void TestApplicationGatewayCRUD() [Trait(Category.Owner, NrpTeamAlias.nvadev)] public void TestApplicationGatewayCRUD2() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationGatewayCRUD2 -baseDir '{0}'", AppDomain.CurrentDomain.BaseDirectory)); + TestRunner.RunTestScript(string.Format("Test-ApplicationGatewayCRUD2 -baseDir '{0}'", AppDomain.CurrentDomain.BaseDirectory)); } [Fact] @@ -68,7 +63,7 @@ public void TestApplicationGatewayCRUD2() [Trait(Category.Owner, NrpTeamAlias.nvadev)] public void TestApplicationGatewayCRUD3() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationGatewayCRUD3 -baseDir '{0}'", AppDomain.CurrentDomain.BaseDirectory)); + TestRunner.RunTestScript(string.Format("Test-ApplicationGatewayCRUD3 -baseDir '{0}'", AppDomain.CurrentDomain.BaseDirectory)); } [Fact] @@ -76,7 +71,7 @@ public void TestApplicationGatewayCRUD3() [Trait(Category.Owner, NrpTeamAlias.nvadev)] public void TestApplicationGatewayCRUDSubItems() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationGatewayCRUDSubItems -baseDir '{0}'", AppDomain.CurrentDomain.BaseDirectory)); + TestRunner.RunTestScript(string.Format("Test-ApplicationGatewayCRUDSubItems -baseDir '{0}'", AppDomain.CurrentDomain.BaseDirectory)); } [Fact] @@ -84,7 +79,7 @@ public void TestApplicationGatewayCRUDSubItems() [Trait(Category.Owner, NrpTeamAlias.nvadev)] public void TestApplicationGatewayCRUDSubItems2() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationGatewayCRUDSubItems2 -baseDir '{0}'", AppDomain.CurrentDomain.BaseDirectory)); + TestRunner.RunTestScript(string.Format("Test-ApplicationGatewayCRUDSubItems2 -baseDir '{0}'", AppDomain.CurrentDomain.BaseDirectory)); } [Fact] @@ -92,7 +87,7 @@ public void TestApplicationGatewayCRUDSubItems2() [Trait(Category.Owner, Category.nvadev)] public void TestApplicationGatewayCRUDRewriteRuleSet() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationGatewayCRUDRewriteRuleSet -baseDir '{0}'", AppDomain.CurrentDomain.BaseDirectory)); + TestRunner.RunTestScript(string.Format("Test-ApplicationGatewayCRUDRewriteRuleSet -baseDir '{0}'", AppDomain.CurrentDomain.BaseDirectory)); } } } diff --git a/src/Network/Network.Test/ScenarioTests/ApplicationSecurityGroupTests.cs b/src/Network/Network.Test/ScenarioTests/ApplicationSecurityGroupTests.cs index 19bc21dee4d3..039902265cae 100644 --- a/src/Network/Network.Test/ScenarioTests/ApplicationSecurityGroupTests.cs +++ b/src/Network/Network.Test/ScenarioTests/ApplicationSecurityGroupTests.cs @@ -12,23 +12,17 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using System; -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class ApplicationSecurityGroupTests : RMTestBase + public class ApplicationSecurityGroupTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public ApplicationSecurityGroupTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -36,7 +30,7 @@ public ApplicationSecurityGroupTests(Xunit.Abstractions.ITestOutputHelper output [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestApplicationSecurityGroupCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationSecurityGroupCRUD")); + TestRunner.RunTestScript(string.Format("Test-ApplicationSecurityGroupCRUD")); } [Fact] @@ -44,7 +38,7 @@ public void TestApplicationSecurityGroupCRUD() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestApplicationSecurityGroupCollections() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationSecurityGroupCollections")); + TestRunner.RunTestScript(string.Format("Test-ApplicationSecurityGroupCollections")); } [Fact] @@ -52,8 +46,8 @@ public void TestApplicationSecurityGroupCollections() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestApplicationSecurityGroupInNewSecurityRule() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationSecurityGroupInNewSecurityRule")); - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationSecurityGroupInNewSecurityRule -useIds $True")); + TestRunner.RunTestScript(string.Format("Test-ApplicationSecurityGroupInNewSecurityRule")); + TestRunner.RunTestScript(string.Format("Test-ApplicationSecurityGroupInNewSecurityRule -useIds $True")); } [Fact] @@ -61,8 +55,8 @@ public void TestApplicationSecurityGroupInNewSecurityRule() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestApplicationSecurityGroupInAddedSecurityRule() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationSecurityGroupInAddedSecurityRule")); - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationSecurityGroupInAddedSecurityRule -useIds $True")); + TestRunner.RunTestScript(string.Format("Test-ApplicationSecurityGroupInAddedSecurityRule")); + TestRunner.RunTestScript(string.Format("Test-ApplicationSecurityGroupInAddedSecurityRule -useIds $True")); } [Fact] @@ -70,8 +64,8 @@ public void TestApplicationSecurityGroupInAddedSecurityRule() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestApplicationSecurityGroupInSetSecurityRule() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationSecurityGroupInSetSecurityRule")); - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationSecurityGroupInSetSecurityRule -useIds $True")); + TestRunner.RunTestScript(string.Format("Test-ApplicationSecurityGroupInSetSecurityRule")); + TestRunner.RunTestScript(string.Format("Test-ApplicationSecurityGroupInSetSecurityRule -useIds $True")); } [Fact] @@ -79,7 +73,7 @@ public void TestApplicationSecurityGroupInSetSecurityRule() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestApplicationSecurityGroupInNewNetworkInterface() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationSecurityGroupInNewNetworkInterface")); + TestRunner.RunTestScript(string.Format("Test-ApplicationSecurityGroupInNewNetworkInterface")); } [Fact] @@ -87,8 +81,8 @@ public void TestApplicationSecurityGroupInNewNetworkInterface() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestApplicationSecurityGroupInNewNetworkInterfaceIpConfig() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationSecurityGroupInNewNetworkInterfaceIpConfig")); - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationSecurityGroupInNewNetworkInterfaceIpConfig -useIds $True")); + TestRunner.RunTestScript(string.Format("Test-ApplicationSecurityGroupInNewNetworkInterfaceIpConfig")); + TestRunner.RunTestScript(string.Format("Test-ApplicationSecurityGroupInNewNetworkInterfaceIpConfig -useIds $True")); } [Fact] @@ -96,8 +90,8 @@ public void TestApplicationSecurityGroupInNewNetworkInterfaceIpConfig() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestApplicationSecurityGroupInAddedNetworkInterfaceIpConfig() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationSecurityGroupInAddedNetworkInterfaceIpConfig")); - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ApplicationSecurityGroupInAddedNetworkInterfaceIpConfig -useIds $True")); + TestRunner.RunTestScript(string.Format("Test-ApplicationSecurityGroupInAddedNetworkInterfaceIpConfig")); + TestRunner.RunTestScript(string.Format("Test-ApplicationSecurityGroupInAddedNetworkInterfaceIpConfig -useIds $True")); } } } diff --git a/src/Network/Network.Test/ScenarioTests/Generated/ApplicationSecurityGroupTestsGenerated.cs b/src/Network/Network.Test/ScenarioTests/ApplicationSecurityGroupTestsGenerated.cs similarity index 72% rename from src/Network/Network.Test/ScenarioTests/Generated/ApplicationSecurityGroupTestsGenerated.cs rename to src/Network/Network.Test/ScenarioTests/ApplicationSecurityGroupTestsGenerated.cs index f9a29975fcee..5ac04fe4417e 100644 --- a/src/Network/Network.Test/ScenarioTests/Generated/ApplicationSecurityGroupTestsGenerated.cs +++ b/src/Network/Network.Test/ScenarioTests/ApplicationSecurityGroupTestsGenerated.cs @@ -24,23 +24,17 @@ // Please contact wanrpdev@microsoft.com if you need to make changes to this file. // -using System; -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class ApplicationSecurityGroupTestsGenerated : RMTestBase + public class ApplicationSecurityGroupTestsGenerated : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public ApplicationSecurityGroupTestsGenerated(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -48,7 +42,7 @@ public ApplicationSecurityGroupTestsGenerated(Xunit.Abstractions.ITestOutputHelp [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestApplicationSecurityGroupCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ApplicationSecurityGroupCRUDMinimalParameters"); + TestRunner.RunTestScript("Test-ApplicationSecurityGroupCRUDMinimalParameters"); } [Fact] @@ -56,7 +50,7 @@ public void TestApplicationSecurityGroupCRUDMinimalParameters() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestApplicationSecurityGroupCRUDAllParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ApplicationSecurityGroupCRUDAllParameters"); + TestRunner.RunTestScript("Test-ApplicationSecurityGroupCRUDAllParameters"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/Generated/ApplicationSecurityGroupTestsGenerated.ps1 b/src/Network/Network.Test/ScenarioTests/ApplicationSecurityGroupTestsGenerated.ps1 similarity index 100% rename from src/Network/Network.Test/ScenarioTests/Generated/ApplicationSecurityGroupTestsGenerated.ps1 rename to src/Network/Network.Test/ScenarioTests/ApplicationSecurityGroupTestsGenerated.ps1 diff --git a/src/Network/Network.Test/ScenarioTests/AvailableDelegationsTests.cs b/src/Network/Network.Test/ScenarioTests/AvailableDelegationsTests.cs index c69c86f605e4..19eb00dbcb0b 100644 --- a/src/Network/Network.Test/ScenarioTests/AvailableDelegationsTests.cs +++ b/src/Network/Network.Test/ScenarioTests/AvailableDelegationsTests.cs @@ -12,21 +12,17 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class AvailableDelegationsTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class AvailableDelegationsTests :NetworkTestRunner { - public XunitTracingInterceptor _logger; - public AvailableDelegationsTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -34,7 +30,7 @@ public AvailableDelegationsTests(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestAvailableDelegationsList() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-GetAvailableDelegationsList"); + TestRunner.RunTestScript( "Test-GetAvailableDelegationsList"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/AvailableEndpointServicesTests.cs b/src/Network/Network.Test/ScenarioTests/AvailableEndpointServicesTests.cs index 52de88f06430..6a03c5907f28 100644 --- a/src/Network/Network.Test/ScenarioTests/AvailableEndpointServicesTests.cs +++ b/src/Network/Network.Test/ScenarioTests/AvailableEndpointServicesTests.cs @@ -12,21 +12,17 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class AvailableEndpointServicesTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class AvailableEndpointServicesTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public AvailableEndpointServicesTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -34,7 +30,7 @@ public AvailableEndpointServicesTests(Xunit.Abstractions.ITestOutputHelper outpu [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestAvailableEndpointServicesList() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkAvailableEndpointServicesList"); + TestRunner.RunTestScript("Test-VirtualNetworkAvailableEndpointServicesList"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/AzureFirewallFqdnTagTests.cs b/src/Network/Network.Test/ScenarioTests/AzureFirewallFqdnTagTests.cs index 3c7ff3839ba3..2cff55edaffa 100644 --- a/src/Network/Network.Test/ScenarioTests/AzureFirewallFqdnTagTests.cs +++ b/src/Network/Network.Test/ScenarioTests/AzureFirewallFqdnTagTests.cs @@ -12,6 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; @@ -19,14 +20,11 @@ namespace Commands.Network.Test.ScenarioTests { - public class AzureFirewallFqdnTagTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class AzureFirewallFqdnTagTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public AzureFirewallFqdnTagTests(ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output)); } [Fact] @@ -34,7 +32,7 @@ public AzureFirewallFqdnTagTests(ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.azurefirewall)] public void TestListAzureFirewallFqdnTag() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ListAzureFirewallFqdnTag"); + TestRunner.RunTestScript("Test-ListAzureFirewallFqdnTag"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/AzureFirewallTests.cs b/src/Network/Network.Test/ScenarioTests/AzureFirewallTests.cs index 88160b970bdd..b67df4b15c5a 100644 --- a/src/Network/Network.Test/ScenarioTests/AzureFirewallTests.cs +++ b/src/Network/Network.Test/ScenarioTests/AzureFirewallTests.cs @@ -12,21 +12,18 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class AzureFirewallTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class AzureFirewallTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public AzureFirewallTests(ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output)); } [Fact] @@ -34,7 +31,7 @@ public AzureFirewallTests(ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.azurefirewall)] public void TestAzureFirewallCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-AzureFirewallCRUD"); + TestRunner.RunTestScript("Test-AzureFirewallCRUD"); } [Fact] @@ -42,7 +39,7 @@ public void TestAzureFirewallCRUD() [Trait(Category.Owner, NrpTeamAlias.azurefirewall)] public void TestAzureFirewallAllocateAndDeallocate() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-AzureFirewallAllocateAndDeallocate"); + TestRunner.RunTestScript("Test-AzureFirewallAllocateAndDeallocate"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/CortexTests.cs b/src/Network/Network.Test/ScenarioTests/CortexTests.cs index 653b52bc67b6..cc85b3379142 100644 --- a/src/Network/Network.Test/ScenarioTests/CortexTests.cs +++ b/src/Network/Network.Test/ScenarioTests/CortexTests.cs @@ -12,22 +12,19 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; + namespace Commands.Network.Test.ScenarioTests { - using System; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; - using Microsoft.Azure.ServiceManagement.Common.Models; using Xunit.Abstractions; - public class CortexTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class CortexTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public CortexTests(ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output)); } [Fact] @@ -35,7 +32,7 @@ public CortexTests(ITestOutputHelper output) [Trait(Category.Owner, Category.brooklynft)] public void TestCortexCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-CortexCRUD"); + TestRunner.RunTestScript("Test-CortexCRUD"); } [Fact] @@ -43,7 +40,7 @@ public void TestCortexCRUD() [Trait(Category.Owner, Category.pgtm)] public void TestCortexExpressRouteCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-CortexExpressRouteCRUD"); + TestRunner.RunTestScript("Test-CortexExpressRouteCRUD"); } [Fact] @@ -51,7 +48,7 @@ public void TestCortexExpressRouteCRUD() [Trait(Category.Owner, Category.brooklynft)] public void TestCortexDownloadConfig() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-CortexDownloadConfig"); + TestRunner.RunTestScript("Test-CortexDownloadConfig"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/DdosProtectionPlanTests.cs b/src/Network/Network.Test/ScenarioTests/DdosProtectionPlanTests.cs index 114bd8d96bbf..abc889098a2a 100644 --- a/src/Network/Network.Test/ScenarioTests/DdosProtectionPlanTests.cs +++ b/src/Network/Network.Test/ScenarioTests/DdosProtectionPlanTests.cs @@ -12,23 +12,17 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using System; -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class DdosProtectionPlanTests : RMTestBase + public class DdosProtectionPlanTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public DdosProtectionPlanTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -36,7 +30,7 @@ public DdosProtectionPlanTests(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestDdosProtectionPlanCrud() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-DdosProtectionPlanCRUD")); + TestRunner.RunTestScript(string.Format("Test-DdosProtectionPlanCRUD")); } [Fact] @@ -44,7 +38,7 @@ public void TestDdosProtectionPlanCrud() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestDdosProtectionPlanCrudWithVirtualNetwork() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-DdosProtectionPlanCRUDWithVirtualNetwork")); + TestRunner.RunTestScript(string.Format("Test-DdosProtectionPlanCRUDWithVirtualNetwork")); } [Fact] @@ -52,7 +46,7 @@ public void TestDdosProtectionPlanCrudWithVirtualNetwork() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestDdosProtectionPlanCollections() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-DdosProtectionPlanCollections")); + TestRunner.RunTestScript(string.Format("Test-DdosProtectionPlanCollections")); } } } diff --git a/src/Network/Network.Test/ScenarioTests/ExpressRouteCircuitTests.cs b/src/Network/Network.Test/ScenarioTests/ExpressRouteCircuitTests.cs index 4bfd7d7389c1..a1ece9f557af 100644 --- a/src/Network/Network.Test/ScenarioTests/ExpressRouteCircuitTests.cs +++ b/src/Network/Network.Test/ScenarioTests/ExpressRouteCircuitTests.cs @@ -12,21 +12,18 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class ExpressRouteCircuitTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class ExpressRouteCircuitTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public ExpressRouteCircuitTests(ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -34,7 +31,7 @@ public ExpressRouteCircuitTests(ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.pgtm)] public void TestExpressRouteCircuitStageCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ExpressRouteCircuitStageCRUD"); + TestRunner.RunTestScript("Test-ExpressRouteCircuitStageCRUD"); } [Fact] @@ -42,7 +39,7 @@ public void TestExpressRouteCircuitStageCRUD() [Trait(Category.Owner, NrpTeamAlias.pgtm)] public void TestExpressRouteCircuitCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ExpressRouteCircuitCRUD"); + TestRunner.RunTestScript("Test-ExpressRouteCircuitCRUD"); } [Fact] @@ -50,7 +47,7 @@ public void TestExpressRouteCircuitCRUD() [Trait(Category.Owner, NrpTeamAlias.pgtm)] public void TestExpressRouteCircuitPrivatePublicPeeringCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ExpressRouteCircuitPrivatePublicPeeringCRUD"); + TestRunner.RunTestScript("Test-ExpressRouteCircuitPrivatePublicPeeringCRUD"); } [Fact] @@ -58,7 +55,7 @@ public void TestExpressRouteCircuitPrivatePublicPeeringCRUD() [Trait(Category.Owner, NrpTeamAlias.pgtm)] public void TestExpressRouteCircuitMicrosoftPeeringCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ExpressRouteCircuitMicrosoftPeeringCRUD"); + TestRunner.RunTestScript("Test-ExpressRouteCircuitMicrosoftPeeringCRUD"); } [Fact] @@ -66,7 +63,7 @@ public void TestExpressRouteCircuitMicrosoftPeeringCRUD() [Trait(Category.Owner, NrpTeamAlias.pgtm)] public void TestExpressRouteCircuitAuthorizationCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ExpressRouteCircuitAuthorizationCRUD"); + TestRunner.RunTestScript("Test-ExpressRouteCircuitAuthorizationCRUD"); } [Fact] @@ -74,7 +71,7 @@ public void TestExpressRouteCircuitAuthorizationCRUD() [Trait(Category.Owner, NrpTeamAlias.pgtm)] public void TestExpressRouteBgpServiceCommunitiesGet() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ExpressRouteBGPServiceCommunities"); + TestRunner.RunTestScript("Test-ExpressRouteBGPServiceCommunities"); } [Fact] @@ -82,7 +79,7 @@ public void TestExpressRouteBgpServiceCommunitiesGet() [Trait(Category.Owner, NrpTeamAlias.pgtm)] public void TestExpressRouteRouteFilterCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ExpressRouteRouteFilters"); + TestRunner.RunTestScript("Test-ExpressRouteRouteFilters"); } [Fact] @@ -90,7 +87,7 @@ public void TestExpressRouteRouteFilterCRUD() [Trait(Category.Owner, NrpTeamAlias.pgtm)] public void TestExpressRouteCircuitConnectionCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ExpressRouteCircuitConnectionCRUD"); + TestRunner.RunTestScript("Test-ExpressRouteCircuitConnectionCRUD"); } [Fact] @@ -98,7 +95,7 @@ public void TestExpressRouteCircuitConnectionCRUD() [Trait(Category.Owner, NrpTeamAlias.pgtm)] public void TestExpressRouteCircuitPeeringWithRouteFilter() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ExpressRouteCircuitPeeringWithRouteFilter"); + TestRunner.RunTestScript("Test-ExpressRouteCircuitPeeringWithRouteFilter"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/Generated/ExpressRouteCircuitTestsGenerated.cs b/src/Network/Network.Test/ScenarioTests/ExpressRouteCircuitTestsGenerated.cs similarity index 69% rename from src/Network/Network.Test/ScenarioTests/Generated/ExpressRouteCircuitTestsGenerated.cs rename to src/Network/Network.Test/ScenarioTests/ExpressRouteCircuitTestsGenerated.cs index 7a5d09a79f89..b8e1efb731f2 100644 --- a/src/Network/Network.Test/ScenarioTests/Generated/ExpressRouteCircuitTestsGenerated.cs +++ b/src/Network/Network.Test/ScenarioTests/ExpressRouteCircuitTestsGenerated.cs @@ -24,23 +24,17 @@ // Please contact wanrpdev@microsoft.com if you need to make changes to this file. // -using System; -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class ExpressRouteCircuitTestsGenerated : RMTestBase + public class ExpressRouteCircuitTestsGenerated : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public ExpressRouteCircuitTestsGenerated(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -48,7 +42,7 @@ public ExpressRouteCircuitTestsGenerated(Xunit.Abstractions.ITestOutputHelper ou [Trait(Category.Owner, NrpTeamAlias.pgtm)] public void TestExpressRouteCircuitCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ExpressRouteCircuitCRUDMinimalParameters"); + TestRunner.RunTestScript("Test-ExpressRouteCircuitCRUDMinimalParameters"); } [Fact] @@ -56,7 +50,7 @@ public void TestExpressRouteCircuitCRUDMinimalParameters() [Trait(Category.Owner, NrpTeamAlias.pgtm)] public void TestExpressRouteCircuitCRUDAllParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ExpressRouteCircuitCRUDAllParameters"); + TestRunner.RunTestScript("Test-ExpressRouteCircuitCRUDAllParameters"); } [Fact] @@ -64,7 +58,7 @@ public void TestExpressRouteCircuitCRUDAllParameters() [Trait(Category.Owner, NrpTeamAlias.pgtm)] public void TestExpressRouteCircuitAuthorizationCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ExpressRouteCircuitAuthorizationCRUDMinimalParameters"); + TestRunner.RunTestScript("Test-ExpressRouteCircuitAuthorizationCRUDMinimalParameters"); } [Fact] @@ -72,7 +66,7 @@ public void TestExpressRouteCircuitAuthorizationCRUDMinimalParameters() [Trait(Category.Owner, NrpTeamAlias.pgtm)] public void TestExpressRouteCircuitPeeringCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ExpressRouteCircuitPeeringCRUDMinimalParameters"); + TestRunner.RunTestScript("Test-ExpressRouteCircuitPeeringCRUDMinimalParameters"); } [Fact] @@ -80,7 +74,7 @@ public void TestExpressRouteCircuitPeeringCRUDMinimalParameters() [Trait(Category.Owner, NrpTeamAlias.pgtm)] public void TestExpressRouteCircuitPeeringCRUDAllParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ExpressRouteCircuitPeeringCRUDAllParameters"); + TestRunner.RunTestScript("Test-ExpressRouteCircuitPeeringCRUDAllParameters"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/Generated/ExpressRouteCircuitTestsGenerated.ps1 b/src/Network/Network.Test/ScenarioTests/ExpressRouteCircuitTestsGenerated.ps1 similarity index 100% rename from src/Network/Network.Test/ScenarioTests/Generated/ExpressRouteCircuitTestsGenerated.ps1 rename to src/Network/Network.Test/ScenarioTests/ExpressRouteCircuitTestsGenerated.ps1 diff --git a/src/Network/Network.Test/ScenarioTests/ExpressRoutePortTests.cs b/src/Network/Network.Test/ScenarioTests/ExpressRoutePortTests.cs index 44e464344ae0..156dc6a1a377 100644 --- a/src/Network/Network.Test/ScenarioTests/ExpressRoutePortTests.cs +++ b/src/Network/Network.Test/ScenarioTests/ExpressRoutePortTests.cs @@ -12,22 +12,17 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using System; -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class ExpressRoutePortTests : RMTestBase + public class ExpressRoutePortTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; public ExpressRoutePortTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -35,7 +30,7 @@ public ExpressRoutePortTests(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, Category.pgtm)] public void TestExpressRoutePortCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ExpressRoutePortCRUD")); + TestRunner.RunTestScript(string.Format("Test-ExpressRoutePortCRUD")); } } } diff --git a/src/Network/Network.Test/ScenarioTests/ExpressRoutePortsLocationTests.cs b/src/Network/Network.Test/ScenarioTests/ExpressRoutePortsLocationTests.cs index f9181970cfc5..894e506619c8 100644 --- a/src/Network/Network.Test/ScenarioTests/ExpressRoutePortsLocationTests.cs +++ b/src/Network/Network.Test/ScenarioTests/ExpressRoutePortsLocationTests.cs @@ -12,22 +12,17 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using System; -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class ExpressRoutePortsLocationTests : RMTestBase + public class ExpressRoutePortsLocationTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; public ExpressRoutePortsLocationTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -35,7 +30,7 @@ public ExpressRoutePortsLocationTests(Xunit.Abstractions.ITestOutputHelper outpu [Trait(Category.Owner, Category.pgtm)] public void TestExpressRoutePortsLocationRead() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ExpressRoutePortsLocationRead")); + TestRunner.RunTestScript(string.Format("Test-ExpressRoutePortsLocationRead")); } } } diff --git a/src/Network/Network.Test/ScenarioTests/ExpressRouteServiceProviderTests.cs b/src/Network/Network.Test/ScenarioTests/ExpressRouteServiceProviderTests.cs index 7409930770bf..cd1f49912720 100644 --- a/src/Network/Network.Test/ScenarioTests/ExpressRouteServiceProviderTests.cs +++ b/src/Network/Network.Test/ScenarioTests/ExpressRouteServiceProviderTests.cs @@ -12,21 +12,18 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class ExpressRouteServiceProviderTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class ExpressRouteServiceProviderTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public ExpressRouteServiceProviderTests(ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -34,7 +31,7 @@ public ExpressRouteServiceProviderTests(ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.pgtm)] public void TestExpressRouteServiceProviderList() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ExpressRouteServiceProviderList"); + TestRunner.RunTestScript("Test-ExpressRouteServiceProviderList"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/Generated/_metadata.txt b/src/Network/Network.Test/ScenarioTests/Generated/_metadata.txt deleted file mode 100644 index 30aed96c20b1..000000000000 --- a/src/Network/Network.Test/ScenarioTests/Generated/_metadata.txt +++ /dev/null @@ -1,6 +0,0 @@ -ApplicationSecurityGroupTestsGenerated.cs 299A1E5866F1F33032F70699B1B9A1790689CD35 -ApplicationSecurityGroupTestsGenerated.ps1 F301B95C15D09849BEAFF179E88550A31CA04A57 -RouteTableTestsGenerated.cs 6124FD9651C6775BA3105B9035DD434B0C5E8533 -RouteTableTestsGenerated.ps1 4F4B35B6253B609C63A3B7D41BB931DA037AD305 -UsageTestsGenerated.cs 14A23D510E75D793018F706234629F236EFC7B05 -UsageTestsGenerated.ps1 31422B271F397C60CA612E78A699DFCAE2CE728A diff --git a/src/Network/Network.Test/ScenarioTests/LoadBalancerTests.cs b/src/Network/Network.Test/ScenarioTests/LoadBalancerTests.cs index b447e89054cd..4f9cbd90cd67 100644 --- a/src/Network/Network.Test/ScenarioTests/LoadBalancerTests.cs +++ b/src/Network/Network.Test/ScenarioTests/LoadBalancerTests.cs @@ -12,21 +12,17 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class LoadBalancerTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class LoadBalancerTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public LoadBalancerTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -34,7 +30,7 @@ public LoadBalancerTests(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerCRUDPublic() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUD-Public"); + TestRunner.RunTestScript("Test-LoadBalancerCRUD-Public"); } [Fact] @@ -42,7 +38,7 @@ public void TestLoadBalancerCRUDPublic() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerCRUDPublicTcpReset() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUD-PublicTcpReset"); + TestRunner.RunTestScript("Test-LoadBalancerCRUD-PublicTcpReset"); } [Fact] @@ -50,7 +46,7 @@ public void TestLoadBalancerCRUDPublicTcpReset() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerCRUDInternalDynamic() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUD-InternalDynamic"); + TestRunner.RunTestScript("Test-LoadBalancerCRUD-InternalDynamic"); } [Fact] @@ -58,7 +54,7 @@ public void TestLoadBalancerCRUDInternalDynamic() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerCRUDInternalStatic() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUD-InternalStatic"); + TestRunner.RunTestScript("Test-LoadBalancerCRUD-InternalStatic"); } [Fact] @@ -66,7 +62,7 @@ public void TestLoadBalancerCRUDInternalStatic() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerCRUDPublicNoInboundNATRule() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUD-PublicNoInboundNATRule"); + TestRunner.RunTestScript("Test-LoadBalancerCRUD-PublicNoInboundNATRule"); } [Fact] @@ -74,7 +70,7 @@ public void TestLoadBalancerCRUDPublicNoInboundNATRule() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerCRUDPublicPublicNoLbRule() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUD-PublicNoLbRule"); + TestRunner.RunTestScript("Test-LoadBalancerCRUD-PublicNoLbRule"); } [Fact] @@ -82,7 +78,7 @@ public void TestLoadBalancerCRUDPublicPublicNoLbRule() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerCRUDInternalUsingId() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUD-InternalUsingId"); + TestRunner.RunTestScript("Test-LoadBalancerCRUD-InternalUsingId"); } [Fact] @@ -90,7 +86,7 @@ public void TestLoadBalancerCRUDInternalUsingId() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerCRUDPublicUsingId() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUD-PublicUsingId"); + TestRunner.RunTestScript("Test-LoadBalancerCRUD-PublicUsingId"); } [Fact] @@ -98,7 +94,7 @@ public void TestLoadBalancerCRUDPublicUsingId() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerChildResource() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerChildResource"); + TestRunner.RunTestScript("Test-LoadBalancerChildResource"); } [Fact] @@ -106,7 +102,7 @@ public void TestLoadBalancerChildResource() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerSet() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerSet"); + TestRunner.RunTestScript("Test-LoadBalancerSet"); } [Fact] @@ -114,7 +110,7 @@ public void TestLoadBalancerSet() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestCreateEmptyLoadBalancer() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-CreateEmptyLoadBalancer"); + TestRunner.RunTestScript("Test-CreateEmptyLoadBalancer"); } [Fact] @@ -122,7 +118,7 @@ public void TestCreateEmptyLoadBalancer() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerNicAssociation() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancer-NicAssociation"); + TestRunner.RunTestScript("Test-LoadBalancer-NicAssociation"); } [Fact] @@ -130,7 +126,7 @@ public void TestLoadBalancerNicAssociation() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerNicAssociationDuringCreate() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancer-NicAssociationDuringCreate"); + TestRunner.RunTestScript("Test-LoadBalancer-NicAssociationDuringCreate"); } [Fact] @@ -138,7 +134,7 @@ public void TestLoadBalancerNicAssociationDuringCreate() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerInboundNatPoolConfigInternalLB() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerInboundNatPoolConfigCRUD-InternalLB"); + TestRunner.RunTestScript("Test-LoadBalancerInboundNatPoolConfigCRUD-InternalLB"); } [Fact] @@ -146,7 +142,7 @@ public void TestLoadBalancerInboundNatPoolConfigInternalLB() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerInboundNatPoolConfigCRUDPublicLB() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerInboundNatPoolConfigCRUD-PublicLB"); + TestRunner.RunTestScript("Test-LoadBalancerInboundNatPoolConfigCRUD-PublicLB"); } [Fact] @@ -154,7 +150,7 @@ public void TestLoadBalancerInboundNatPoolConfigCRUDPublicLB() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerMultiVipPublic() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerMultiVip-Public"); + TestRunner.RunTestScript("Test-LoadBalancerMultiVip-Public"); } [Fact] @@ -162,7 +158,7 @@ public void TestLoadBalancerMultiVipPublic() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerMultiVipInternal() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerMultiVip-Internal"); + TestRunner.RunTestScript("Test-LoadBalancerMultiVip-Internal"); } [Fact] @@ -170,7 +166,7 @@ public void TestLoadBalancerMultiVipInternal() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestSetLoadBalancerObjectAssignment() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-SetLoadBalancerObjectAssignment"); + TestRunner.RunTestScript("Test-SetLoadBalancerObjectAssignment"); } [Fact] @@ -178,7 +174,7 @@ public void TestSetLoadBalancerObjectAssignment() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestSetLoadBalancerCRUDPublicBasicSku() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUD-PublicBasicSku"); + TestRunner.RunTestScript("Test-LoadBalancerCRUD-PublicBasicSku"); } [Fact] @@ -186,7 +182,7 @@ public void TestSetLoadBalancerCRUDPublicBasicSku() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestSetLoadBalancerCRUDInternalBasicSku() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUD-InternalBasicSku"); + TestRunner.RunTestScript("Test-LoadBalancerCRUD-InternalBasicSku"); } [Fact] @@ -194,7 +190,7 @@ public void TestSetLoadBalancerCRUDInternalBasicSku() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestSetLoadBalancerCRUDPublicStandardSku() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUD-PublicStandardSku"); + TestRunner.RunTestScript("Test-LoadBalancerCRUD-PublicStandardSku"); } [Fact] @@ -202,7 +198,7 @@ public void TestSetLoadBalancerCRUDPublicStandardSku() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestSetLoadBalancerCRUDInternalStandardSku() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUD-InternalStandardSku"); + TestRunner.RunTestScript("Test-LoadBalancerCRUD-InternalStandardSku"); } [Fact] @@ -210,7 +206,7 @@ public void TestSetLoadBalancerCRUDInternalStandardSku() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerCRUDInternalHighlyAvailableBasicSku() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUD-InternalHighlyAvailableBasicSku"); + TestRunner.RunTestScript("Test-LoadBalancerCRUD-InternalHighlyAvailableBasicSku"); } [Fact] @@ -218,7 +214,7 @@ public void TestLoadBalancerCRUDInternalHighlyAvailableBasicSku() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerCRUDInternalHighlyAvailableStandardSku() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUD-InternalHighlyAvailableStandardSku"); + TestRunner.RunTestScript("Test-LoadBalancerCRUD-InternalHighlyAvailableStandardSku"); } [Fact] @@ -226,7 +222,7 @@ public void TestLoadBalancerCRUDInternalHighlyAvailableStandardSku() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerZones() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerZones"); + TestRunner.RunTestScript("Test-LoadBalancerZones"); } [Fact] @@ -234,7 +230,7 @@ public void TestLoadBalancerZones() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestCreateSubresourcesOnEmptyLoadBalancer() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-CreateSubresourcesOnEmptyLoadBalancer"); + TestRunner.RunTestScript("Test-CreateSubresourcesOnEmptyLoadBalancer"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/Generated/LoadBalancerTestsGenerated.cs b/src/Network/Network.Test/ScenarioTests/LoadBalancerTestsGenerated.cs similarity index 67% rename from src/Network/Network.Test/ScenarioTests/Generated/LoadBalancerTestsGenerated.cs rename to src/Network/Network.Test/ScenarioTests/LoadBalancerTestsGenerated.cs index dbc6f57ed53a..219d767f763f 100644 --- a/src/Network/Network.Test/ScenarioTests/Generated/LoadBalancerTestsGenerated.cs +++ b/src/Network/Network.Test/ScenarioTests/LoadBalancerTestsGenerated.cs @@ -24,23 +24,17 @@ // Please contact wanrpdev@microsoft.com if you need to make changes to this file. // -using System; -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class LoadBalancerTestsGenerated : RMTestBase + public class LoadBalancerTestsGenerated : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public LoadBalancerTestsGenerated(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -48,7 +42,7 @@ public LoadBalancerTestsGenerated(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUDMinimalParameters"); + TestRunner.RunTestScript("Test-LoadBalancerCRUDMinimalParameters"); } [Fact] @@ -56,7 +50,7 @@ public void TestLoadBalancerCRUDMinimalParameters() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancerCRUDAllParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancerCRUDAllParameters"); + TestRunner.RunTestScript("Test-LoadBalancerCRUDAllParameters"); } [Fact] @@ -64,7 +58,7 @@ public void TestLoadBalancerCRUDAllParameters() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestFrontendIPConfigurationCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-FrontendIPConfigurationCRUDMinimalParameters"); + TestRunner.RunTestScript("Test-FrontendIPConfigurationCRUDMinimalParameters"); } [Fact] @@ -72,7 +66,7 @@ public void TestFrontendIPConfigurationCRUDMinimalParameters() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestFrontendIPConfigurationCRUDAllParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-FrontendIPConfigurationCRUDAllParameters"); + TestRunner.RunTestScript("Test-FrontendIPConfigurationCRUDAllParameters"); } [Fact] @@ -80,7 +74,7 @@ public void TestFrontendIPConfigurationCRUDAllParameters() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestBackendAddressPoolCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-BackendAddressPoolCRUDMinimalParameters"); + TestRunner.RunTestScript("Test-BackendAddressPoolCRUDMinimalParameters"); } [Fact] @@ -88,7 +82,7 @@ public void TestBackendAddressPoolCRUDMinimalParameters() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancingRuleCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancingRuleCRUDMinimalParameters"); + TestRunner.RunTestScript("Test-LoadBalancingRuleCRUDMinimalParameters"); } [Fact] @@ -96,7 +90,7 @@ public void TestLoadBalancingRuleCRUDMinimalParameters() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestLoadBalancingRuleCRUDAllParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LoadBalancingRuleCRUDAllParameters"); + TestRunner.RunTestScript("Test-LoadBalancingRuleCRUDAllParameters"); } [Fact] @@ -104,7 +98,7 @@ public void TestLoadBalancingRuleCRUDAllParameters() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestProbeCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ProbeCRUDMinimalParameters"); + TestRunner.RunTestScript("Test-ProbeCRUDMinimalParameters"); } [Fact] @@ -112,7 +106,7 @@ public void TestProbeCRUDMinimalParameters() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestProbeCRUDAllParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ProbeCRUDAllParameters"); + TestRunner.RunTestScript("Test-ProbeCRUDAllParameters"); } [Fact] @@ -120,7 +114,7 @@ public void TestProbeCRUDAllParameters() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestInboundNatRuleCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-InboundNatRuleCRUDMinimalParameters"); + TestRunner.RunTestScript("Test-InboundNatRuleCRUDMinimalParameters"); } [Fact] @@ -128,7 +122,7 @@ public void TestInboundNatRuleCRUDMinimalParameters() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestInboundNatRuleCRUDAllParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-InboundNatRuleCRUDAllParameters"); + TestRunner.RunTestScript("Test-InboundNatRuleCRUDAllParameters"); } [Fact] @@ -136,7 +130,7 @@ public void TestInboundNatRuleCRUDAllParameters() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestInboundNatPoolCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-InboundNatPoolCRUDMinimalParameters"); + TestRunner.RunTestScript("Test-InboundNatPoolCRUDMinimalParameters"); } [Fact] @@ -144,7 +138,7 @@ public void TestInboundNatPoolCRUDMinimalParameters() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestInboundNatPoolCRUDAllParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-InboundNatPoolCRUDAllParameters"); + TestRunner.RunTestScript("Test-InboundNatPoolCRUDAllParameters"); } [Fact] @@ -152,7 +146,7 @@ public void TestInboundNatPoolCRUDAllParameters() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestOutboundRuleCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-OutboundRuleCRUDMinimalParameters"); + TestRunner.RunTestScript("Test-OutboundRuleCRUDMinimalParameters"); } [Fact] @@ -160,7 +154,7 @@ public void TestOutboundRuleCRUDMinimalParameters() [Trait(Category.Owner, NrpTeamAlias.slbdev)] public void TestOutboundRuleCRUDAllParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-OutboundRuleCRUDAllParameters"); + TestRunner.RunTestScript("Test-OutboundRuleCRUDAllParameters"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/Generated/LoadBalancerTestsGenerated.ps1 b/src/Network/Network.Test/ScenarioTests/LoadBalancerTestsGenerated.ps1 similarity index 100% rename from src/Network/Network.Test/ScenarioTests/Generated/LoadBalancerTestsGenerated.ps1 rename to src/Network/Network.Test/ScenarioTests/LoadBalancerTestsGenerated.ps1 diff --git a/src/Network/Network.Test/ScenarioTests/LocalNetworkGatewayTests.cs b/src/Network/Network.Test/ScenarioTests/LocalNetworkGatewayTests.cs index 51d5a64b8d0c..5c5d2684dc09 100644 --- a/src/Network/Network.Test/ScenarioTests/LocalNetworkGatewayTests.cs +++ b/src/Network/Network.Test/ScenarioTests/LocalNetworkGatewayTests.cs @@ -12,21 +12,19 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class LocalNetworkGatewayTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class LocalNetworkGatewayTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; public LocalNetworkGatewayTests(ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -34,7 +32,7 @@ public LocalNetworkGatewayTests(ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.brooklynft)] public void TestLocalNetworkGatewayCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LocalNetworkGatewayCRUD"); + TestRunner.RunTestScript("Test-LocalNetworkGatewayCRUD"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/MultiIpConfigOnNicTests.cs b/src/Network/Network.Test/ScenarioTests/MultiIpConfigOnNicTests.cs index e1dc1785be0f..e81761ec1f51 100644 --- a/src/Network/Network.Test/ScenarioTests/MultiIpConfigOnNicTests.cs +++ b/src/Network/Network.Test/ScenarioTests/MultiIpConfigOnNicTests.cs @@ -12,21 +12,18 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class MultiIpConfigOnNicTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class MultiIpConfigOnNicTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public MultiIpConfigOnNicTests(ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -34,7 +31,7 @@ public MultiIpConfigOnNicTests(ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestMultiIpConfigCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-MultiIpConfigCRUD"); + TestRunner.RunTestScript("Test-MultiIpConfigCRUD"); } [Fact] @@ -43,7 +40,7 @@ public void TestMultiIpConfigCRUD() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestLBWithMultiIpConfigNICCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LBWithMultiIpConfigNICCRUD"); + TestRunner.RunTestScript("Test-LBWithMultiIpConfigNICCRUD"); } @@ -52,7 +49,7 @@ public void TestLBWithMultiIpConfigNICCRUD() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestAddNICToLBWithMultiIpConfig() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-AddNICToLBWithMultiIpConfig"); + TestRunner.RunTestScript("Test-AddNICToLBWithMultiIpConfig"); } [Fact] @@ -62,7 +59,7 @@ public void TestAddNICToLBWithMultiIpConfig() public void TestLBWithMultiIpConfigMultiNIC() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-LBWithMultiIpConfigMultiNIC"); + TestRunner.RunTestScript("Test-LBWithMultiIpConfigMultiNIC"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/NetworkCloudExceptionTests.cs b/src/Network/Network.Test/ScenarioTests/NetworkCloudExceptionTests.cs index 1634dfdbeb9c..8ef31686ef6e 100644 --- a/src/Network/Network.Test/ScenarioTests/NetworkCloudExceptionTests.cs +++ b/src/Network/Network.Test/ScenarioTests/NetworkCloudExceptionTests.cs @@ -12,21 +12,18 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class NetworkCloudExceptionTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class NetworkCloudExceptionTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public NetworkCloudExceptionTests(ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -34,7 +31,7 @@ public NetworkCloudExceptionTests(ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.wanrpdev)] public void TestNotFound() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NotFound"); + TestRunner.RunTestScript("Test-NotFound"); } [Fact] @@ -42,7 +39,7 @@ public void TestNotFound() [Trait(Category.Owner, NrpTeamAlias.wanrpdev)] public void TestInvalidName() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-InvalidName"); + TestRunner.RunTestScript("Test-InvalidName"); } [Fact] @@ -50,7 +47,7 @@ public void TestInvalidName() [Trait(Category.Owner, NrpTeamAlias.wanrpdev)] public void TestDuplicateResource() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-DuplicateResource"); + TestRunner.RunTestScript("Test-DuplicateResource"); } [Fact] @@ -58,7 +55,7 @@ public void TestDuplicateResource() [Trait(Category.Owner, NrpTeamAlias.wanrpdev)] public void TestIntersectAddressSpace() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-IntersectAddressSpace"); + TestRunner.RunTestScript("Test-IntersectAddressSpace"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/NetworkInterfaceTests.cs b/src/Network/Network.Test/ScenarioTests/NetworkInterfaceTests.cs index 7231c500a9d4..ed277c7cfd9d 100644 --- a/src/Network/Network.Test/ScenarioTests/NetworkInterfaceTests.cs +++ b/src/Network/Network.Test/ScenarioTests/NetworkInterfaceTests.cs @@ -12,6 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; @@ -19,14 +20,11 @@ namespace Commands.Network.Test.ScenarioTests { - public class NetworkInterfaceTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class NetworkInterfaceTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public NetworkInterfaceTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -34,7 +32,7 @@ public NetworkInterfaceTests(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkInterfaceCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkInterfaceCRUD"); + TestRunner.RunTestScript("Test-NetworkInterfaceCRUD"); } [Fact] @@ -42,7 +40,7 @@ public void TestNetworkInterfaceCRUD() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkInterfaceCRUDUsingId() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkInterfaceCRUDUsingId"); + TestRunner.RunTestScript("Test-NetworkInterfaceCRUDUsingId"); } [Fact] @@ -50,7 +48,7 @@ public void TestNetworkInterfaceCRUDUsingId() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkInterfaceCRUDStaticAllocation() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkInterfaceCRUDStaticAllocation"); + TestRunner.RunTestScript("Test-NetworkInterfaceCRUDStaticAllocation"); } [Fact] @@ -58,7 +56,7 @@ public void TestNetworkInterfaceCRUDStaticAllocation() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkInterfaceNoPublicIpAddress() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkInterfaceNoPublicIpAddress"); + TestRunner.RunTestScript("Test-NetworkInterfaceNoPublicIpAddress"); } [Fact] @@ -66,7 +64,7 @@ public void TestNetworkInterfaceNoPublicIpAddress() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkInterfaceSet() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkInterfaceSet"); + TestRunner.RunTestScript("Test-NetworkInterfaceSet"); } [Fact] @@ -74,7 +72,7 @@ public void TestNetworkInterfaceSet() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkInterfaceIDns() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkInterfaceIDns"); + TestRunner.RunTestScript("Test-NetworkInterfaceIDns"); } [Fact] @@ -82,7 +80,7 @@ public void TestNetworkInterfaceIDns() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkInterfaceEnableIPForwarding() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkInterfaceEnableIPForwarding"); + TestRunner.RunTestScript("Test-NetworkInterfaceEnableIPForwarding"); } [Fact] @@ -90,7 +88,7 @@ public void TestNetworkInterfaceEnableIPForwarding() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkInterfaceExpandResource() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkInterfaceExpandResource"); + TestRunner.RunTestScript("Test-NetworkInterfaceExpandResource"); } [Fact] @@ -98,7 +96,7 @@ public void TestNetworkInterfaceExpandResource() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkInterfaceIpv6() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkInterfaceIpv6"); + TestRunner.RunTestScript("Test-NetworkInterfaceIpv6"); } [Fact] @@ -106,7 +104,7 @@ public void TestNetworkInterfaceIpv6() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkInterfaceWithIpConfiguration() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkInterfaceWithIpConfiguration"); + TestRunner.RunTestScript("Test-NetworkInterfaceWithIpConfiguration"); } [Fact] @@ -114,7 +112,7 @@ public void TestNetworkInterfaceWithIpConfiguration() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkInterfaceWithAcceleratedNetworking() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkInterfaceWithAcceleratedNetworking"); + TestRunner.RunTestScript("Test-NetworkInterfaceWithAcceleratedNetworking"); } [Fact] @@ -122,7 +120,7 @@ public void TestNetworkInterfaceWithAcceleratedNetworking() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkInterfaceTapConfigurationCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-NetworkInterfaceTapConfigurationCRUD")); + TestRunner.RunTestScript(string.Format("Test-NetworkInterfaceTapConfigurationCRUD")); } [Fact] @@ -130,7 +128,7 @@ public void TestNetworkInterfaceTapConfigurationCRUD() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkInterfaceVmss() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkInterfaceVmss"); + TestRunner.RunTestScript("Test-NetworkInterfaceVmss"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/Generated/NetworkInterfaceTestsGenerated.cs b/src/Network/Network.Test/ScenarioTests/NetworkInterfaceTestsGenerated.cs similarity index 68% rename from src/Network/Network.Test/ScenarioTests/Generated/NetworkInterfaceTestsGenerated.cs rename to src/Network/Network.Test/ScenarioTests/NetworkInterfaceTestsGenerated.cs index 2ebe3b8b1d78..4bc03f32a721 100644 --- a/src/Network/Network.Test/ScenarioTests/Generated/NetworkInterfaceTestsGenerated.cs +++ b/src/Network/Network.Test/ScenarioTests/NetworkInterfaceTestsGenerated.cs @@ -24,23 +24,17 @@ // Please contact wanrpdev@microsoft.com if you need to make changes to this file. // -using System; -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class NetworkInterfaceTestsGenerated : RMTestBase + public class NetworkInterfaceTestsGenerated : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public NetworkInterfaceTestsGenerated(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -48,7 +42,7 @@ public NetworkInterfaceTestsGenerated(Xunit.Abstractions.ITestOutputHelper outpu [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkInterfaceCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkInterfaceCRUDMinimalParameters"); + TestRunner.RunTestScript("Test-NetworkInterfaceCRUDMinimalParameters"); } [Fact] @@ -56,7 +50,7 @@ public void TestNetworkInterfaceCRUDMinimalParameters() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkInterfaceCRUDAllParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkInterfaceCRUDAllParameters"); + TestRunner.RunTestScript("Test-NetworkInterfaceCRUDAllParameters"); } [Fact] @@ -64,7 +58,7 @@ public void TestNetworkInterfaceCRUDAllParameters() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkInterfaceIpConfigurationCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkInterfaceIpConfigurationCRUDMinimalParameters"); + TestRunner.RunTestScript("Test-NetworkInterfaceIpConfigurationCRUDMinimalParameters"); } [Fact] @@ -72,7 +66,7 @@ public void TestNetworkInterfaceIpConfigurationCRUDMinimalParameters() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkInterfaceIpConfigurationCRUDAllParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkInterfaceIpConfigurationCRUDAllParameters"); + TestRunner.RunTestScript("Test-NetworkInterfaceIpConfigurationCRUDAllParameters"); } [Fact] @@ -80,7 +74,7 @@ public void TestNetworkInterfaceIpConfigurationCRUDAllParameters() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkInterfaceGetEffectiveRouteTable() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-NetworkInterfaceGetEffectiveRouteTable -baseDir '{0}'", System.AppDomain.CurrentDomain.BaseDirectory)); + TestRunner.RunTestScript(string.Format("Test-NetworkInterfaceGetEffectiveRouteTable -baseDir '{0}'", System.AppDomain.CurrentDomain.BaseDirectory)); } } } diff --git a/src/Network/Network.Test/ScenarioTests/Generated/NetworkInterfaceTestsGenerated.ps1 b/src/Network/Network.Test/ScenarioTests/NetworkInterfaceTestsGenerated.ps1 similarity index 100% rename from src/Network/Network.Test/ScenarioTests/Generated/NetworkInterfaceTestsGenerated.ps1 rename to src/Network/Network.Test/ScenarioTests/NetworkInterfaceTestsGenerated.ps1 diff --git a/src/Network/Network.Test/ScenarioTests/NetworkProfileTests.cs b/src/Network/Network.Test/ScenarioTests/NetworkProfileTests.cs index 23a48999c744..cd8411508f2e 100644 --- a/src/Network/Network.Test/ScenarioTests/NetworkProfileTests.cs +++ b/src/Network/Network.Test/ScenarioTests/NetworkProfileTests.cs @@ -24,23 +24,17 @@ // Please contact sdnnrp@microsoft.com if you need to make changes to this file. // -using System; -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class NetworkProfileTests : RMTestBase + public class NetworkProfileTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public NetworkProfileTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -48,7 +42,7 @@ public NetworkProfileTests(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkProfileCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-NetworkProfileCRUDMinimalParameters")); + TestRunner.RunTestScript(string.Format("Test-NetworkProfileCRUDMinimalParameters")); } [Fact] @@ -56,7 +50,7 @@ public void TestNetworkProfileCRUDMinimalParameters() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkProfileCRUDAllParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-NetworkProfileCRUDAllParameters")); + TestRunner.RunTestScript(string.Format("Test-NetworkProfileCRUDAllParameters")); } [Fact] @@ -64,7 +58,7 @@ public void TestNetworkProfileCRUDAllParameters() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestContainerNetworkInterfaceConfigCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ContainerNetworkInterfaceConfigCRUDMinimalParameters")); + TestRunner.RunTestScript(string.Format("Test-ContainerNetworkInterfaceConfigCRUDMinimalParameters")); } [Fact] @@ -72,7 +66,7 @@ public void TestContainerNetworkInterfaceConfigCRUDMinimalParameters() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestContainerNetworkInterfaceConfigCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-ContainerNetworkInterfaceConfigCRUD")); + TestRunner.RunTestScript(string.Format("Test-ContainerNetworkInterfaceConfigCRUD")); } } } diff --git a/src/Network/Network.Test/ScenarioTests/NetworkSecurityGroupTests.cs b/src/Network/Network.Test/ScenarioTests/NetworkSecurityGroupTests.cs index 0db090136761..37247835a56b 100644 --- a/src/Network/Network.Test/ScenarioTests/NetworkSecurityGroupTests.cs +++ b/src/Network/Network.Test/ScenarioTests/NetworkSecurityGroupTests.cs @@ -12,21 +12,17 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class NetworkSecurityGroupTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class NetworkSecurityGroupTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public NetworkSecurityGroupTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -34,7 +30,7 @@ public NetworkSecurityGroupTests(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkSecurityGroupCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkSecurityGroupCRUD"); + TestRunner.RunTestScript("Test-NetworkSecurityGroupCRUD"); } [Fact] @@ -42,7 +38,7 @@ public void TestNetworkSecurityGroupCRUD() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkSecurityGroupSecurityRuleCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkSecurityGroup-SecurityRuleCRUD"); + TestRunner.RunTestScript("Test-NetworkSecurityGroup-SecurityRuleCRUD"); } [Fact] @@ -50,7 +46,7 @@ public void TestNetworkSecurityGroupSecurityRuleCRUD() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkSecurityGroupMultiValuedRules() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkSecurityGroup-MultiValuedRules"); + TestRunner.RunTestScript("Test-NetworkSecurityGroup-MultiValuedRules"); } [Fact] @@ -58,7 +54,7 @@ public void TestNetworkSecurityGroupMultiValuedRules() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestNetworkSecurityRuleArgumentValidation() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkSecurityRule-ArgumentValidation"); + TestRunner.RunTestScript("Test-NetworkSecurityRule-ArgumentValidation"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/NetworkTestRunner.cs b/src/Network/Network.Test/ScenarioTests/NetworkTestRunner.cs new file mode 100644 index 000000000000..a629cfceba0e --- /dev/null +++ b/src/Network/Network.Test/ScenarioTests/NetworkTestRunner.cs @@ -0,0 +1,50 @@ +using System.Collections.Generic; +using Microsoft.Azure.Commands.TestFx; +using Xunit.Abstractions; + +namespace Microsoft.Azure.Commands.Network.Test.ScenarioTests +{ + public class NetworkTestRunner + { + protected readonly ITestRunner TestRunner; + + protected NetworkTestRunner(ITestOutputHelper output) + { + TestRunner = TestManager.CreateInstance (output) + .WithNewPsScriptFilename ($"{GetType().Name}.ps1") + .WithProjectSubfolderForTests ("ScenarioTests") + .WithCommonPsScripts (new[] + { + @"Common.ps1", + @"../AzureRM.Resources.ps1", + }) + .WithNewRmModules (helper => new[] + { + helper.RMProfileModule, + helper.GetRMModulePath("AzureRM.Monitor.psd1"), + helper.GetRMModulePath("AzureRM.Network.psd1"), + helper.GetRMModulePath("AzureRM.Compute.psd1"), + helper.GetRMModulePath("AzureRM.Storage.psd1"), + helper.GetRMModulePath("AzureRM.ContainerInstance.psd1"), + helper.GetRMModulePath("AzureRM.OperationalInsights.psd1"), + helper.GetRMModulePath("AzureRM.ManagedServiceIdentity.psd1"), + }) + .WithNewRecordMatcherArguments ( + userAgentsToIgnore: new Dictionary + { + {"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01"}, + }, + resourceProviders: new Dictionary + { + {"Microsoft.Resources", null}, + {"Microsoft.Compute", null}, + {"Microsoft.Features", null}, + {"Microsoft.Authorization", null}, + {"Microsoft.Storage", null}, + {"Microsoft.ManagedServiceIdentity", null}, + } + ) + .Build(); + } + } +} diff --git a/src/Network/Network.Test/ScenarioTests/NetworkWatcherAPITests.cs b/src/Network/Network.Test/ScenarioTests/NetworkWatcherAPITests.cs index 01a7bfb892dc..9eeba4fa198a 100644 --- a/src/Network/Network.Test/ScenarioTests/NetworkWatcherAPITests.cs +++ b/src/Network/Network.Test/ScenarioTests/NetworkWatcherAPITests.cs @@ -12,21 +12,17 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class NetworkWatcherAPITests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class NetworkWatcherAPITests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public NetworkWatcherAPITests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -34,7 +30,7 @@ public NetworkWatcherAPITests(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.netanalyticsdev)] public void TestGetTopology() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-GetTopology"); + TestRunner.RunTestScript("Test-GetTopology"); } [Fact] @@ -42,7 +38,7 @@ public void TestGetTopology() [Trait(Category.Owner, NrpTeamAlias.netanalyticsdev)] public void TestGetSecurityGroupView() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-GetSecurityGroupView"); + TestRunner.RunTestScript("Test-GetSecurityGroupView"); } [Fact] @@ -50,7 +46,7 @@ public void TestGetSecurityGroupView() [Trait(Category.Owner, NrpTeamAlias.netanalyticsdev)] public void TestGetNextHop() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-GetNextHop"); + TestRunner.RunTestScript("Test-GetNextHop"); } [Fact] @@ -58,7 +54,7 @@ public void TestGetNextHop() [Trait(Category.Owner, NrpTeamAlias.netanalyticsdev)] public void TestVerifyIPFlow() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VerifyIPFlow"); + TestRunner.RunTestScript("Test-VerifyIPFlow"); } [Fact] @@ -66,7 +62,7 @@ public void TestVerifyIPFlow() [Trait(Category.Owner, NrpTeamAlias.netanalyticsdev)] public void TestPacketCapture() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PacketCapture"); + TestRunner.RunTestScript("Test-PacketCapture"); } [Fact] @@ -74,7 +70,7 @@ public void TestPacketCapture() [Trait(Category.Owner, NrpTeamAlias.netanalyticsdev)] public void TestTroubleshoot() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-Troubleshoot"); + TestRunner.RunTestScript("Test-Troubleshoot"); } [Fact] @@ -82,20 +78,16 @@ public void TestTroubleshoot() [Trait(Category.Owner, Category.netanalyticsdev)] public void TestFlowLog() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-FlowLog"); + TestRunner.RunTestScript("Test-FlowLog"); } -#if NETSTANDARD [Fact(Skip = "This test only applies to desktop")] [Trait(Category.RunType, Category.DesktopOnly)] -#else - [Fact] -#endif [Trait(Category.AcceptanceType, Category.CheckIn)] [Trait(Category.Owner, NrpTeamAlias.netanalyticsdev)] public void TestConnectivityCheck() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ConnectivityCheck"); + TestRunner.RunTestScript("Test-ConnectivityCheck"); } [Fact] @@ -103,7 +95,7 @@ public void TestConnectivityCheck() [Trait(Category.Owner, NrpTeamAlias.netanalyticsdev)] public void TestReachabilityReport() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ReachabilityReport"); + TestRunner.RunTestScript("Test-ReachabilityReport"); } [Fact] @@ -111,7 +103,7 @@ public void TestReachabilityReport() [Trait(Category.Owner, NrpTeamAlias.netanalyticsdev)] public void TestProvidersList() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ProvidersList"); + TestRunner.RunTestScript("Test-ProvidersList"); } [Fact] @@ -119,7 +111,7 @@ public void TestProvidersList() [Trait(Category.Owner, NrpTeamAlias.netanalyticsdev)] public void TestConnectionMonitor() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ConnectionMonitor"); + TestRunner.RunTestScript("Test-ConnectionMonitor"); } [Fact] @@ -127,7 +119,7 @@ public void TestConnectionMonitor() [Trait(Category.Owner, NrpTeamAlias.netanalyticsdev)] public void TestNetworkConfigurationDiagnostic() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkConfigurationDiagnostic"); + TestRunner.RunTestScript("Test-NetworkConfigurationDiagnostic"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/NetworkWatcherTests.cs b/src/Network/Network.Test/ScenarioTests/NetworkWatcherTests.cs index 21886c4df2ef..36ad555b1b0f 100644 --- a/src/Network/Network.Test/ScenarioTests/NetworkWatcherTests.cs +++ b/src/Network/Network.Test/ScenarioTests/NetworkWatcherTests.cs @@ -12,21 +12,17 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class NetworkWatcherTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class NetworkWatcherTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public NetworkWatcherTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -34,7 +30,7 @@ public NetworkWatcherTests(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.netanalyticsdev)] public void TestNetworkWatcherCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkWatcherCRUD"); + TestRunner.RunTestScript("Test-NetworkWatcherCRUD"); } } diff --git a/src/Network/Network.Test/ScenarioTests/PublicIpAddressTests.cs b/src/Network/Network.Test/ScenarioTests/PublicIpAddressTests.cs index 63a1e5ccffaf..ec2cd2865109 100644 --- a/src/Network/Network.Test/ScenarioTests/PublicIpAddressTests.cs +++ b/src/Network/Network.Test/ScenarioTests/PublicIpAddressTests.cs @@ -12,21 +12,17 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class PublicIpAddressTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class PublicIpAddressTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public PublicIpAddressTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -34,7 +30,7 @@ public PublicIpAddressTests(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestPublicIpAddressCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpAddressCRUD"); + TestRunner.RunTestScript("Test-PublicIpAddressCRUD"); } [Fact] @@ -42,7 +38,7 @@ public void TestPublicIpAddressCRUD() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestPublicIpAddressCRUDPublicIPPrefix() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpAddressCRUD-PublicIPPrefix"); + TestRunner.RunTestScript("Test-PublicIpAddressCRUD-PublicIPPrefix"); } [Fact] @@ -50,7 +46,7 @@ public void TestPublicIpAddressCRUDPublicIPPrefix() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestPublicIpAddressCRUDNoDomainNameLabel() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpAddressCRUD-NoDomainNameLabel"); + TestRunner.RunTestScript("Test-PublicIpAddressCRUD-NoDomainNameLabel"); } [Fact] @@ -58,7 +54,7 @@ public void TestPublicIpAddressCRUDNoDomainNameLabel() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestPublicIpAddressCRUDStaticAllocation() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpAddressCRUD-StaticAllocation"); + TestRunner.RunTestScript("Test-PublicIpAddressCRUD-StaticAllocation"); } [Fact] @@ -66,7 +62,7 @@ public void TestPublicIpAddressCRUDStaticAllocation() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestPublicIpAddressCRUDEditDomainNameLavel() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpAddressCRUD-EditDomainNameLavel"); + TestRunner.RunTestScript("Test-PublicIpAddressCRUD-EditDomainNameLavel"); } [Fact] @@ -74,7 +70,7 @@ public void TestPublicIpAddressCRUDEditDomainNameLavel() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestPublicIpAddressCRUDReverseFqdn() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpAddressCRUD-ReverseFqdn"); + TestRunner.RunTestScript("Test-PublicIpAddressCRUD-ReverseFqdn"); } [Fact] @@ -82,7 +78,7 @@ public void TestPublicIpAddressCRUDReverseFqdn() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestPublicIpAddressCRUDIpTag() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpAddressCRUD-IpTag"); + TestRunner.RunTestScript("Test-PublicIpAddressCRUD-IpTag"); } [Fact] @@ -90,7 +86,7 @@ public void TestPublicIpAddressCRUDIpTag() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestPublicIpAddressIpVersion() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpAddressIpVersion"); + TestRunner.RunTestScript("Test-PublicIpAddressIpVersion"); } [Fact] @@ -98,7 +94,7 @@ public void TestPublicIpAddressIpVersion() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestPublicIpAddressVmss() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpAddressVmss"); + TestRunner.RunTestScript("Test-PublicIpAddressVmss"); } [Fact] @@ -106,7 +102,7 @@ public void TestPublicIpAddressVmss() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestPublicIpBasicSku() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpAddressCRUD-BasicSku"); + TestRunner.RunTestScript("Test-PublicIpAddressCRUD-BasicSku"); } [Fact] @@ -114,7 +110,7 @@ public void TestPublicIpBasicSku() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestPublicIpStandardSku() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpAddressCRUD-StandardSku"); + TestRunner.RunTestScript("Test-PublicIpAddressCRUD-StandardSku"); } [Fact] @@ -122,7 +118,7 @@ public void TestPublicIpStandardSku() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestPublicIpAddressZones() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpAddressZones"); + TestRunner.RunTestScript("Test-PublicIpAddressZones"); } [Fact] @@ -130,7 +126,7 @@ public void TestPublicIpAddressZones() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestPublicIpAddressCRUDIdleTimeout() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpAddressCRUD-IdleTimeout"); + TestRunner.RunTestScript("Test-PublicIpAddressCRUD-IdleTimeout"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/PublicIpPrefixTests.cs b/src/Network/Network.Test/ScenarioTests/PublicIpPrefixTests.cs index 5dcca8fb4906..814b0ca7b73d 100644 --- a/src/Network/Network.Test/ScenarioTests/PublicIpPrefixTests.cs +++ b/src/Network/Network.Test/ScenarioTests/PublicIpPrefixTests.cs @@ -12,22 +12,18 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; +using Microsoft.WindowsAzure.Commands.ScenarioTest; +using Xunit; + namespace Commands.Network.Test.ScenarioTests { - using global::Commands.Network.Test; - using Microsoft.Azure.ServiceManagement.Common.Models; - using Microsoft.WindowsAzure.Commands.ScenarioTest; - using Xunit; - using Xunit.Abstractions; - public class PublicIpPrefixTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class PublicIpPrefixTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public PublicIpPrefixTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -35,7 +31,7 @@ public PublicIpPrefixTests(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestPublicIpPrefixCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpPrefixCRUD"); + TestRunner.RunTestScript("Test-PublicIpPrefixCRUD"); } [Fact] @@ -43,7 +39,7 @@ public void TestPublicIpPrefixCRUD() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestPublicIpPrefixAllocatePublicIpAddress() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PublicIpPrefixAllocatePublicIpAddress"); + TestRunner.RunTestScript("Test-PublicIpPrefixAllocatePublicIpAddress"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/Generated/RouteFilterTestsGenerated.cs b/src/Network/Network.Test/ScenarioTests/RouteFilterTestsGenerated.cs similarity index 72% rename from src/Network/Network.Test/ScenarioTests/Generated/RouteFilterTestsGenerated.cs rename to src/Network/Network.Test/ScenarioTests/RouteFilterTestsGenerated.cs index 932069e60c4b..2adf0e75f4a7 100644 --- a/src/Network/Network.Test/ScenarioTests/Generated/RouteFilterTestsGenerated.cs +++ b/src/Network/Network.Test/ScenarioTests/RouteFilterTestsGenerated.cs @@ -24,23 +24,17 @@ // Please contact wanrpdev@microsoft.com if you need to make changes to this file. // -using System; -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class RouteFilterTestsGenerated : RMTestBase + public class RouteFilterTestsGenerated : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public RouteFilterTestsGenerated(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -48,7 +42,7 @@ public RouteFilterTestsGenerated(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.pgtm)] public void TestRouteFilterCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-RouteFilterCRUDMinimalParameters"); + TestRunner.RunTestScript("Test-RouteFilterCRUDMinimalParameters"); } [Fact] @@ -56,7 +50,7 @@ public void TestRouteFilterCRUDMinimalParameters() [Trait(Category.Owner, NrpTeamAlias.pgtm)] public void TestRouteFilterCRUDAllParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-RouteFilterCRUDAllParameters"); + TestRunner.RunTestScript("Test-RouteFilterCRUDAllParameters"); } [Fact] @@ -64,7 +58,7 @@ public void TestRouteFilterCRUDAllParameters() [Trait(Category.Owner, NrpTeamAlias.pgtm)] public void TestRouteFilterRuleCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-RouteFilterRuleCRUDMinimalParameters"); + TestRunner.RunTestScript("Test-RouteFilterRuleCRUDMinimalParameters"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/Generated/RouteFilterTestsGenerated.ps1 b/src/Network/Network.Test/ScenarioTests/RouteFilterTestsGenerated.ps1 similarity index 100% rename from src/Network/Network.Test/ScenarioTests/Generated/RouteFilterTestsGenerated.ps1 rename to src/Network/Network.Test/ScenarioTests/RouteFilterTestsGenerated.ps1 diff --git a/src/Network/Network.Test/ScenarioTests/RouteTableTests.cs b/src/Network/Network.Test/ScenarioTests/RouteTableTests.cs index e2067ee78be3..56092cf95571 100644 --- a/src/Network/Network.Test/ScenarioTests/RouteTableTests.cs +++ b/src/Network/Network.Test/ScenarioTests/RouteTableTests.cs @@ -12,21 +12,17 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class RouteTableTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class RouteTableTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public RouteTableTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } @@ -35,7 +31,7 @@ public RouteTableTests(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestEmptyRouteTable() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-EmptyRouteTable"); + TestRunner.RunTestScript("Test-EmptyRouteTable"); } [Fact] @@ -43,7 +39,7 @@ public void TestEmptyRouteTable() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestRouteTableCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-RouteTableCRUD"); + TestRunner.RunTestScript("Test-RouteTableCRUD"); } [Fact] @@ -51,7 +47,7 @@ public void TestRouteTableCRUD() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestRouteTableSubnetRef() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-RouteTableSubnetRef"); + TestRunner.RunTestScript("Test-RouteTableSubnetRef"); } [Fact] @@ -59,7 +55,7 @@ public void TestRouteTableSubnetRef() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestRouteTableRouteCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-RouteTableRouteCRUD"); + TestRunner.RunTestScript("Test-RouteTableRouteCRUD"); } [Fact] @@ -67,7 +63,7 @@ public void TestRouteTableRouteCRUD() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestRouteHopTypeTest() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-RouteHopTypeTest"); + TestRunner.RunTestScript("Test-RouteHopTypeTest"); } [Fact] @@ -75,7 +71,7 @@ public void TestRouteHopTypeTest() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestRouteWithDisableBgpRoutePropagation() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-RouteTableWithDisableBgpRoutePropagation"); + TestRunner.RunTestScript("Test-RouteTableWithDisableBgpRoutePropagation"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/Generated/RouteTableTestsGenerated.cs b/src/Network/Network.Test/ScenarioTests/RouteTableTestsGenerated.cs similarity index 71% rename from src/Network/Network.Test/ScenarioTests/Generated/RouteTableTestsGenerated.cs rename to src/Network/Network.Test/ScenarioTests/RouteTableTestsGenerated.cs index 64950b96a5df..2a81f254a113 100644 --- a/src/Network/Network.Test/ScenarioTests/Generated/RouteTableTestsGenerated.cs +++ b/src/Network/Network.Test/ScenarioTests/RouteTableTestsGenerated.cs @@ -24,23 +24,17 @@ // Please contact wanrpdev@microsoft.com if you need to make changes to this file. // -using System; -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class RouteTableTestsGenerated : RMTestBase + public class RouteTableTestsGenerated : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public RouteTableTestsGenerated(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -48,7 +42,7 @@ public RouteTableTestsGenerated(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestRouteTableCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-RouteTableCRUDMinimalParameters"); + TestRunner.RunTestScript("Test-RouteTableCRUDMinimalParameters"); } [Fact] @@ -56,7 +50,7 @@ public void TestRouteTableCRUDMinimalParameters() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestRouteTableCRUDAllParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-RouteTableCRUDAllParameters"); + TestRunner.RunTestScript("Test-RouteTableCRUDAllParameters"); } [Fact] @@ -64,7 +58,7 @@ public void TestRouteTableCRUDAllParameters() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestRouteCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-RouteCRUDMinimalParameters"); + TestRunner.RunTestScript("Test-RouteCRUDMinimalParameters"); } [Fact] @@ -72,7 +66,7 @@ public void TestRouteCRUDMinimalParameters() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestRouteCRUDAllParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-RouteCRUDAllParameters"); + TestRunner.RunTestScript("Test-RouteCRUDAllParameters"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/Generated/RouteTableTestsGenerated.ps1 b/src/Network/Network.Test/ScenarioTests/RouteTableTestsGenerated.ps1 similarity index 100% rename from src/Network/Network.Test/ScenarioTests/Generated/RouteTableTestsGenerated.ps1 rename to src/Network/Network.Test/ScenarioTests/RouteTableTestsGenerated.ps1 diff --git a/src/Network/Network.Test/ScenarioTests/TestDnsAvailabilityTest.cs b/src/Network/Network.Test/ScenarioTests/TestDnsAvailabilityTest.cs index 9ded1ec2fd0f..6a7b969ba84b 100644 --- a/src/Network/Network.Test/ScenarioTests/TestDnsAvailabilityTest.cs +++ b/src/Network/Network.Test/ScenarioTests/TestDnsAvailabilityTest.cs @@ -12,21 +12,17 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class TestDnsAvailabilityTest : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class TestDnsAvailabilityTest : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public TestDnsAvailabilityTest(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -34,7 +30,7 @@ public TestDnsAvailabilityTest(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestDnsAvailability() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-DnsAvailability"); + TestRunner.RunTestScript("Test-DnsAvailability"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/UsageTests.cs b/src/Network/Network.Test/ScenarioTests/UsageTests.cs index fe968ea1fdaa..7c44747dd7e7 100644 --- a/src/Network/Network.Test/ScenarioTests/UsageTests.cs +++ b/src/Network/Network.Test/ScenarioTests/UsageTests.cs @@ -12,21 +12,17 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class UsageTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class UsageTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public UsageTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -34,7 +30,7 @@ public UsageTests(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.wanrpdev)] public void TestNetworkUsage() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-NetworkUsage"); + TestRunner.RunTestScript("Test-NetworkUsage"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/Generated/UsageTestsGenerated.cs b/src/Network/Network.Test/ScenarioTests/UsageTestsGenerated.cs similarity index 80% rename from src/Network/Network.Test/ScenarioTests/Generated/UsageTestsGenerated.cs rename to src/Network/Network.Test/ScenarioTests/UsageTestsGenerated.cs index da5077e98879..24067b431194 100644 --- a/src/Network/Network.Test/ScenarioTests/Generated/UsageTestsGenerated.cs +++ b/src/Network/Network.Test/ScenarioTests/UsageTestsGenerated.cs @@ -24,23 +24,20 @@ // Please contact wanrpdev@microsoft.com if you need to make changes to this file. // -using System; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class UsageTestsGenerated : RMTestBase + public class UsageTestsGenerated : NetworkTestRunner { public XunitTracingInterceptor _logger; public UsageTestsGenerated(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -48,7 +45,7 @@ public UsageTestsGenerated(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.wanrpdev)] public void TestUsageCRUDMinimalParameters() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-UsageCRUDMinimalParameters"); + TestRunner.RunTestScript("Test-UsageCRUDMinimalParameters"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/Generated/UsageTestsGenerated.ps1 b/src/Network/Network.Test/ScenarioTests/UsageTestsGenerated.ps1 similarity index 100% rename from src/Network/Network.Test/ScenarioTests/Generated/UsageTestsGenerated.ps1 rename to src/Network/Network.Test/ScenarioTests/UsageTestsGenerated.ps1 diff --git a/src/Network/Network.Test/ScenarioTests/VirtualNetworkGatewayConnectionTests.cs b/src/Network/Network.Test/ScenarioTests/VirtualNetworkGatewayConnectionTests.cs index 5e3b2be6aaf4..61a3a0ccafd5 100644 --- a/src/Network/Network.Test/ScenarioTests/VirtualNetworkGatewayConnectionTests.cs +++ b/src/Network/Network.Test/ScenarioTests/VirtualNetworkGatewayConnectionTests.cs @@ -12,21 +12,17 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class VirtualNetworkGatewayConnectionTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class VirtualNetworkGatewayConnectionTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public VirtualNetworkGatewayConnectionTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -34,7 +30,7 @@ public VirtualNetworkGatewayConnectionTests(Xunit.Abstractions.ITestOutputHelper [Trait(Category.Owner, NrpTeamAlias.brooklynft_subset1)] public void TestVirtualNetworkGatewayConnectionCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkGatewayConnectionCRUD"); + TestRunner.RunTestScript("Test-VirtualNetworkGatewayConnectionCRUD"); } [Fact] @@ -42,7 +38,7 @@ public void TestVirtualNetworkGatewayConnectionCRUD() [Trait(Category.Owner, NrpTeamAlias.brooklynft_subset1)] public void TestVirtualNetworkGatewayConnectionSharedKeyCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkGatewayConnectionSharedKeyCRUD"); + TestRunner.RunTestScript("Test-VirtualNetworkGatewayConnectionSharedKeyCRUD"); } [Fact(Skip = "Rerecord tests")] @@ -50,7 +46,7 @@ public void TestVirtualNetworkGatewayConnectionSharedKeyCRUD() [Trait(Category.Owner, NrpTeamAlias.brooklynft_subset1)] public void TestVirtualNetworkeExpressRouteGatewayConnectionCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkeExpressRouteGatewayConnectionCRUD"); + TestRunner.RunTestScript("Test-VirtualNetworkeExpressRouteGatewayConnectionCRUD"); } [Fact] @@ -58,7 +54,7 @@ public void TestVirtualNetworkeExpressRouteGatewayConnectionCRUD() [Trait(Category.Owner, NrpTeamAlias.brooklynft_subset1)] public void TestVirtualNetworkGatewayConnectionWithBgpCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkGatewayConnectionWithBgpCRUD"); + TestRunner.RunTestScript("Test-VirtualNetworkGatewayConnectionWithBgpCRUD"); } [Fact] @@ -66,7 +62,7 @@ public void TestVirtualNetworkGatewayConnectionWithBgpCRUD() [Trait(Category.Owner, NrpTeamAlias.brooklynft_subset1)] public void TestVirtualNetworkGatewayConnectionwithIpsecPoliciesCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkGatewayConnectionWithIpsecPoliciesCRUD"); + TestRunner.RunTestScript("Test-VirtualNetworkGatewayConnectionWithIpsecPoliciesCRUD"); } [Fact] @@ -74,7 +70,7 @@ public void TestVirtualNetworkGatewayConnectionwithIpsecPoliciesCRUD() [Trait(Category.Owner, NrpTeamAlias.brooklynft_subset1)] public void TestVirtualNetworkGatewayConnectionWithActiveAcitveGateway() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkGatewayConnectionWithActiveActiveGateway"); + TestRunner.RunTestScript("Test-VirtualNetworkGatewayConnectionWithActiveActiveGateway"); } [Fact] @@ -82,7 +78,7 @@ public void TestVirtualNetworkGatewayConnectionWithActiveAcitveGateway() [Trait(Category.Owner, NrpTeamAlias.brooklynft_subset1)] public void TestVirtualNetworkGatewayVpnDeviceConfigurationScripts() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkGatewayConnectionVpnDeviceConfigurations"); + TestRunner.RunTestScript("Test-VirtualNetworkGatewayConnectionVpnDeviceConfigurations"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/VirtualNetworkGatewayTests.cs b/src/Network/Network.Test/ScenarioTests/VirtualNetworkGatewayTests.cs index b97b7b76f169..159b4e8d0d8e 100644 --- a/src/Network/Network.Test/ScenarioTests/VirtualNetworkGatewayTests.cs +++ b/src/Network/Network.Test/ScenarioTests/VirtualNetworkGatewayTests.cs @@ -13,21 +13,17 @@ // ---------------------------------------------------------------------------------- using System; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; -using Microsoft.Azure.ServiceManagement.Common.Models; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class VirtualNetworkGatewayTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class VirtualNetworkGatewayTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public VirtualNetworkGatewayTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } @@ -36,7 +32,7 @@ public VirtualNetworkGatewayTests(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.brooklynft_subset2)] public void TestVirtualNetworkExpressRouteGatewayCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkExpressRouteGatewayCRUD"); + TestRunner.RunTestScript("Test-VirtualNetworkExpressRouteGatewayCRUD"); } [Fact] @@ -44,7 +40,7 @@ public void TestVirtualNetworkExpressRouteGatewayCRUD() [Trait(Category.Owner, NrpTeamAlias.brooklynft_subset2)] public void TestVirtualNetworkGatewayCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkGatewayCRUD"); + TestRunner.RunTestScript("Test-VirtualNetworkGatewayCRUD"); } [Fact] @@ -52,7 +48,7 @@ public void TestVirtualNetworkGatewayCRUD() [Trait(Category.Owner, NrpTeamAlias.brooklynft_subset2)] public void TestVirtualNetworkGatewayP2SAndSKU() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkGatewayP2SAndSKU"); + TestRunner.RunTestScript("Test-VirtualNetworkGatewayP2SAndSKU"); } [Fact] @@ -60,7 +56,7 @@ public void TestVirtualNetworkGatewayP2SAndSKU() [Trait(Category.Owner, NrpTeamAlias.brooklynft_subset2)] public void TestSetVirtualNetworkGatewayCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-SetVirtualNetworkGatewayCRUD"); + TestRunner.RunTestScript("Test-SetVirtualNetworkGatewayCRUD"); } [Fact] @@ -68,7 +64,7 @@ public void TestSetVirtualNetworkGatewayCRUD() [Trait(Category.Owner, NrpTeamAlias.brooklynft_subset2)] public void VirtualNetworkGatewayActiveActiveFeatureTest() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkGatewayActiveActiveFeatureOperations"); + TestRunner.RunTestScript("Test-VirtualNetworkGatewayActiveActiveFeatureOperations"); } [Fact] @@ -76,7 +72,7 @@ public void VirtualNetworkGatewayActiveActiveFeatureTest() [Trait(Category.Owner, NrpTeamAlias.brooklynft_subset3)] public void VirtualNetworkGatewayRouteApiTest() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkGatewayBgpRouteApi"); + TestRunner.RunTestScript("Test-VirtualNetworkGatewayBgpRouteApi"); } [Fact] @@ -84,7 +80,7 @@ public void VirtualNetworkGatewayRouteApiTest() [Trait(Category.Owner, NrpTeamAlias.brooklynft_subset3)] public void TestVirtualNetworkGatewayP2SVpnProfile() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format( + TestRunner.RunTestScript(string.Format( "Test-VirtualNetworkGatewayGenerateVpnProfile -baseDir '{0}'", AppDomain.CurrentDomain.BaseDirectory)); } @@ -93,7 +89,7 @@ public void TestVirtualNetworkGatewayP2SVpnProfile() [Trait(Category.Owner, NrpTeamAlias.brooklynft_subset3)] public void VirtualNetworkGatewayIkeV2Test() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkGatewayIkeV2"); + TestRunner.RunTestScript("Test-VirtualNetworkGatewayIkeV2"); } [Fact] @@ -101,7 +97,7 @@ public void VirtualNetworkGatewayIkeV2Test() [Trait(Category.Owner, NrpTeamAlias.brooklynft_subset3)] public void VirtualNetworkGatewayOpenVPNTest() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkGatewayOpenVPN"); + TestRunner.RunTestScript("Test-VirtualNetworkGatewayOpenVPN"); } [Fact] @@ -109,7 +105,7 @@ public void VirtualNetworkGatewayOpenVPNTest() [Trait(Category.Owner, NrpTeamAlias.brooklynft_subset3)] public void VirtualNetworkGatewayVpnCustomIpsecPolicySetTest() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkGatewayVpnCustomIpsecPolicySet"); + TestRunner.RunTestScript("Test-VirtualNetworkGatewayVpnCustomIpsecPolicySet"); } } } diff --git a/src/Network/Network.Test/ScenarioTests/VirtualNetworkTapTests.cs b/src/Network/Network.Test/ScenarioTests/VirtualNetworkTapTests.cs index bb4de6b8eac4..972c48a0c519 100644 --- a/src/Network/Network.Test/ScenarioTests/VirtualNetworkTapTests.cs +++ b/src/Network/Network.Test/ScenarioTests/VirtualNetworkTapTests.cs @@ -24,23 +24,17 @@ // Please contact wanrpdev@microsoft.com if you need to make changes to this file. // -using System; -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class VirtualNetworkTapTests : RMTestBase + public class VirtualNetworkTapTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public VirtualNetworkTapTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } [Fact] @@ -48,7 +42,7 @@ public VirtualNetworkTapTests(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestVirtualNetworkTapCRUDUsingIpConfig() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, string.Format("Test-VirtualNetworkTapCRUDUsingIpConfig")); + TestRunner.RunTestScript(string.Format("Test-VirtualNetworkTapCRUDUsingIpConfig")); } } } diff --git a/src/Network/Network.Test/ScenarioTests/VirtualNetworkTests.cs b/src/Network/Network.Test/ScenarioTests/VirtualNetworkTests.cs index 9bc0ef248e9c..507edef0ba6d 100644 --- a/src/Network/Network.Test/ScenarioTests/VirtualNetworkTests.cs +++ b/src/Network/Network.Test/ScenarioTests/VirtualNetworkTests.cs @@ -12,21 +12,17 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.Azure.Commands.Network.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; -using Xunit.Abstractions; namespace Commands.Network.Test.ScenarioTests { - public class VirtualNetworkTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase + public class VirtualNetworkTests : NetworkTestRunner { - public XunitTracingInterceptor _logger; - public VirtualNetworkTests(Xunit.Abstractions.ITestOutputHelper output) + : base(output) { - _logger = new XunitTracingInterceptor(output); - XunitTracingInterceptor.AddToContext(_logger); } @@ -35,7 +31,7 @@ public VirtualNetworkTests(Xunit.Abstractions.ITestOutputHelper output) [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestVirtualNetworkCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkCRUD"); + TestRunner.RunTestScript("Test-VirtualNetworkCRUD"); } [Fact] @@ -43,7 +39,7 @@ public void TestVirtualNetworkCRUD() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestVirtualNetworkCRUDWithDDoSProtection() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkCRUDWithDDoSProtection"); + TestRunner.RunTestScript("Test-VirtualNetworkCRUDWithDDoSProtection"); } [Fact] @@ -51,7 +47,7 @@ public void TestVirtualNetworkCRUDWithDDoSProtection() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestVirtualNetworkSubnetCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-subnetCRUD"); + TestRunner.RunTestScript("Test-subnetCRUD"); } [Fact] @@ -59,7 +55,7 @@ public void TestVirtualNetworkSubnetCRUD() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestVirtualNetworkSubnetDelegationCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-subnetDelegationCRUD"); + TestRunner.RunTestScript("Test-subnetDelegationCRUD"); } [Fact] @@ -67,7 +63,7 @@ public void TestVirtualNetworkSubnetDelegationCRUD() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestVirtualNetworkMultiPrefixSubnetCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-multiPrefixSubnetCRUD"); + TestRunner.RunTestScript("Test-multiPrefixSubnetCRUD"); } [Fact(Skip = "'The '1' auxiliary tokens are either not application token(s) or are from the application(s) ... which are different from the application of primary identity <...>.' StatusCode: 401; ReasonPhrase: Unauthorized.")] @@ -75,7 +71,7 @@ public void TestVirtualNetworkMultiPrefixSubnetCRUD() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestVirtualNetworkPeeringCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkPeeringCRUD"); + TestRunner.RunTestScript("Test-VirtualNetworkPeeringCRUD"); } [Fact(Skip ="We need to update the way tokens are aquired, as of now aquiring tokens for multiple tenants is broken")] @@ -90,7 +86,7 @@ public void TestMultiTenantVNetPCRUD() //Because of the need to get a token for the remote VNets's tenant, we cant ruin this under a service principal //This test needs to be run in a live user mode only where the user is asusmed to have access to both the tenants - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-MultiTenantVNetPCRUD"); + TestRunner.RunTestScript("Test-MultiTenantVNetPCRUD"); } @@ -99,7 +95,7 @@ public void TestMultiTenantVNetPCRUD() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestResourceNavigationLinksOnSubnetCRUD() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-ResourceNavigationLinksCRUD"); + TestRunner.RunTestScript("Test-ResourceNavigationLinksCRUD"); } [Fact] @@ -107,7 +103,7 @@ public void TestResourceNavigationLinksOnSubnetCRUD() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestVirtualNetworkUsage() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkUsage"); + TestRunner.RunTestScript("Test-VirtualNetworkUsage"); } [Fact] @@ -115,7 +111,7 @@ public void TestVirtualNetworkUsage() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestVirtualNetworkSubnetServiceEndpoint() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkSubnetServiceEndpoint"); + TestRunner.RunTestScript("Test-VirtualNetworkSubnetServiceEndpoint"); } [Fact] @@ -123,7 +119,7 @@ public void TestVirtualNetworkSubnetServiceEndpoint() [Trait(Category.Owner, NrpTeamAlias.sdnnrp)] public void TestVirtualNetworkSubnetServiceEndpointPolicies() { - NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VirtualNetworkSubnetServiceEndpointPolicies"); + TestRunner.RunTestScript("Test-VirtualNetworkSubnetServiceEndpointPolicies"); } } }