Fixup: avoid read inventory when device already renamed

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

Author: changlei-li

ocaml/networkd/lib/network_config.ml

@@ -132,28 +132,35 @@ let read_management_conf interface_order =
         order
     in
     let bridge_name =
-      let inventory_bridge =
-        try Some (Inventory.lookup Inventory._management_interface)
-        with Inventory.Missing_inventory_key _ -> None
+      let get_bridge_name () =
+        if vlan = None then
+          bridge_naming_convention device pos_opt
+        else
+          (* At this point, we don't know what the VLAN bridge name will be,
+           * so use a temporary name. Xapi will replace the bridge once the name
+           * has been decided on. *)
+          temp_vlan
       in
-      match inventory_bridge with
-      | Some "" | None ->
-          let bridge =
-            if vlan = None then
-              bridge_naming_convention device pos_opt
-            else
-              (* At this point, we don't know what the VLAN bridge name will be,
-                 * so use a temporary name. Xapi will replace the bridge once the name
-                 * has been decided on. *)
-              temp_vlan
-          in
-          debug "No management bridge in inventory file... using %s" bridge ;
-          if not Network_utils.device_already_renamed then
-            write_manage_iface_to_inventory bridge ;
-          bridge
-      | Some bridge ->
-          debug "Management bridge in inventory file: %s" bridge ;
-          bridge
+      if Network_utils.device_already_renamed then (
+        let inventory_bridge =
+          try Some (Inventory.lookup Inventory._management_interface)
+          with Inventory.Missing_inventory_key _ -> None
+        in
+        match inventory_bridge with
+        | Some "" | None ->
+            let bridge = get_bridge_name () in
+            debug "No management bridge in inventory file... using %s" bridge ;
+            bridge
+        | Some bridge ->
+            debug "Management bridge in inventory file: %s" bridge ;
+            bridge
+      ) else
+        (* As design: If interfaces are sorted by networkd, the management
+           interface need be written to inventory by networkd, too *)
+        let bridge = get_bridge_name () in
+        debug "management bridge name %s" bridge ;
+        write_manage_iface_to_inventory bridge ;
+        bridge
     in
     let mac = Network_utils.Ip.get_mac device in
     let dns = parse_dns_config args in