Stack:Enabling the network module check in tests

Author: bganapa

src/ResourceManager/Network/Stack/Commands.Network.Test/Commands.Network.Test.csproj

@@ -12,23 +12,18 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.Common.Authentication;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using Microsoft.Azure.Gallery;
 using Microsoft.Azure.Management.Authorization;
-using Microsoft.Azure.Management.Compute;
-using Microsoft.Azure.Management.Insights;
 using Microsoft.Azure.Management.Network;
-using Microsoft.Azure.Management.Redis;
 using Microsoft.Azure.Management.Resources;
-using Microsoft.Azure.Management.Storage;
 using Microsoft.Azure.Subscriptions;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Microsoft.Azure.Test;
+using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Test.HttpRecorder;
-using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework;
 
 namespace Commands.Network.Test
@@ -37,7 +32,7 @@ public sealed class NetworkResourcesController
     {
         private CSMTestEnvironmentFactory csmTestFactory;
         private EnvironmentSetupHelper helper;
-
+        
         public ResourceManagementClient ResourceManagementClient { get; private set; }
 
         public SubscriptionClient SubscriptionClient { get; private set; }
@@ -48,16 +43,11 @@ public sealed class NetworkResourcesController
 
         public NetworkManagementClient NetworkManagementClient { get; private set; }
 
-        public ComputeManagementClient ComputeManagementClient { get; private set; }
+        public Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient InternalResourceManagementClient { get; private set; }
+        public Microsoft.Azure.Management.ResourceManager.ResourceManagementClient LegacyResourceManagementClient { get; private set; }
 
-        public StorageManagementClient StorageManagementClient { get; private set; }
-
-        public InsightsManagementClient InsightsManagementClient { get; private set; }
-
-        public RedisManagementClient RedisManagementClient { get; private set; }
-
-        public static NetworkResourcesController NewInstance
-        {
+        public static NetworkResourcesController NewInstance 
+        { 
             get
             {
                 return new NetworkResourcesController();
@@ -71,64 +61,60 @@ public NetworkResourcesController()
 
         public void RunPsTest(params string[] scripts)
         {
-            Dictionary<string, string> d = new Dictionary<string, string>();
-            d.Add("Microsoft.Resources", null);
-            d.Add("Microsoft.Features", null);
-            d.Add("Microsoft.Authorization", null);
-            d.Add("Microsoft.Storage", null);
-            var providersToIgnore = new Dictionary<string, string>();
-            providersToIgnore.Add("Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01");
-            HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(true, d, providersToIgnore);
-
             var callingClassType = TestUtilities.GetCallingClass(2);
             var mockName = TestUtilities.GetCurrentMethodName(2);
 
             RunPsTestWorkflow(
-                () => scripts,
+                () => scripts, 
                 // no custom initializer
-                null,
+                null, 
                 // no custom cleanup 
                 null,
                 callingClassType,
                 mockName);
         }
 
         public void RunPsTestWorkflow(
-            Func<string[]> scriptBuilder,
-            Action<CSMTestEnvironmentFactory> initialize,
+            Func<string[]> scriptBuilder, 
+            Action<CSMTestEnvironmentFactory> initialize, 
             Action cleanup,
             string callingClassType,
             string mockName)
         {
-            HttpMockServer.RecordsDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SessionRecords");
+            Dictionary<string, string> d = new Dictionary<string, string>();
+            d.Add("Microsoft.Resources", null);
+            d.Add("Microsoft.Features", null);
+            d.Add("Microsoft.Authorization", null);
+            d.Add("Microsoft.Compute", null);
+            var providersToIgnore = new Dictionary<string, string>();
+            providersToIgnore.Add("Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01");
+            providersToIgnore.Add("Microsoft.Azure.Management.ResourceManager.ResourceManagementClient", "2016-02-01");
+            providersToIgnore.Add("Microsoft.Azure.Management.Storage.StorageManagementClient", "2015-06-15");
+
+            HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(true, d, providersToIgnore);
+
             using (RestTestFramework.MockContext context = RestTestFramework.MockContext.Start(callingClassType, mockName))
             {
                 this.csmTestFactory = new CSMTestEnvironmentFactory();
 
-                if (initialize != null)
+                if(initialize != null)
                 {
                     initialize(this.csmTestFactory);
                 }
 
                 SetupManagementClients(context);
 
                 helper.SetupEnvironment(AzureModule.AzureResourceManager);
-
+                
                 var callingClassName = callingClassType
                                         .Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries)
                                         .Last();
-                helper.SetupModules(AzureModule.AzureResourceManager,
-                    "ScenarioTests\\Common.ps1",
-                    "ScenarioTests\\" + callingClassName + ".ps1",
-                    helper.RMProfileModule,
-                    helper.RMResourceModule,
-                    helper.GetRMModulePath("AzureRM.Insights.psd1"),
-                    helper.GetRMModulePath("AzureRM.RedisCache.psd1"),
-                    helper.GetRMModulePath("AzureRM.Network.psd1"),
-                    helper.GetRMModulePath("AzureRM.Compute.psd1"),
-                    helper.RMStorageDataPlaneModule,
-                    "AzureRM.Storage.ps1",
-                    "AzureRM.Resources.ps1");
+                helper.SetupModules(AzureModule.AzureResourceManager, 
+                    "ScenarioTests\\Common.ps1", 
+                    "ScenarioTests\\" + callingClassName + ".ps1", 
+                    helper.StackRMProfileModule, 
+                    helper.StackRMResourceModule, 
+                    helper.GetStackRMModulePath("AzureRM.Network.psd1"));
 
                 try
                 {
@@ -144,53 +130,32 @@ public void RunPsTestWorkflow(
                 }
                 finally
                 {
-                    if (cleanup != null)
+                    if(cleanup !=null)
                     {
                         cleanup();
                     }
                 }
             }
         }
 
-        private Microsoft.Azure.Management.Resources.ResourceManagementClient GetLegacyResourceManagementClient()
-        {
-            return Microsoft.Azure.Test.TestBase.GetServiceClient<Microsoft.Azure.Management.Resources.ResourceManagementClient>(this.csmTestFactory);
-        }
-        
-        private Microsoft.Azure.Subscriptions.SubscriptionClient GetLegacySubscriptionClient()
-        {
-            return Microsoft.Azure.Test.TestBase.GetServiceClient<Microsoft.Azure.Subscriptions.SubscriptionClient>(this.csmTestFactory);
-        }
-
-        private Microsoft.Azure.Management.ResourceManager.ResourceManagementClient GetResourceManagerResourceManagementClient(RestTestFramework.MockContext context)
-        {
-            return context.GetServiceClient<Microsoft.Azure.Management.ResourceManager.ResourceManagementClient>(RestTestFramework.TestEnvironmentFactory.GetTestEnvironment());
-        }
-
         private void SetupManagementClients(RestTestFramework.MockContext context)
         {
-            Microsoft.Azure.Management.ResourceManager.ResourceManagementClient ResourceManagerResourceManagementClient = GetResourceManagerResourceManagementClient(context);
             this.ResourceManagementClient = this.GetResourceManagementClient();
             this.SubscriptionClient = this.GetSubscriptionClient();
+            InternalResourceManagementClient = GetInternalResourceManagementClient(context);
+            LegacyResourceManagementClient = GetLegacyResourceManagementClient(context);
             this.GalleryClient = this.GetGalleryClient();
             this.NetworkManagementClient = this.GetNetworkManagementClient(context);
-            this.ComputeManagementClient = this.GetComputeManagementClient(context);
-            this.StorageManagementClient = this.GetStorageManagementClient(context);
             this.AuthorizationManagementClient = this.GetAuthorizationManagementClient();
-            this.InsightsManagementClient = this.GetInsightsManagementClient();
-            this.RedisManagementClient = this.GetRedisManagementClient(context);
 
             helper.SetupManagementClients(
-                ResourceManagerResourceManagementClient,
                 ResourceManagementClient,
+                InternalResourceManagementClient,
+                LegacyResourceManagementClient,
                 SubscriptionClient,
                 GalleryClient,
-                this.NetworkManagementClient,
-                this.ComputeManagementClient,
-                this.StorageManagementClient,
-                this.AuthorizationManagementClient,
-                this.InsightsManagementClient,
-                this.RedisManagementClient);
+                AuthorizationManagementClient,
+                this.NetworkManagementClient);
         }
 
         private AuthorizationManagementClient GetAuthorizationManagementClient()
@@ -202,6 +167,15 @@ private ResourceManagementClient GetResourceManagementClient()
         {
             return TestBase.GetServiceClient<ResourceManagementClient>(this.csmTestFactory);
         }
+        private Microsoft.Azure.Management.ResourceManager.ResourceManagementClient GetLegacyResourceManagementClient(RestTestFramework.MockContext context)
+        {
+            return context.GetServiceClient<Microsoft.Azure.Management.ResourceManager.ResourceManagementClient>(Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestEnvironmentFactory.GetTestEnvironment());
+        }
+
+        private Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient GetInternalResourceManagementClient(RestTestFramework.MockContext context)
+        {
+            return context.GetServiceClient<Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient>(Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestEnvironmentFactory.GetTestEnvironment());
+        }
 
         private SubscriptionClient GetSubscriptionClient()
         {
@@ -212,30 +186,9 @@ private NetworkManagementClient GetNetworkManagementClient(RestTestFramework.Moc
         {
             return context.GetServiceClient<NetworkManagementClient>(RestTestFramework.TestEnvironmentFactory.GetTestEnvironment());
         }
-
-        private StorageManagementClient GetStorageManagementClient(RestTestFramework.MockContext context)
-        {
-            return context.GetServiceClient<StorageManagementClient>(RestTestFramework.TestEnvironmentFactory.GetTestEnvironment());
-        }
-
         private GalleryClient GetGalleryClient()
         {
             return TestBase.GetServiceClient<GalleryClient>(this.csmTestFactory);
         }
-        
-        private InsightsManagementClient GetInsightsManagementClient()
-        {
-            return TestBase.GetServiceClient<InsightsManagementClient>(this.csmTestFactory);
-        }
-
-        private RedisManagementClient GetRedisManagementClient(RestTestFramework.MockContext context)
-        {
-            return context.GetServiceClient<RedisManagementClient>(RestTestFramework.TestEnvironmentFactory.GetTestEnvironment());
-        }
-
-        private ComputeManagementClient GetComputeManagementClient(RestTestFramework.MockContext context)
-        {
-            return context.GetServiceClient<ComputeManagementClient>(RestTestFramework.TestEnvironmentFactory.GetTestEnvironment());
-        }
     }
 }