@@ -33,8 +33,8 @@ import (
3333 . "github.com/onsi/gomega"
3434 "github.com/samber/lo"
3535 v1 "k8s.io/api/core/v1"
36- karpv1 "sigs.k8s.io/karpenter/pkg/apis/v1"
3736 "k8s.io/client-go/tools/record"
37+ karpv1 "sigs.k8s.io/karpenter/pkg/apis/v1"
3838
3939 sdkerrors "github.com/Azure/azure-sdk-for-go-extensions/pkg/errors"
4040 "github.com/Azure/azure-sdk-for-go/sdk/azcore"
@@ -289,41 +289,47 @@ func getCreateCallCount() int {
289289func popCreationResult () creationResult {
290290 GinkgoHelper ()
291291 if isAKSMachineMode () {
292- input := azureEnv .AKSMachinesAPI .AKSMachineCreateOrUpdateBehavior .CalledWithInput .Pop ()
293- m := input .AKSMachine
294- // Preserved nil guards from original AKS Machine tests
295- Expect (m .Properties ).ToNot (BeNil ())
296- Expect (m .Properties .Hardware ).ToNot (BeNil ())
297- Expect (m .Properties .Hardware .VMSize ).ToNot (BeNil ())
298-
299- zone , zoneErr := instance .GetAKSLabelZoneFromAKSMachine (& m , fake .Region )
300- isEphemeral := false
301- var osDiskType string
302- if m .Properties .OperatingSystem != nil && m .Properties .OperatingSystem .OSDiskType != nil {
303- osDiskType = string (* m .Properties .OperatingSystem .OSDiskType )
304- isEphemeral = * m .Properties .OperatingSystem .OSDiskType == armcontainerservice .OSDiskTypeEphemeral
305- }
306- var diskSizeGB * int32
307- if m .Properties .OperatingSystem != nil {
308- diskSizeGB = m .Properties .OperatingSystem .OSDiskSizeGB
309- }
310- return creationResult {
311- vmSize : lo .FromPtr (m .Properties .Hardware .VMSize ),
312- zone : zone ,
313- zoneErr : zoneErr ,
314- zones : m .Zones ,
315- tags : m .Properties .Tags ,
316- isEphemeral : isEphemeral ,
317- diskSizeGB : diskSizeGB ,
318- osDiskType : osDiskType ,
319- imageRef : lo .FromPtr (m .Properties .NodeImageVersion ),
320- }
292+ return popAKSMachineCreationResult ()
321293 }
294+ return popVMCreationResult ()
295+ }
322296
323- // VM mode (AKSScriptless or BootstrappingClient)
297+ func popAKSMachineCreationResult () creationResult {
298+ GinkgoHelper ()
299+ input := azureEnv .AKSMachinesAPI .AKSMachineCreateOrUpdateBehavior .CalledWithInput .Pop ()
300+ m := input .AKSMachine
301+ Expect (m .Properties ).ToNot (BeNil ())
302+ Expect (m .Properties .Hardware ).ToNot (BeNil ())
303+ Expect (m .Properties .Hardware .VMSize ).ToNot (BeNil ())
304+
305+ zone , zoneErr := instance .GetAKSLabelZoneFromAKSMachine (& m , fake .Region )
306+ isEphemeral := false
307+ var osDiskType string
308+ if m .Properties .OperatingSystem != nil && m .Properties .OperatingSystem .OSDiskType != nil {
309+ osDiskType = string (* m .Properties .OperatingSystem .OSDiskType )
310+ isEphemeral = * m .Properties .OperatingSystem .OSDiskType == armcontainerservice .OSDiskTypeEphemeral
311+ }
312+ var diskSizeGB * int32
313+ if m .Properties .OperatingSystem != nil {
314+ diskSizeGB = m .Properties .OperatingSystem .OSDiskSizeGB
315+ }
316+ return creationResult {
317+ vmSize : lo .FromPtr (m .Properties .Hardware .VMSize ),
318+ zone : zone ,
319+ zoneErr : zoneErr ,
320+ zones : m .Zones ,
321+ tags : m .Properties .Tags ,
322+ isEphemeral : isEphemeral ,
323+ diskSizeGB : diskSizeGB ,
324+ osDiskType : osDiskType ,
325+ imageRef : lo .FromPtr (m .Properties .NodeImageVersion ),
326+ }
327+ }
328+
329+ func popVMCreationResult () creationResult {
330+ GinkgoHelper ()
324331 input := azureEnv .VirtualMachinesAPI .VirtualMachineCreateOrUpdateBehavior .CalledWithInput .Pop ()
325332 vm := input .VM
326- // Preserved nil guards from original VM tests
327333 Expect (vm .Properties ).ToNot (BeNil ())
328334 Expect (vm .Properties .HardwareProfile ).ToNot (BeNil ())
329335 Expect (vm .Properties .StorageProfile ).ToNot (BeNil ())
0 commit comments