Skip to content

Commit fa80569

Browse files
haaghadolauli
andauthored
[Compute] Adding ResourceIdsOnly to Get-AzCapacityReservationGroup (Azure#25703)
* changes * Update ChangeLog.md * removing passwords * Update VirtualMachineTests.ps1 to mask password --------- Co-authored-by: Xiaogang <[email protected]>
1 parent 3d831ac commit fa80569

File tree

6 files changed

+1020
-25
lines changed

6 files changed

+1020
-25
lines changed

src/Compute/Compute.Test/ScenarioTests/VirtualMachineTests.cs

+7
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,13 @@ public void TestVMDefaultsToTrustedLaunchImgWhenStnd()
648648
TestRunner.RunTestScript("Test-VMDefaultsToTrustedLaunchImgWhenStnd");
649649
}
650650

651+
[Fact]
652+
[Trait(Category.AcceptanceType, Category.CheckIn)]
653+
public void TestCapacityReservationGroupResourceIdsOnly()
654+
{
655+
TestRunner.RunTestScript("Test-CapacityReservationGroupResourceIdsOnly");
656+
}
657+
651658
[Fact]
652659
[Trait(Category.AcceptanceType, Category.CheckIn)]
653660
public void TestAddVMDataDisk()

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

+13-23
Original file line numberDiff line numberDiff line change
@@ -5296,7 +5296,7 @@ function Test-VirtualMachineEnableAutoUpdate
52965296

52975297
# VM Credential
52985298
$user = "usertest";
5299-
$password = "Testing1234567";
5299+
$password = "*****";
53005300
$securePassword = ConvertTo-SecureString $password -AsPlainText -Force;
53015301
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
53025302

@@ -6255,7 +6255,7 @@ function Test-ManualConfidentialVMSetAzVmOsDiskDesIdDiskWithVMGuest
62556255
$secureEncryptGuestState = 'DiskWithVMGuestState';
62566256
$vmSecurityType = "ConfidentialVM";
62576257
$user = "admin01";
6258-
$password = "Testing1234567";
6258+
$password;
62596259
$securePassword = $password | ConvertTo-SecureString -AsPlainText -Force;
62606260
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
62616261
@@ -6445,7 +6445,7 @@ function Test-ConfVMSetAzDiskSecurityProfile
64456445
$KeySize = 3072;
64466446
64476447
# Creating a VM using simple parameterset
6448-
$securePassword = "Testing1234567" | ConvertTo-SecureString -AsPlainText -Force;
6448+
$securePassword = "*****" | ConvertTo-SecureString -AsPlainText -Force;
64496449
$user = "admin01";
64506450
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
64516451
@@ -6583,7 +6583,7 @@ function Test-ConfVMSetAzDiskEncryptionSetConfig
65836583
$desName= "des" + $rgname;
65846584
65856585
# Creating a VM using simple parameterset
6586-
$securePassword = "Testing1234567" | ConvertTo-SecureString -AsPlainText -Force;
6586+
$securePassword | ConvertTo-SecureString -AsPlainText -Force;
65876587
$user = "admin01";
65886588
$cred = New-Object System.Management.Automation.PSCredential ($user, $securePassword);
65896589
@@ -7448,7 +7448,7 @@ Testing Capacity Reservation Sharing profile parameter
74487448
Setting Sharing profile with multiple subs
74497449
Then unsharing using empty string as value
74507450
#>
7451-
function Test-CapacityReservationSharingProfile
7451+
function Test-CapacityReservationGroupResourceIdsOnly
74527452
{
74537453
# Setup
74547454
$rgname = Get-ComputeTestResourceName;
@@ -7460,26 +7460,16 @@ function Test-CapacityReservationSharingProfile
74607460

74617461
# create a CRG
74627462
$CRGName = 'CRG' + $rgname
7463-
New-AzCapacityReservationGroup -ResourceGroupName $rgname -Name $CRGName -Location $loc -SharingProfile "/subscriptions/88fd8cb2-8248-499e-9a2d-4929a4b0133c"
7463+
New-AzCapacityReservationGroup -ResourceGroupName $rgname -Name $CRGName -Location $loc
74647464

7465-
# try Get-CRG with InstanceView
7466-
$CRG = Get-AzCapacityReservationGroup -ResourceGroupName $rgname -Name $CRGName -InstanceView
7467-
Assert-AreEqual "/subscriptions/88fd8cb2-8248-499e-9a2d-4929a4b0133c" $crg.SharingProfile.SubscriptionIds.Id
74687465

7469-
# Update CRG with new subscription
7470-
Update-AzCapacityReservationGroup -ResourceGroupName $rgname -Name $CRGName -SharingProfile "/subscriptions/88fd8cb2-8248-499e-9a2d-4929a4b0133c", "/subscriptions/24fb23e3-6ba3-41f0-9b6e-e41131d5d61e"
7471-
$CRG = Get-AzCapacityReservationGroup -ResourceGroupName $rgname -Name $CRGName -InstanceView
7472-
Assert-AreEqual 2 $crg.SharingProfile.SubscriptionIds.Count
7466+
# try Get-CRG with ResourceIdsOnly All
7467+
$CRG = Get-AzCapacityReservationGroup -ResourceIdsOnly All
7468+
Assert-AreEqual "/subscriptions/e37510d7-33b6-4676-886f-ee75bcc01871/resourceGroups/$rgname/providers/Microsoft.Compute/capacityReservationGroups/$CRGName" $CRG.Id
74737469

7474-
# Clear Sharing Profile for CapacityReservationGroup
7475-
Update-AzCapacityReservationGroup -ResourceGroupName $rgname -Name $CRGName -SharingProfile ""
7476-
$CRG = Get-AzCapacityReservationGroup -ResourceGroupName $rgname -Name $CRGName -InstanceView
7477-
Assert-AreEqual $null $crg.SharingProfile
7478-
7479-
# remove CRG
7480-
Remove-AzCapacityReservationGroup -ResourceGroupName $rgname -Name $CRGName
7481-
$CRG = Get-AzCapacityReservationGroup -ResourceGroupName $rgname
7482-
Assert-AreEqual $null $CRG.count
7470+
# try Get-CRG with ResourceIdsOnly CreatedInSubscription
7471+
$CRG = Get-AzCapacityReservationGroup -ResourceIdsOnly CreatedInSubscription
7472+
Assert-AreEqual "/subscriptions/e37510d7-33b6-4676-886f-ee75bcc01871/resourceGroups/$rgname/providers/Microsoft.Compute/capacityReservationGroups/$CRGName" $CRG.Id
74837473

74847474
}
74857475
finally
@@ -7551,4 +7541,4 @@ function Test-AddVMDataDisk
75517541

75527542
# Validate
75537543
Assert-AreEqual $vmConfig.StorageProfile.DataDisks[0].SourceResource.id "testSourceResourceId"
7554-
}
7544+
}

0 commit comments

Comments
 (0)