Fixing a few merge issues that occurred. Allows the Network tests to run properly. Fixes merge for a Sql test.

Author: MiYanni

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

@@ -27,10 +27,11 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.0.2-preview" />
     <PackageReference Include="Microsoft.Azure.Insights" Version="0.15.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="18.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.Redis" Version="3.1.1-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.18.0-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/ResourceManager/Network/Commands.Network.Test/NetworkResourcesController.cs

@@ -17,6 +17,7 @@
 using Microsoft.Azure.Management.Network;
 using Microsoft.Azure.Management.Redis;
 using Microsoft.Azure.Management.Storage;
+using Microsoft.Azure.Management.OperationalInsights;
 using Microsoft.Azure.Test.HttpRecorder;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using System;
@@ -42,6 +43,8 @@ public sealed class NetworkResourcesController
 
         public RedisManagementClient RedisManagementClient { get; private set; }
 
+        public OperationalInsightsManagementClient OperationalInsightsManagementClient { get; private set; }
+
         public static NetworkResourcesController NewInstance => new NetworkResourcesController();
 
         public NetworkResourcesController()
@@ -97,6 +100,7 @@ public void RunPsTestWorkflow(
                     _helper.GetRMModulePath("AzureRM.Insights.psd1"),
                     _helper.GetRMModulePath("AzureRM.Network.psd1"),
                     _helper.GetRMModulePath("AzureRM.Compute.psd1"),
+                    _helper.GetRMModulePath("AzureRM.OperationalInsights.psd1"),
                     _helper.RMStorageDataPlaneModule,
                     "AzureRM.Storage.ps1",
                     "AzureRM.Resources.ps1");
@@ -132,13 +136,15 @@ private void SetupManagementClients(RestTestFramework.MockContext context)
             ComputeManagementClient = GetComputeManagementClient(context);
             StorageManagementClient = GetStorageManagementClient(context);
             RedisManagementClient = GetRedisManagementClient(context);
+            OperationalInsightsManagementClient = GetOperationalInsightsManagementClient(context);
 
             _helper.SetupManagementClients(
                 resourceManagerResourceManagementClient,
                 NetworkManagementClient,
                 ComputeManagementClient,
                 StorageManagementClient,
-                RedisManagementClient);
+                RedisManagementClient,
+                OperationalInsightsManagementClient);
         }
 
         private static NetworkManagementClient GetNetworkManagementClient(RestTestFramework.MockContext context)
@@ -160,5 +166,10 @@ private static ComputeManagementClient GetComputeManagementClient(RestTestFramew
         {
             return context.GetServiceClient<ComputeManagementClient>(RestTestFramework.TestEnvironmentFactory.GetTestEnvironment());
         }
-    }
+
+        private static OperationalInsightsManagementClient GetOperationalInsightsManagementClient(RestTestFramework.MockContext context)
+        {
+            return context.GetServiceClient<OperationalInsightsManagementClient>(RestTestFramework.TestEnvironmentFactory.GetTestEnvironment());
+        }
+}
 }

src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/ElasticPoolCrudTests.cs

@@ -47,6 +47,7 @@ public void TestVcoreElasticPoolCreateWithLicenseType()
             RunPowerShellTest("Test-CreateVcoreElasticPoolWithLicenseType");
         }
 
+        [Fact]
         public void TestElasticPoolCreateWithZoneRedundancy()
         {
             RunPowerShellTest("Test-CreateElasticPoolWithZoneRedundancy");