Review fixes

Signed-off-by: Hossam Rabbouh <horabbouh@microsoft.com>

Author: jumpinthefire

parts/linux/cloud-init/artifacts/cse_config.sh

@@ -953,6 +953,11 @@ configureSecondaryNICs() {
 
     echo "Detected $nic_count NICs, configuring secondary interfaces..."
 
+    local is_netplan=false
+    if [ -d /etc/netplan ]; then
+        is_netplan=true
+    fi
+
     for i in $(seq 1 $((nic_count - 1))); do
         local mac
         mac=$(jq -r ".network.interface[$i].macAddress" "$IMDS_INSTANCE_METADATA_CACHE_FILE")
@@ -961,7 +966,7 @@ configureSecondaryNICs() {
         local iface_name="eth${i}"
         local metric=$(( 100 + i * 100 ))
 
-        if [ -d /etc/netplan ]; then
+        if [ "$is_netplan" = true ]; then
             # Ubuntu: generate netplan config for the secondary NIC
             cat > "/etc/netplan/60-secondary-nic-${i}.yaml" <<NETPLAN_EOF
 network:
@@ -970,18 +975,13 @@ network:
     ${iface_name}:
       match:
         macaddress: "${mac}"
-        driver: "hv_netvsc"
       dhcp4: true
       dhcp4-overrides:
         route-metric: ${metric}
         use-dns: false
       set-name: "${iface_name}"
 NETPLAN_EOF
             chmod 600 "/etc/netplan/60-secondary-nic-${i}.yaml"
-            if ! netplan apply; then
-                echo "Failed to apply netplan config for ${iface_name}" >&2
-                return $ERR_SECONDARY_NIC_CONFIG_FAIL
-            fi
         else
             # AzureLinux/Mariner: generate networkd .network unit.
             # Prefix 10- so it takes precedence over the VHD's 99-dhcp-en.network.
@@ -999,18 +999,29 @@ UseDNS=false
 UseDomains=false
 SendRelease=false
 NETWORKD_EOF
-            if ! networkctl reload; then
-                echo "Failed to reload networkd for ${iface_name}" >&2
-                return $ERR_SECONDARY_NIC_CONFIG_FAIL
-            fi
-            if ! networkctl up "${iface_name}"; then
-                echo "Failed to bring up ${iface_name}" >&2
-                return $ERR_SECONDARY_NIC_CONFIG_FAIL
-            fi
         fi
 
         echo "Configured secondary NIC ${iface_name} (mac=${mac}, metric=${metric})"
     done
+
+    # Apply all configs in a single operation to avoid repeated network restarts
+    if [ "$is_netplan" = true ]; then
+        if ! netplan apply; then
+            echo "Failed to apply netplan config for secondary NICs" >&2
+            return $ERR_SECONDARY_NIC_CONFIG_FAIL
+        fi
+    else
+        if ! networkctl reload; then
+            echo "Failed to reload networkd for secondary NICs" >&2
+            return $ERR_SECONDARY_NIC_CONFIG_FAIL
+        fi
+        for i in $(seq 1 $((nic_count - 1))); do
+            if ! networkctl up "eth${i}"; then
+                echo "Failed to bring up eth${i}" >&2
+                return $ERR_SECONDARY_NIC_CONFIG_FAIL
+            fi
+        done
+    fi
 }
 
 ensureK8sControlPlane() {

spec/parts/linux/cloud-init/artifacts/cse_config_spec.sh

@@ -258,8 +258,8 @@ Describe 'cse_config.sh'
                 return 1
             }
             When run configureSecondaryNICs
-            The stderr should include "Failed to apply netplan config for eth1"
-            The output should not include "Configured secondary NIC"
+            The output should include "Configured secondary NIC eth1"
+            The stderr should include "Failed to apply netplan config for secondary NICs"
             The status should equal 243
         End
 
@@ -271,8 +271,8 @@ Describe 'cse_config.sh'
                 return 1
             }
             When run configureSecondaryNICs
-            The stderr should include "Failed to reload networkd for eth1"
-            The output should not include "Configured secondary NIC"
+            The output should include "Configured secondary NIC eth1"
+            The stderr should include "Failed to reload networkd for secondary NICs"
             The status should equal 243
         End
 
@@ -288,8 +288,8 @@ Describe 'cse_config.sh'
                 echo "networkctl $@"
             }
             When run configureSecondaryNICs
+            The output should include "Configured secondary NIC eth1"
             The stderr should include "Failed to bring up eth1"
-            The output should not include "Configured secondary NIC"
             The status should equal 243
         End
     End