Skip to content

Commit f311d48

Browse files
committed
Fixed VM test and used correct location for VMSS
1 parent 10bfed2 commit f311d48

File tree

4 files changed

+2209
-986
lines changed

4 files changed

+2209
-986
lines changed

src/Compute/Compute.Test/ScenarioTests/VirtualMachineTests.ps1

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7947,21 +7947,21 @@ Test-VMAddProxyAgentExtension creates a VM with Enabled ProxyAgent and added Pro
79477947
function Test-VMAddProxyAgentExtension
79487948
{
79497949
# Setup
7950-
$resourceGroupName = "resourceGroup1";
7951-
$adminUsername = "adminUser";
7952-
$adminPassword = "Pssword123" | ConvertTo-SecureString -AsPlainText -Force;
7950+
$resourceGroupName = Get-ComputeTestResourceName;
7951+
$adminUsername = Get-ComputeTestResourceName;
7952+
$adminPassword = Get-PasswordForVM | ConvertTo-SecureString -AsPlainText -Force;
79537953
$cred = New-Object System.Management.Automation.PSCredential ($adminUsername, $adminPassword);
79547954
$vmName = 'VM1';
79557955
$imageName = "Canonical:0001-com-ubuntu-server-jammy:22_04-lts:latest";
7956-
Connect-AzAccount
7956+
79577957

79587958
try
79597959
{
7960-
New-AzVM -ResourceGroupName $resourceGroupName -Name $VMName -Credential $cred -image $imageName -EnableProxyAgent -AddProxyAgentExtension
7960+
New-AzVM -ResourceGroupName $resourceGroupName -Name $VMName -Credential $cred -image $imageName -Location 'eastus2' -EnableProxyAgent -AddProxyAgentExtension
79617961

79627962
# Update vm to add proxy agent extension
79637963
$VM = Get-AzVM -ResourceGroupName $resourceGroupName -VMName $vmName
7964-
$VM = Set-AzVMProxyAgentSetting -VM $VM -EnableProxyAgent $true -AddProxyAgentExtension false
7964+
$VM = Set-AzVMProxyAgentSetting -VM $VM -EnableProxyAgent $true -AddProxyAgentExtension $false
79657965
Update-AzVM -ResourceGroupName $resourceGroupName -VM $VM
79667966

79677967
# Validate
@@ -7982,25 +7982,26 @@ Test-VMSSAddProxyAgentExtension creates a VMSS with Enabled ProxyAgent and added
79827982
function Test-VMSSAddProxyAgentExtension
79837983
{
79847984
# Setup
7985-
$resourceGroupName = "resourceGroup1";
7986-
$adminUsername = "adminUser";
7987-
$adminPassword = "Pssword123" | ConvertTo-SecureString -AsPlainText -Force;
7985+
$resourceGroupName = Get-ComputeTestResourceName;
7986+
$adminUsername = Get-ComputeTestResourceName;
7987+
$adminPassword = Get-PasswordForVM | ConvertTo-SecureString -AsPlainText -Force;
79887988
$cred = New-Object System.Management.Automation.PSCredential ($adminUsername, $adminPassword);
79897989
$vmssName = 'VMSS1';
79907990
$imageName = "Canonical:0001-com-ubuntu-server-jammy:22_04-lts:latest";
79917991

7992+
79927993
try
79937994
{
7994-
New-AzVmss -ResourceGroupName $resourceGroupName -VMScaleSetName $vmssName -Credential $cred -image $imageName -EnableProxyAgent -AddProxyAgentExtension
7995+
New-AzVmss -ResourceGroupName $resourceGroupName -VMScaleSetName $vmssName -Credential $cred -image $imageName -Location 'eastus2' -EnableProxyAgent -AddProxyAgentExtension
79957996

79967997
# Update vmss to add proxy agent extension
79977998
$VMSS = Get-AzVmss -ResourceGroupName $resourceGroupName -VMScaleSetName $vmssName
7998-
$VMSS = Set-AzVmssProxyAgentSetting -VirtualMachineScaleSet $VMSS -AddProxyAgentExtension false
7999+
$VMSS = Set-AzVmssProxyAgentSetting -VirtualMachineScaleSet $VMSS -EnableProxyAgent $true -AddProxyAgentExtension $true
79998000
Update-AzVmss -ResourceGroupName $resourceGroupName -Name $vmssName -VirtualMachineScaleSet $VMSS
80008001

80018002
# Validate
80028003
Assert-AreEqual $VMSS.SecurityProfile.ProxyAgentSettings.Enabled $true
8003-
Assert-AreEqual $VMSS.SecurityProfile.ProxyAgentSettings.AddProxyAgentExtension $false
8004+
Assert-AreEqual $VMSS.SecurityProfile.ProxyAgentSettings.AddProxyAgentExtension $true
80048005
}
80058006
finally
80068007
{

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVMAddProxyAgentExtension.json

Lines changed: 1750 additions & 595 deletions
Large diffs are not rendered by default.

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVMSSAddProxyAgentExtension.json

Lines changed: 444 additions & 378 deletions
Large diffs are not rendered by default.

src/Compute/Compute/Manual/PSVirtualMachineScaleSet.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ public partial class PSVirtualMachineScaleSet
2121
// Gets or sets the FQDN.
2222
public string FullyQualifiedDomainName { get; set; }
2323

24-
//Gets or sets AddProxyAgentExtension.
24+
// Gets or sets the AddProxyAgentExtension.
2525
public bool? AddProxyAgentExtension { get; set; }
26+
2627
}
2728
}

0 commit comments

Comments
 (0)