Skip to content

Commit fae262c

Browse files
xseeseeseexseeseesee
authored
mgmt update for test vm sizes (Azure#17207)
1 parent 7cea25f commit fae262c

File tree

58 files changed

+121
-121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+121
-121
lines changed

‎sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/SharedGalleryImageTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ private VirtualMachine prepareGeneralizedVmWith2EmptyDataDisks(
340340
.withNewVhd(60)
341341
.withCaching(CachingTypes.READ_ONLY)
342342
.attach()
343-
.withSize(VirtualMachineSizeTypes.STANDARD_D5_V2)
343+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
344344
.withNewStorageAccount(generateRandomResourceName("stg", 17))
345345
.withOSDiskCaching(CachingTypes.READ_WRITE)
346346
.create();

‎sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineAvailabilityZoneOperationsTests.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void canCreateZonedVirtualMachineWithImplicitZoneForRelatedResources() th
7171
.withRootPassword(password())
7272
// Optionals
7373
.withAvailabilityZone(AvailabilityZoneId.ZONE_1)
74-
.withSize(VirtualMachineSizeTypes.STANDARD_D3_V2)
74+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
7575
.withOSDiskCaching(CachingTypes.READ_WRITE)
7676
// Create VM
7777
.create();
@@ -169,7 +169,7 @@ public void canCreateZonedVirtualMachineWithExplicitZoneForRelatedResources() th
169169
// Optionals
170170
.withAvailabilityZone(AvailabilityZoneId.ZONE_1)
171171
.withExistingDataDisk(dataDisk)
172-
.withSize(VirtualMachineSizeTypes.STANDARD_D3_V2)
172+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
173173
// Create VM
174174
.create();
175175
// Checks the zone assigned to the virtual machine
@@ -247,7 +247,7 @@ public void canCreateZonedVirtualMachineWithZoneResilientPublicIP() throws Excep
247247
.withRootPassword(password())
248248
// Optionals
249249
.withAvailabilityZone(AvailabilityZoneId.ZONE_1)
250-
.withSize(VirtualMachineSizeTypes.STANDARD_D3_V2)
250+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
251251
// Create VM
252252
.create();
253253
// Checks the zone assigned to the virtual machine
@@ -304,7 +304,7 @@ public void canCreateZonedVirtualMachineWithZoneResilientPublicIP() throws Excep
304304
.withRootUsername("Foo12")
305305
.withRootPassword(password())
306306
// Optionals
307-
.withSize(VirtualMachineSizeTypes.STANDARD_D3_V2);
307+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"));
308308

309309
// Define second regional virtual machine
310310
//
@@ -322,7 +322,7 @@ public void canCreateZonedVirtualMachineWithZoneResilientPublicIP() throws Excep
322322
.withRootUsername("Foo12")
323323
.withRootPassword(password())
324324
// Optionals
325-
.withSize(VirtualMachineSizeTypes.STANDARD_D3_V2);
325+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"));
326326

327327
CreatedResources<VirtualMachine> createdVMs =
328328
computeManager.virtualMachines().create(creatableVM1, creatableVM2);
@@ -459,7 +459,7 @@ public void canCreateZonedVirtualMachinesAndAssociateThemWithSingleBackendPoolOf
459459
.withRootPassword(password())
460460
.withAvailabilityZone(AvailabilityZoneId.ZONE_1)
461461
// Optionals
462-
.withSize(VirtualMachineSizeTypes.STANDARD_D3_V2);
462+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"));
463463

464464
// Define second regional virtual machine
465465
//
@@ -478,7 +478,7 @@ public void canCreateZonedVirtualMachinesAndAssociateThemWithSingleBackendPoolOf
478478
.withRootPassword(password())
479479
.withAvailabilityZone(AvailabilityZoneId.ZONE_1)
480480
// Optionals
481-
.withSize(VirtualMachineSizeTypes.STANDARD_D3_V2);
481+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"));
482482

483483
CreatedResources<VirtualMachine> createdVMs =
484484
computeManager.virtualMachines().create(creatableVM1, creatableVM2);

‎sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineCustomImageOperationsTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public void canCreateImageFromNativeVhd() throws IOException {
113113
.withGeneralizedLinuxCustomImage(image.id())
114114
.withRootUsername("javauser")
115115
.withRootPassword("12NewPA$$w0rd!")
116-
.withSize(VirtualMachineSizeTypes.STANDARD_D5_V2)
116+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
117117
.withOSDiskCaching(CachingTypes.READ_WRITE)
118118
.create();
119119

@@ -222,7 +222,7 @@ public void canCreateImageFromManagedDisk() {
222222
.withCaching(CachingTypes.READ_ONLY)
223223
.attach()
224224
.withNewUnmanagedDataDisk(100)
225-
.withSize(VirtualMachineSizeTypes.STANDARD_D5_V2)
225+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
226226
.withNewStorageAccount(storageAccountName)
227227
.withOSDiskCaching(CachingTypes.READ_WRITE)
228228
.create();
@@ -367,7 +367,7 @@ private VirtualMachine prepareGeneralizedVmWith2EmptyDataDisks(
367367
.withNewVhd(60)
368368
.withCaching(CachingTypes.READ_ONLY)
369369
.attach()
370-
.withSize(VirtualMachineSizeTypes.STANDARD_D5_V2)
370+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
371371
.withNewStorageAccount(generateRandomResourceName("stg", 17))
372372
.withOSDiskCaching(CachingTypes.READ_WRITE)
373373
.create();

‎sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineEncryptionOperationsTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void canEncryptVirtualMachine() {
5858
.withLatestLinuxImage("RedHat", "RHEL", "7.2")
5959
.withRootUsername(uname)
6060
.withRootPassword(password)
61-
.withSize(VirtualMachineSizeTypes.STANDARD_D5_V2)
61+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
6262
.withOSDiskCaching(CachingTypes.READ_WRITE)
6363
.create();
6464

‎sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineExtensionOperationsTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void canEnableDiagnosticsExtension() throws Exception {
6464
.withPopularLinuxImage(KnownLinuxVirtualMachineImage.UBUNTU_SERVER_18_04_LTS)
6565
.withRootUsername("Foo12")
6666
.withRootPassword("BaR@12abc!")
67-
.withSize(VirtualMachineSizeTypes.STANDARD_D3)
67+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
6868
.withExistingStorageAccount(storageAccount)
6969
.create();
7070

@@ -124,7 +124,7 @@ public void canResetPasswordUsingVMAccessExtension() throws Exception {
124124
.withPopularLinuxImage(KnownLinuxVirtualMachineImage.UBUNTU_SERVER_16_04_LTS)
125125
.withRootUsername("Foo12")
126126
.withRootPassword("BaR@12abc!")
127-
.withSize(VirtualMachineSizeTypes.STANDARD_D3)
127+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
128128
.create();
129129

130130
// Using VMAccess Linux extension to reset the password for the existing user 'Foo12'
@@ -182,7 +182,7 @@ public void canInstallUninstallCustomExtension() throws Exception {
182182
.withLatestLinuxImage("Canonical", "UbuntuServer", "14.04.4-LTS")
183183
.withRootUsername("Foo12")
184184
.withRootPassword("BaR@12abc!")
185-
.withSize(VirtualMachineSizeTypes.STANDARD_D3)
185+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
186186
.defineNewExtension("CustomScriptForLinux")
187187
.withPublisher("Microsoft.OSTCExtensions")
188188
.withType("CustomScriptForLinux")
@@ -228,7 +228,7 @@ public void canHandleExtensionReference() throws Exception {
228228
.withPopularLinuxImage(KnownLinuxVirtualMachineImage.UBUNTU_SERVER_18_04_LTS)
229229
.withRootUsername("Foo12")
230230
.withRootPassword("BaR@12abc!")
231-
.withSize(VirtualMachineSizeTypes.STANDARD_D3)
231+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
232232
.defineNewExtension("VMAccessForLinux")
233233
.withPublisher("Microsoft.OSTCExtensions")
234234
.withType("VMAccessForLinux")

‎sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineManagedDiskOperationsTests.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void canCreateVirtualMachineFromPIRImageWithManagedOsDisk() {
6161
.withPopularLinuxImage(linuxImage)
6262
.withRootUsername(uname)
6363
.withRootPassword(password)
64-
.withSize(VirtualMachineSizeTypes.STANDARD_D5_V2)
64+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
6565
.withOSDiskCaching(CachingTypes.READ_WRITE)
6666
.create();
6767
// Ensure default to managed disk
@@ -72,7 +72,7 @@ public void canCreateVirtualMachineFromPIRImageWithManagedOsDisk() {
7272
//
7373
Assertions.assertNotNull(virtualMachine.osDiskStorageAccountType());
7474
Assertions.assertEquals(virtualMachine.osDiskCachingType(), CachingTypes.READ_WRITE);
75-
Assertions.assertEquals(virtualMachine.size(), VirtualMachineSizeTypes.STANDARD_D5_V2);
75+
// Assertions.assertEquals(virtualMachine.size(), VirtualMachineSizeTypes.fromString("Standard_D2a_v4"));
7676
// Validate the implicit managed disk created by CRP to back the os disk
7777
//
7878
Assertions.assertNotNull(virtualMachine.osDiskId());
@@ -150,7 +150,7 @@ public void canCreateUpdateVirtualMachineWithEmptyManagedDataDisks() {
150150
.withNewDataDisk(creatableEmptyDisk2, 2, CachingTypes.NONE) // CreateOption: ATTACH
151151
.withNewDataDisk(creatableEmptyDisk3, 3, CachingTypes.NONE) // CreateOption: ATTACH
152152
// End : Add 5 empty managed disks
153-
.withSize(VirtualMachineSizeTypes.STANDARD_D5_V2)
153+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
154154
.withOSDiskCaching(CachingTypes.READ_WRITE)
155155
.create();
156156

@@ -310,7 +310,7 @@ public void canCreateVirtualMachineFromCustomImageWithManagedDisks() {
310310
.withNewDataDisk(creatableEmptyDisk2, 2, CachingTypes.NONE) // CreateOption: ATTACH
311311
.withNewDataDisk(creatableEmptyDisk3, 3, CachingTypes.NONE) // CreateOption: ATTACH
312312
// End : Add bunch of empty managed disks
313-
.withSize(VirtualMachineSizeTypes.STANDARD_D5_V2)
313+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
314314
.withOSDiskCaching(CachingTypes.READ_WRITE)
315315
.create();
316316
System.out.println("Waiting for some time before de-provision");
@@ -361,7 +361,7 @@ public void canCreateVirtualMachineFromCustomImageWithManagedDisks() {
361361
.withRootUsername(uname)
362362
.withRootPassword(password)
363363
// No explicit data disks, let CRP create it from the image's data disk images
364-
.withSize(VirtualMachineSizeTypes.STANDARD_D5_V2)
364+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
365365
.withOSDiskCaching(CachingTypes.READ_WRITE)
366366
.create();
367367

@@ -408,7 +408,7 @@ public void canCreateVirtualMachineFromCustomImageWithManagedDisks() {
408408
VirtualMachine virtualMachine3 =
409409
creatableVirtualMachine3
410410
.withNewDataDisk(200) // CreateOption: EMPTY
411-
.withSize(VirtualMachineSizeTypes.STANDARD_D5_V2)
411+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
412412
.withOSDiskCaching(CachingTypes.READ_WRITE)
413413
.create();
414414

@@ -487,7 +487,7 @@ public void canUpdateVirtualMachineByAddingAndRemovingManagedDisks() {
487487
// End : Add bunch of empty managed disks
488488
.withDataDiskDefaultCachingType(CachingTypes.READ_ONLY)
489489
.withDataDiskDefaultStorageAccountType(StorageAccountTypes.STANDARD_LRS)
490-
.withSize(VirtualMachineSizeTypes.STANDARD_D5_V2)
490+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
491491
.withOSDiskCaching(CachingTypes.READ_WRITE)
492492
.create();
493493

@@ -526,7 +526,7 @@ public void canCreateVirtualMachineByAttachingManagedOsDisk() {
526526
.withRootUsername(uname)
527527
.withRootPassword(password)
528528
.withUnmanagedDisks() /* UN-MANAGED OS and DATA DISKS */
529-
.withSize(VirtualMachineSizeTypes.STANDARD_D5_V2)
529+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
530530
.withNewStorageAccount(storageAccountName)
531531
.withOSDiskCaching(CachingTypes.READ_WRITE)
532532
.create();
@@ -560,7 +560,7 @@ public void canCreateVirtualMachineByAttachingManagedOsDisk() {
560560
.withPrimaryPrivateIPAddressDynamic()
561561
.withoutPrimaryPublicIPAddress()
562562
.withSpecializedOSDisk(osDisk, OperatingSystemTypes.LINUX)
563-
.withSize(VirtualMachineSizeTypes.STANDARD_D5_V2)
563+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
564564
.withOSDiskCaching(CachingTypes.READ_WRITE)
565565
.create();
566566

@@ -591,7 +591,7 @@ public void canCreateVirtualMachineWithManagedDiskInManagedAvailabilitySet() {
591591
.withNewDataDisk(100, 1, CachingTypes.READ_ONLY)
592592
.withNewDataDisk(100, 2, CachingTypes.READ_WRITE, StorageAccountTypes.STANDARD_LRS)
593593
.withNewAvailabilitySet(availSetName) // Default to managed availability set
594-
.withSize(VirtualMachineSizeTypes.STANDARD_D5_V2)
594+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
595595
.withOSDiskCaching(CachingTypes.READ_WRITE)
596596
.create();
597597

‎sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineManagedServiceIdentityOperationsTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void canSetMSIOnNewOrExistingVMWithoutRoleAssignment() throws Exception {
5151
.withPopularLinuxImage(KnownLinuxVirtualMachineImage.UBUNTU_SERVER_16_04_LTS)
5252
.withRootUsername("Foo12")
5353
.withRootPassword(password())
54-
.withSize(VirtualMachineSizeTypes.STANDARD_DS2_V2)
54+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
5555
.withOSDiskCaching(CachingTypes.READ_WRITE)
5656
.withSystemAssignedManagedServiceIdentity()
5757
.create();
@@ -122,7 +122,7 @@ public void canSetMSIOnNewVMWithRoleAssignedToCurrentResourceGroup() throws Exce
122122
.withPopularLinuxImage(KnownLinuxVirtualMachineImage.UBUNTU_SERVER_16_04_LTS)
123123
.withRootUsername("Foo12")
124124
.withRootPassword(password())
125-
.withSize(VirtualMachineSizeTypes.STANDARD_DS2_V2)
125+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
126126
.withOSDiskCaching(CachingTypes.READ_WRITE)
127127
.withSystemAssignedManagedServiceIdentity()
128128
.withSystemAssignedIdentityBasedAccessToCurrentResourceGroup(BuiltInRole.CONTRIBUTOR)
@@ -189,7 +189,7 @@ public void canSetMSIOnNewVMWithMultipleRoleAssignments() throws Exception {
189189
.withPopularLinuxImage(KnownLinuxVirtualMachineImage.UBUNTU_SERVER_16_04_LTS)
190190
.withRootUsername("Foo12")
191191
.withRootPassword(password())
192-
.withSize(VirtualMachineSizeTypes.STANDARD_DS2_V2)
192+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
193193
.withOSDiskCaching(CachingTypes.READ_WRITE)
194194
.withSystemAssignedManagedServiceIdentity()
195195
.withSystemAssignedIdentityBasedAccessTo(resourceGroup.id(), BuiltInRole.CONTRIBUTOR)
@@ -257,7 +257,7 @@ public void canSetMSIOnExistingVMWithRoleAssignments() throws Exception {
257257
.withPopularLinuxImage(KnownLinuxVirtualMachineImage.UBUNTU_SERVER_16_04_LTS)
258258
.withRootUsername("Foo12")
259259
.withRootPassword(password())
260-
.withSize(VirtualMachineSizeTypes.STANDARD_DS2_V2)
260+
.withSize(VirtualMachineSizeTypes.fromString("Standard_D2a_v4"))
261261
.withOSDiskCaching(CachingTypes.READ_WRITE)
262262
.withSystemAssignedManagedServiceIdentity()
263263
.create();

0 commit comments

Comments
 (0)