Merge pull request #11 from hovsepm/sergey-newvmtest

Test fix.

Author: sergey-shandar

src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

@@ -206,6 +206,10 @@
       <Project>{d3804b64-c0d3-48f8-82ec-1f632f833c9e}</Project>
       <Name>Commands.Common.Authentication</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\Commands.Common.Network\Commands.Common.Network.csproj">
+      <Project>{1338f7ae-7111-4ed3-8916-2d0fecc876f4}</Project>
+      <Name>Commands.Common.Network</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
       <Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
       <Name>Commands.ResourceManager.Common</Name>
@@ -362,6 +366,7 @@
     <None Include="ScenarioTests\StrategiesVirtualMachineTests.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.StrategiesVirtualMachineTests\TestSimpleNewVm.json" />
     <None Include="Templates\azuredeploy.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/Compute/Commands.Compute.Test/Common/ComputeTestController.cs

@@ -61,6 +61,10 @@ public sealed class ComputeTestController : RMTestBase
 
         public ComputeManagementClient ComputeManagementClient { get; private set; }
 
+        public Microsoft.Azure.Management.Internal.Network.Version2017_10_01.NetworkManagementClient InternalNetworkManagementClient { get; private set; }
+
+        public Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient InternalResourceManagementClient { get; private set; }
+
         public string UserDomain { get; private set; }
 
         public static ComputeTestController NewInstance
@@ -185,6 +189,8 @@ private void SetupManagementClients(RestTestFramework.MockContext context)
             NetworkManagementClient = this.GetNetworkManagementClientClient(context);
             ComputeManagementClient = GetComputeManagementClient(context);
             AuthorizationManagementClient = GetAuthorizationManagementClient();
+            InternalNetworkManagementClient = this.GetNetworkManagementClientInternal(context);
+            InternalResourceManagementClient = this.GetResourceManagementClientInternal(context);
             // GraphClient = GetGraphClient();
 
             helper.SetupManagementClients(
@@ -195,7 +201,9 @@ private void SetupManagementClients(RestTestFramework.MockContext context)
                 //eventsClient,
                 NetworkManagementClient,
                 ComputeManagementClient,
-                AuthorizationManagementClient);
+                AuthorizationManagementClient,
+                InternalNetworkManagementClient,
+                InternalResourceManagementClient);
             // GraphClient);
         }
 
@@ -237,6 +245,13 @@ private ResourceManagementClient GetResourceManagementClient()
             return TestBase.GetServiceClient<ResourceManagementClient>(this.csmTestFactory);
         }
 
+        private Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient GetResourceManagementClientInternal(RestTestFramework.MockContext context)
+        {
+            return testViaCsm
+                ? context.GetServiceClient<Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient>(RestTestFramework.TestEnvironmentFactory.GetTestEnvironment())
+                : TestBase.GetServiceClient<Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient>(new RDFETestEnvironmentFactory());
+        }
+
         private SubscriptionClient GetSubscriptionClient()
         {
             return TestBase.GetServiceClient<SubscriptionClient>(this.csmTestFactory);
@@ -266,6 +281,13 @@ private NetworkManagementClient GetNetworkManagementClientClient(RestTestFramewo
                 : TestBase.GetServiceClient<NetworkManagementClient>(new RDFETestEnvironmentFactory());
         }
 
+        private Microsoft.Azure.Management.Internal.Network.Version2017_10_01.NetworkManagementClient GetNetworkManagementClientInternal(RestTestFramework.MockContext context)
+        {
+            return testViaCsm
+                ? context.GetServiceClient<Microsoft.Azure.Management.Internal.Network.Version2017_10_01.NetworkManagementClient>(RestTestFramework.TestEnvironmentFactory.GetTestEnvironment())
+                : TestBase.GetServiceClient<Microsoft.Azure.Management.Internal.Network.Version2017_10_01.NetworkManagementClient>(new RDFETestEnvironmentFactory());
+        }
+
         private ComputeManagementClient GetComputeManagementClient(RestTestFramework.MockContext context)
         {
             return testViaCsm

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/StrategiesVirtualMachineTests.ps1

@@ -23,8 +23,8 @@ function Test-SimpleNewVm
 
     try
     {
-		$username = "domain01\admin01"
-		$password = "Qwe123Asd456Zxc890!" | ConvertTo-SecureString
+		$username = "admin01"
+		$password = "werWER345#%^" | ConvertTo-SecureString -AsPlainText -Force
 		$cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password
 
         # Common