Skip to content

Commit a50b729

Browse files
ogailogail
committed
Merge pull request Azure#154 from huangpf/crp2
Fix PSVirtualMachine
2 parents 87e0174 + cab67c9 commit a50b729

15 files changed

+128
-210
lines changed

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ function Test-VirtualMachine
166166
$vm2 = Get-AzureVM -Name $vmname2 -ResourceGroupName $rgname;
167167
Assert-NotNull $vm2;
168168
Assert-AreEqual $vm2.AvailabilitySetId $asetId;
169+
Assert-True { $vm2.ResourceGroupName -eq $rgname }
169170

170171
# Remove
171172
Remove-AzureVM -Name $vmname2 -ResourceGroupName $rgname -Force;
@@ -191,6 +192,11 @@ function Test-VirtualMachineList
191192
$s1 = Get-AzureVM -All;
192193
$s2 = Get-AzureVM;
193194

195+
if ($s2 -ne $null)
196+
{
197+
Assert-NotNull $s2[0].ResourceGroupName;
198+
}
199+
194200
Assert-ThrowsContains { $s3 = Get-AzureVM -NextLink "http://www.test.com/test"; } "Unexpected character"
195201

196202
$passed = $true;
@@ -627,6 +633,8 @@ function Test-VirtualMachinePIRv2
627633
$p.StorageProfile.SourceImage = $null;
628634
$imgRef = Get-DefaultCRPImage;
629635
$p = Set-AzureVMSourceImage -VM $p -ImageReference $imgRef;
636+
Assert-NotNull $p.ImageReference;
637+
Assert-Null $p.SourceImageId;
630638

631639
# TODO: Remove Data Disks for now
632640
$p.StorageProfile.DataDisks = $null;

‎src/ResourceManager/Compute/Commands.Compute/AvailabilitySets/AvailabilitySetBaseCmdlet.cs

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,8 @@
1818

1919
namespace Microsoft.Azure.Commands.Compute
2020
{
21-
public abstract class AvailabilitySetBaseCmdlet : AzurePSCmdlet
21+
public abstract class AvailabilitySetBaseCmdlet : ComputeClientBaseCmdlet
2222
{
23-
private ComputeClient computeClient;
24-
25-
public ComputeClient ComputeClient
26-
{
27-
get
28-
{
29-
if (computeClient == null)
30-
{
31-
computeClient = new ComputeClient(Profile.Context)
32-
{
33-
VerboseLogger = WriteVerboseWithTimestamp,
34-
ErrorLogger = WriteErrorWithTimestamp
35-
};
36-
}
37-
38-
return computeClient;
39-
}
40-
41-
set { computeClient = value; }
42-
}
43-
4423
public IAvailabilitySetOperations AvailabilitySetClient
4524
{
4625
get
@@ -65,10 +44,5 @@ public IAvailabilitySetOperations AvailabilitySetClient
6544
HelpMessage = "The resource name.")]
6645
[ValidateNotNullOrEmpty]
6746
public virtual string Name { get; set; }
68-
69-
public override void ExecuteCmdlet()
70-
{
71-
base.ExecuteCmdlet();
72-
}
7347
}
7448
}

‎src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
<Compile Include="AvailabilitySets\GetAzureAvailabilitySetCommand.cs" />
141141
<Compile Include="AvailabilitySets\NewAzureAvailabilitySetCommand.cs" />
142142
<Compile Include="AvailabilitySets\AvailabilitySetBaseCmdlet.cs" />
143+
<Compile Include="Common\ComputeClientBaseCmdlet.cs" />
143144
<Compile Include="Common\ComputeClient.cs" />
144145
<Compile Include="ExtensionImages\GetAzureVMExtensionImageTypeCommand.cs" />
145146
<Compile Include="ExtensionImages\GetAzureVMExtensionImageCommand.cs" />

‎src/ResourceManager/Compute/Commands.Compute/Common/ComputeClient.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using System;
16-
using Microsoft.Azure.Management.Compute;
17-
using Microsoft.WindowsAzure.Commands.Utilities.Common;
18-
using Microsoft.WindowsAzure.Commands.Common;
19-
using Microsoft.Azure.Common.Authentication.Models;
2015
using Microsoft.Azure.Common.Authentication;
16+
using Microsoft.Azure.Common.Authentication.Models;
17+
using Microsoft.Azure.Management.Compute;
18+
using System;
2119

2220
namespace Microsoft.Azure.Commands.Compute
2321
{

‎src/ResourceManager/Compute/Commands.Compute/Common/ComputeClientBaseCmdlet.cs

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
using Microsoft.WindowsAzure.Commands.Utilities.Common;
16+
17+
namespace Microsoft.Azure.Commands.Compute
18+
{
19+
public abstract class ComputeClientBaseCmdlet : AzurePSCmdlet
20+
{
21+
private ComputeClient computeClient;
22+
23+
public ComputeClient ComputeClient
24+
{
25+
get
26+
{
27+
if (computeClient == null)
28+
{
29+
computeClient = new ComputeClient(Profile.Context)
30+
{
31+
VerboseLogger = WriteVerboseWithTimestamp,
32+
ErrorLogger = WriteErrorWithTimestamp
33+
};
34+
}
35+
36+
return computeClient;
37+
}
38+
39+
set { computeClient = value; }
40+
}
41+
}
42+
}

‎src/ResourceManager/Compute/Commands.Compute/Extension/VirtualMachineExtensionBaseCmdlet.cs

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,14 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Microsoft.Azure.Management.Compute;
16-
using Microsoft.WindowsAzure.Commands.Utilities.Common;
1716
using System.Management.Automation;
1817

1918
namespace Microsoft.Azure.Commands.Compute
2019
{
21-
public abstract class VirtualMachineExtensionBaseCmdlet : AzurePSCmdlet
20+
public abstract class VirtualMachineExtensionBaseCmdlet : ComputeClientBaseCmdlet
2221
{
2322
protected const string VirtualMachineExtensionType = "Microsoft.Compute/virtualMachines/extensions";
2423

25-
private ComputeClient computeClient;
26-
27-
public ComputeClient ComputeClient
28-
{
29-
get
30-
{
31-
if (computeClient == null)
32-
{
33-
computeClient = new ComputeClient(Profile.Context)
34-
{
35-
VerboseLogger = WriteVerboseWithTimestamp,
36-
ErrorLogger = WriteErrorWithTimestamp
37-
};
38-
}
39-
40-
return computeClient;
41-
}
42-
43-
set { computeClient = value; }
44-
}
45-
4624
public IVirtualMachineExtensionOperations VirtualMachineExtensionClient
4725
{
4826
get
@@ -76,10 +54,5 @@ public IVirtualMachineExtensionOperations VirtualMachineExtensionClient
7654
HelpMessage = "The extension name.")]
7755
[ValidateNotNullOrEmpty]
7856
public virtual string Name { get; set; }
79-
80-
public override void ExecuteCmdlet()
81-
{
82-
base.ExecuteCmdlet();
83-
}
8457
}
8558
}

‎src/ResourceManager/Compute/Commands.Compute/ExtensionImages/VirtualMachineExtensionImageBaseCmdlet.cs

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,11 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Microsoft.Azure.Management.Compute;
16-
using Microsoft.WindowsAzure.Commands.Utilities.Common;
1716

1817
namespace Microsoft.Azure.Commands.Compute
1918
{
20-
public abstract class VirtualMachineExtensionImageBaseCmdlet : AzurePSCmdlet
19+
public abstract class VirtualMachineExtensionImageBaseCmdlet : ComputeClientBaseCmdlet
2120
{
22-
private ComputeClient computeClient;
23-
24-
public ComputeClient ComputeClient
25-
{
26-
get
27-
{
28-
if (computeClient == null)
29-
{
30-
computeClient = new ComputeClient(Profile.Context)
31-
{
32-
VerboseLogger = WriteVerboseWithTimestamp,
33-
ErrorLogger = WriteErrorWithTimestamp
34-
};
35-
}
36-
37-
return computeClient;
38-
}
39-
40-
set { computeClient = value; }
41-
}
42-
4321
public IVirtualMachineExtensionImageOperations VirtualMachineExtensionImageClient
4422
{
4523
get

‎src/ResourceManager/Compute/Commands.Compute/Images/VirtualMachineImageBaseCmdlet.cs

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,11 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Microsoft.Azure.Management.Compute;
16-
using Microsoft.WindowsAzure.Commands.Utilities.Common;
1716

1817
namespace Microsoft.Azure.Commands.Compute
1918
{
20-
public abstract class VirtualMachineImageBaseCmdlet : AzurePSCmdlet
19+
public abstract class VirtualMachineImageBaseCmdlet : ComputeClientBaseCmdlet
2120
{
22-
private ComputeClient computeClient;
23-
24-
public ComputeClient ComputeClient
25-
{
26-
get
27-
{
28-
if (computeClient == null)
29-
{
30-
computeClient = new ComputeClient(Profile.Context)
31-
{
32-
VerboseLogger = WriteVerboseWithTimestamp,
33-
ErrorLogger = WriteErrorWithTimestamp
34-
};
35-
}
36-
37-
return computeClient;
38-
}
39-
40-
set { computeClient = value; }
41-
}
42-
4321
public IVirtualMachineImageOperations VirtualMachineImageClient
4422
{
4523
get

‎src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.Types.ps1xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<Name>ProvisioningState</Name>
1919
<Name>OSConfiguration</Name>
2020
<Name>SourceImageId</Name>
21+
<Name>ImageReference</Name>
2122
<Name>DestinationVHDsContainer</Name>
2223
<Name>OSDisk</Name>
2324
<Name>DataDisks</Name>

0 commit comments

Comments
 (0)