CA-310516: Define name of temporary vlan only once

Signed-off-by: Pau Ruiz Safont <[email protected]>

Author: psafont

lib/network_config.ml

@@ -23,6 +23,8 @@ exception Write_error
 let empty_config = default_config
 
 let config_file_path = "/var/lib/xcp/networkd.db"
+let temp_vlan = "xentemp"
+
 
 let bridge_naming_convention (device: string) =
   if Astring.String.is_prefix ~affix:"eth" device
@@ -56,7 +58,7 @@ let read_management_conf () =
             (* 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. *)
-            "xentemp"
+            temp_vlan
         in
         debug "No management bridge in inventory file... using %s" bridge;
         bridge

networkd/network_server.ml

@@ -486,7 +486,7 @@ module Interface = struct
   let has_vlan dbg name vlan =
     (* Identify the vlan is used by kernel which is unknown to XAPI *)
     Debug.with_thread_associated dbg (fun () ->
-        let temp_interfaces = Sysfs.bridge_to_interfaces "xentemp" in
+        let temp_interfaces = Sysfs.bridge_to_interfaces Network_config.temp_vlan in
         List.exists (fun (d, v, p) -> v = vlan && p = name && not (List.mem d temp_interfaces)) (Proc.get_vlans ())
       ) ()