Merge pull request openshift#8667 from rna-afk/capz_fix_accelerated_network

OCPBUGS-35959: azure: Fix Accelerated network enablement

Author: openshift-merge-bot[bot]

pkg/asset/machines/azure/azuremachines.go

@@ -140,7 +140,7 @@ func GenerateMachines(platform *azure.Platform, pool *types.MachinePool, userDat
 				NetworkInterfaces: []capz.NetworkInterface{
 					{
 						SubnetName:            subnet,
-						AcceleratedNetworking: ptr.To(mpool.VMNetworkingType == azure.AcceleratedNetworkingEnabled),
+						AcceleratedNetworking: ptr.To(mpool.VMNetworkingType == string(azure.VMnetworkingTypeAccelerated) || mpool.VMNetworkingType == string(azure.AcceleratedNetworkingEnabled)),
 					},
 				},
 				Identity: capz.VMIdentityUserAssigned,

pkg/asset/machines/clusterapi.go

@@ -258,13 +258,21 @@ func (c *ClusterAPI) Generate(ctx context.Context, dependencies asset.Parents) e
 				mpool.OSImage.Publisher = *img.Plan.Publisher
 			}
 		}
-		pool.Platform.Azure = &mpool
-		subnet := ic.Azure.ControlPlaneSubnet
-
 		capabilities, err := client.GetVMCapabilities(ctx, mpool.InstanceType, installConfig.Config.Platform.Azure.Region)
 		if err != nil {
 			return err
 		}
+		if mpool.VMNetworkingType == "" {
+			isAccelerated := icazure.GetVMNetworkingCapability(capabilities)
+			if isAccelerated {
+				mpool.VMNetworkingType = string(azuretypes.VMnetworkingTypeAccelerated)
+			} else {
+				logrus.Infof("Instance type %s does not support Accelerated Networking. Using Basic Networking instead.", mpool.InstanceType)
+			}
+		}
+		pool.Platform.Azure = &mpool
+		subnet := ic.Azure.ControlPlaneSubnet
+
 		hyperVGen, err := icazure.GetHyperVGenerationVersion(capabilities, "")
 		if err != nil {
 			return err