Skip to content

Commit 0d3987e

Browse files
author
Hovsep Mkrtchyan
committed
Test fix.
1 parent c4af506 commit 0d3987e

File tree

3 files changed

+25
-3
lines changed

3 files changed

+25
-3
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,10 @@
206206
<Project>{d3804b64-c0d3-48f8-82ec-1f632f833c9e}</Project>
207207
<Name>Commands.Common.Authentication</Name>
208208
</ProjectReference>
209+
<ProjectReference Include="..\..\..\Common\Commands.Common.Network\Commands.Common.Network.csproj">
210+
<Project>{1338f7ae-7111-4ed3-8916-2d0fecc876f4}</Project>
211+
<Name>Commands.Common.Network</Name>
212+
</ProjectReference>
209213
<ProjectReference Include="..\..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
210214
<Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
211215
<Name>Commands.ResourceManager.Common</Name>

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@ private void SetupManagementClients(RestTestFramework.MockContext context)
185185
NetworkManagementClient = this.GetNetworkManagementClientClient(context);
186186
ComputeManagementClient = GetComputeManagementClient(context);
187187
AuthorizationManagementClient = GetAuthorizationManagementClient();
188+
var networkManagementClientInternal = this.GetNetworkManagementClientInternal(context);
189+
var resourceManagementClientInternal = this.GetResourceManagementClientInternal(context);
188190
// GraphClient = GetGraphClient();
189191

190192
helper.SetupManagementClients(
@@ -195,7 +197,9 @@ private void SetupManagementClients(RestTestFramework.MockContext context)
195197
//eventsClient,
196198
NetworkManagementClient,
197199
ComputeManagementClient,
198-
AuthorizationManagementClient);
200+
AuthorizationManagementClient,
201+
networkManagementClientInternal,
202+
resourceManagementClientInternal);
199203
// GraphClient);
200204
}
201205

@@ -237,6 +241,13 @@ private ResourceManagementClient GetResourceManagementClient()
237241
return TestBase.GetServiceClient<ResourceManagementClient>(this.csmTestFactory);
238242
}
239243

244+
private Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient GetResourceManagementClientInternal(RestTestFramework.MockContext context)
245+
{
246+
return testViaCsm
247+
? context.GetServiceClient<Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient>(RestTestFramework.TestEnvironmentFactory.GetTestEnvironment())
248+
: TestBase.GetServiceClient<Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient>(new RDFETestEnvironmentFactory());
249+
}
250+
240251
private SubscriptionClient GetSubscriptionClient()
241252
{
242253
return TestBase.GetServiceClient<SubscriptionClient>(this.csmTestFactory);
@@ -266,6 +277,13 @@ private NetworkManagementClient GetNetworkManagementClientClient(RestTestFramewo
266277
: TestBase.GetServiceClient<NetworkManagementClient>(new RDFETestEnvironmentFactory());
267278
}
268279

280+
private Microsoft.Azure.Management.Internal.Network.Version2017_10_01.NetworkManagementClient GetNetworkManagementClientInternal(RestTestFramework.MockContext context)
281+
{
282+
return testViaCsm
283+
? context.GetServiceClient<Microsoft.Azure.Management.Internal.Network.Version2017_10_01.NetworkManagementClient>(RestTestFramework.TestEnvironmentFactory.GetTestEnvironment())
284+
: TestBase.GetServiceClient<Microsoft.Azure.Management.Internal.Network.Version2017_10_01.NetworkManagementClient>(new RDFETestEnvironmentFactory());
285+
}
286+
269287
private ComputeManagementClient GetComputeManagementClient(RestTestFramework.MockContext context)
270288
{
271289
return testViaCsm

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ function Test-SimpleNewVm
2323

2424
try
2525
{
26-
$username = "domain01\admin01"
27-
$password = "Qwe123Asd456Zxc890!" | ConvertTo-SecureString
26+
$username = "admin01"
27+
$password = "werWER345#%^" | ConvertTo-SecureString -AsPlainText -Force
2828
$cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password
2929

3030
# Common

0 commit comments

Comments
 (0)