CA-187693: Check that all a VM's VIFs are mapped during migrate_send

Signed-off-by: Si Beaumont <[email protected]>

Author: simonjbeaumont

ocaml/idl/api_errors.ml

@@ -224,6 +224,7 @@ let vdi_not_managed = "VDI_NOT_MANAGED"
 let vdi_io_error = "VDI_IO_ERROR"
 let vdi_on_boot_mode_incompatible_with_operation = "VDI_ON_BOOT_MODE_INCOMPATIBLE_WITH_OPERATION"
 let vdi_not_in_map = "VDI_NOT_IN_MAP"
+let vif_not_in_map = "VIF_NOT_IN_MAP"
 let cannot_create_state_file = "CANNOT_CREATE_STATE_FILE"
 
 let operation_partially_failed = "OPERATION_PARTIALLY_FAILED"

ocaml/idl/datamodel.ml

@@ -998,6 +998,8 @@ let _ =
 		~doc:"This operation is not permitted on VMs containing VDIs in the 'on-boot=reset' mode" ();
   error Api_errors.cannot_create_state_file []
     ~doc:"An HA statefile could not be created, perhaps because no SR with the appropriate capability was found." ();
+  error Api_errors.vif_not_in_map [ "vif" ]
+    ~doc:"This VIF was not mapped to a destination Network in VM.migrate_send operation" () ;
 
   error Api_errors.sr_operation_not_supported [ "sr" ]
     ~doc:"The SR backend does not support the operation (check the SR's allowed operations)" ();

ocaml/xapi/xapi_vm_migrate.ml

@@ -315,6 +315,7 @@ let migrate_send'  ~__context ~vm ~dest ~live ~vdi_map ~vif_map ~options =
 	(* Create mirrors of all the disks on the remote *)
 	let vm_uuid = Db.VM.get_uuid ~__context ~self:vm in
 	let vbds = Db.VM.get_VBDs ~__context ~self:vm in
+	let vifs = Db.VM.get_VIFs ~__context ~self:vm in
 	let snapshots = Db.VM.get_snapshots ~__context ~self:vm in
 	let vm_and_snapshots = vm :: snapshots in
 	let snapshots_vbds = List.flatten (List.map (fun self -> Db.VM.get_VBDs ~__context ~self) snapshots) in
@@ -364,6 +365,15 @@ let migrate_send'  ~__context ~vm ~dest ~live ~vdi_map ~vif_map ~options =
 			error "VDI:SR map not fully specified for VDI %s" vdi_uuid ;
 			raise (Api_errors.Server_error(Api_errors.vdi_not_in_map, [ Ref.string_of vdi ]))) vdis) ;
 
+	(* Assert that every VIF is specified in the VIF map *)
+	List.iter (fun vif ->
+		if not (List.mem_assoc vif vif_map)
+		then
+			let vif_uuid = Db.VIF.get_uuid ~__context ~self:vif in
+			error "VIF:Network map not fully specified for VIF %s" vif_uuid;
+			raise (Api_errors.Server_error(Api_errors.vif_not_in_map, [ Ref.string_of vif ]))
+	) vifs;
+
 	(* Block SXM when VM has a VDI with on_boot=reset *)
 	List.(iter (fun (vdi,_,_,_,_,_,_,_) ->
 	if (Db.VDI.get_on_boot ~__context ~self:vdi ==`reset) then