CP-308116: Handle network-init with new netdev ordering (#6483)

1. network-init script need read inventory and get management address
type. This item should be written to inventory by networkd, the same as
management interface item. Because host-installer will not write it from
the new netdev ordering, see
xenserver/host-installer@33aa793.
2. networl-init renames network name label under common criteria. There
was hard code ethx to determine the interface position. Now change to
get position from the bridge which is right both on legacy and new
ordering method.

Author: changlei-li

ocaml/networkd/lib/network_config.ml

@@ -97,9 +97,12 @@ let parse_dns_config args =
   let domains = get_list_from ~sep:" " ~key:"DOMAIN" args in
   (nameservers, domains)
 
-let write_manage_iface_to_inventory bridge_name =
+let write_manage_iface_to_inventory bridge_name management_address_type =
   info "Writing management interface to inventory: %s" bridge_name ;
-  Inventory.update Inventory._management_interface bridge_name
+  Inventory.update Inventory._management_interface bridge_name ;
+  info "Writing management address type to inventory: %s"
+    management_address_type ;
+  Inventory.update Inventory._management_address_type management_address_type
 
 let read_management_conf interface_order =
   try
@@ -142,6 +145,22 @@ let read_management_conf interface_order =
         (fun x -> if x.name = device then Some x.position else None)
         order
     in
+    let (ipv4_conf, ipv4_gateway), (ipv6_conf, ipv6_gateway) =
+      match (List.assoc_opt "MODE" args, List.assoc_opt "MODEV6" args) with
+      | None, None ->
+          error "%s: at least one of 'MODE', 'MODEV6' needs to be specified"
+            __FUNCTION__ ;
+          raise Read_error
+      | v4, v6 ->
+          (parse_ipv4_config args v4, parse_ipv6_config args v6)
+    in
+    let management_address_type =
+      (* Default to IPv4 unless we have only got an IPv6 admin interface *)
+      if ipv4_conf = None4 && ipv6_conf <> None6 then
+        "IPv6"
+      else
+        "IPv4"
+    in
     let bridge_name =
       let inventory_bridge =
         try Some (Inventory.lookup Inventory._management_interface)
@@ -160,23 +179,14 @@ let read_management_conf interface_order =
           in
           debug "No management bridge in inventory file... using %s" bridge ;
           if not device_already_renamed then
-            write_manage_iface_to_inventory bridge ;
+            write_manage_iface_to_inventory bridge management_address_type ;
           bridge
       | Some bridge ->
           debug "Management bridge in inventory file: %s" bridge ;
           bridge
     in
     let mac = Network_utils.Ip.get_mac device in
     let dns = parse_dns_config args in
-    let (ipv4_conf, ipv4_gateway), (ipv6_conf, ipv6_gateway) =
-      match (List.assoc_opt "MODE" args, List.assoc_opt "MODEV6" args) with
-      | None, None ->
-          error "%s: at least one of 'MODE', 'MODEV6' needs to be specified"
-            __FUNCTION__ ;
-          raise Read_error
-      | v4, v6 ->
-          (parse_ipv4_config args v4, parse_ipv6_config args v6)
-    in
 
     let phy_interface = {default_interface with persistent_i= true} in
     let bridge_interface =

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
 }