CP-308116: Update hard code eth in network-init

This hard code in rename_network_label is used to find NIC position
by ethN. Change to use bridge name to find the position.

Signed-off-by: Changlei Li <[email protected]>

Author: changlei-li

scripts/network-init

@@ -100,19 +100,28 @@ prepare_networking() {
 
 rename_network_label() {
     # In common criteria certification deployment, user must ensure:
-    # - The 1st NIC (eth0) is for Management Network
-    # - The 2nd NIC (eth1) is for Storage Network
-    # - others (ethX, X>=2) is for Guest Network
+    # - The 1st NIC is for Management Network
+    # - The 2nd NIC is for Storage Network
+    # - others (X>=2) is for Guest Network
     # This function is to rename these network labels to appropriate.
 
     if [ "${CC_PREPARATIONS}" != "true" ]; then
         echo "Skipped common criteria settings"
         return
     fi
 
-    for device in $(ls /sys/class/net | grep -E '^eth[0-9]+$')
+    for device_path in /sys/class/net/*
     do
-        device_id=$(echo ${device} | sed 's/^eth//')
+        device=$(basename "${device_path}")
+        network_uuid=$(${XE} pif-list device="${device}" params=network-uuid --minimal)
+        if [ -z "${network_uuid}" ]; then
+            continue
+        fi
+        bridge=$(${XE} network-list uuid="${network_uuid}" params=bridge --minimal)
+        if [ -z "${bridge}" ]; then
+            continue
+        fi
+        device_id=$(echo ${bridge} | sed 's/^xenbr//')
         if [ ${device_id} -eq 0 ]; then
             name_label="Management Network"
         elif [ ${device_id} -eq 1 ]; then
@@ -127,8 +136,7 @@ rename_network_label() {
             continue
         fi
 
-        network_uuid=$(${XE} pif-list device=${device} params=network-uuid --minimal)
-        ${XE} network-param-set uuid=${network_uuid} name-label="${name_label}"
+        ${XE} network-param-set uuid="${network_uuid}" name-label="${name_label}"
         echo "Renamed network label of ${network_uuid} to ${name_label}, device: ${device}"
     done
 }