Skip to content

Commit 547835e

Browse files
Fixed bug
1 parent e72e0a8 commit 547835e

File tree

6 files changed

+4905
-4648
lines changed

6 files changed

+4905
-4648
lines changed

src/Compute/Compute.Test/ScenarioTests/ComputeTestCommon.ps1

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -791,5 +791,8 @@ function Get-AvailableSku
791791

792792
$res = get-azcomputeresourcesku $location | where-object ResourceType -match $resourceType
793793
$res = $res.where({$_.restrictions.count -eq 0})
794+
if ($resourceType -match "virtualmachine"){
795+
$res = $res.where({$_.Name -notmatch "Standard_B"})
796+
}
794797
return $res[0].Name
795798
}

src/Compute/Compute.Test/ScenarioTests/VirtualMachinePatchTests.ps1

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,42 @@ function Test-InvokeAzVmAssessPatch
3030
New-AzResourceGroup -Name $rgname -Location $loc -Force;
3131

3232
# VM Profile & Hardware
33-
$vmsize = 'Standard_DS2_v2';
33+
$vmsize = Get-AvailableSku $loc "virtualMachine"
3434
$vmname = 'vm' + $rgname;
3535

36+
$p = New-AzVMConfig -VMName $vmname -VMSize $vmsize -Priority 'Low' -MaxPrice 0.1538;
37+
38+
# NRP
39+
$subnet = New-AzVirtualNetworkSubnetConfig -Name ('subnet' + $rgname) -AddressPrefix "10.0.0.0/24";
40+
$vnet = New-AzVirtualNetwork -Force -Name ('vnet' + $rgname) -ResourceGroupName $rgname -Location $loc -AddressPrefix "10.0.0.0/16" -Subnet $subnet;
41+
$vnet = Get-AzVirtualNetwork -Name ('vnet' + $rgname) -ResourceGroupName $rgname;
42+
$subnetId = $vnet.Subnets[0].Id;
43+
$nic = New-AzNetworkInterface -Force -Name ('nic' + $rgname) -ResourceGroupName $rgname -Location $loc -SubnetId $subnetId
44+
$nic = Get-AzNetworkInterface -Name ('nic' + $rgname) -ResourceGroupName $rgname;
45+
$nicId = $nic.Id;
46+
47+
$p = Add-AzVMNetworkInterface -VM $p -Id $nicId;
48+
3649
# OS & Image
37-
$user = "Foo12";
50+
$user = "Foo2";
3851
$password = $PLACEHOLDER;
3952
$securePassword = ConvertTo-SecureString $password -AsPlainText -Force;
4053
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
54+
$computerName = 'test';
55+
56+
$p = Set-AzVMOperatingSystem -VM $p -Windows -ComputerName $computerName -Credential $cred;
57+
58+
$imgRef = Get-DefaultCRPImage -loc $loc;
59+
$p = ($imgRef | Set-AzVMSourceImage -VM $p);
60+
61+
# Create a Virtual Machine
62+
New-AzVM -ResourceGroupName $rgname -Location $loc -VM $p;
4163

42-
New-AzVm -resourcegroupname $rgname -location $loc -name $vmName -credential $cred -size $vmsize
4364
$patchResult = invoke-azvmassesspatch -resourcegroupname $rgname -vmname $vmname
4465

45-
Assert.NotNull($patchResult);
46-
Assert.Equal("Succeeded", $patchResult.Status);
47-
Assert.NotNull($patchResult.StartDateTime);
66+
Assert-NotNull $patchResult;
67+
Assert-AreEqual "Succeeded" $patchResult.Status;
68+
Assert-NotNull $patchResult.StartDateTime;
4869

4970
}
5071
finally

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachinePatchTests/TestInvokeAzVmAssessPatch.json

Lines changed: 4867 additions & 0 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.SecenarioTests.VirtualMachinePatchTests/TestInvokeAzVmAssessPatch.json

Lines changed: 0 additions & 4625 deletions
This file was deleted.

src/Compute/Compute/Generated/VirtualMachine/InvokeAzureVMAssessPatchCommand.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,7 @@ public override void ExecuteCmdlet()
103103
}
104104

105105

106-
//extension call instead??
107-
//var result = VirtualMachinesClient.AssessPatches(resourceGroupName, vmName);
108-
//var result = VirtualMachinesClient.AssessPatchesWithHttpMessagesAsync(resourceGroupName, vmName).GetAwaiter().GetResult();
109-
//var result = VirtualMachinesClient.AssessPatchesWithHttpMessagesAsync(resourceGroupName, vmName);
110106
var result = VirtualMachinesClient.AssessPatches(resourceGroupName, vmName);
111-
112-
//var psObject = new PSRunCommandResult();
113-
//var psObject = new PSAssessPatchResult();
114-
//var psObject = ComputeAutoMapperProfile.Mapper.Map<PSAzureOperationResponse>(result);
115-
//ComputeAutomationAutoMapperProfile.Mapper.Map<VirtualMachineAssessPatchesResult, PSAzureOperationResponse>(result, psObject);
116107
var psObject = new PSVirtualMachineAssessPatchesResult();
117108
ComputeAutomationAutoMapperProfile.Mapper.Map<VirtualMachineAssessPatchesResult, PSVirtualMachineAssessPatchesResult>(result, psObject);
118109
WriteObject(psObject);

src/Compute/Compute/Manual/PSVirtualMachineAssessPatchesResult.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ namespace Microsoft.Azure.Commands.Compute.Automation.Models
2323
{
2424
public class PSVirtualMachineAssessPatchesResult
2525
{
26-
public string Status { get; }
27-
public string AssessmentActivityId { get; }
28-
public bool? RebootPending { get; }
29-
public int? CriticalAndSecurityPatchCount { get; }
30-
public int? OtherPatchCount { get; }
31-
public DateTime? StartDateTime { get; }
32-
public IList<VirtualMachineSoftwarePatchProperties> Patches { get; }
33-
public ApiError Error { get; }
26+
public string Status { get; set; }
27+
public string AssessmentActivityId { get; set; }
28+
public bool? RebootPending { get; set; }
29+
public int? CriticalAndSecurityPatchCount { get; set; }
30+
public int? OtherPatchCount { get; set; }
31+
public DateTime? StartDateTime { get; set; }
32+
public IList<VirtualMachineSoftwarePatchProperties> Patches { get; set; }
33+
public ApiError Error { get; set; }
3434
}
3535
}

0 commit comments

Comments
 (0)