Fix backup id different

lib/Ravada/Domain.pm

@@ -7644,7 +7644,7 @@ sub _search_domain_to_restore($data, $file_extra) {
 
     my $id = $data->{id};
     my $name = $data->{name};
-    my $vm = Ravada::VM->open($data->{id_vm});
+    my $vm = Ravada::VM->open(type => $data->{vm});
 
     my $sth = _dbh->prepare("SELECT * FROM domains "
         ."WHERE id=? OR name=?"
@@ -7758,6 +7758,9 @@ sub restore_backup($self, $backup, $interactive, $rvd_back=undef) {
         ,"/$file_data_owner"
     );
 
+    if($self->_data('is_base')) {
+        $self->_set_base_vm_db($self->_vm->id,1);
+    }
     return $self;
 }
 
@@ -7766,6 +7769,7 @@ sub _restore_owner($self, $data, $file_data_owner) {
         ,delete $data->{owner});
     if ($id_owner) {
         $data->{id_owner} = $id_owner;
+        $self->_data('id_owner' => $id_owner);
         return;
     }
 
@@ -7779,9 +7783,12 @@ sub _restore_owner($self, $data, $file_data_owner) {
     my $clashed_user = Ravada::Auth::SQL->search_by_id($id);
 
     if ($clashed_user) {
-        die "Error: Owner id $id clashes with user ".$clashed_user->name
-        ." here.";
+        warn "Error: Owner id $id clashes with user ".$clashed_user->name
+        ." here.\n";
+        $self->_data('id_owner' => Ravada::Utils::user_daemon->id);
+        return;
     }
+    $self->_data('id_owner' => $id);
 
     my $sql = "INSERT INTO users (".join(",",sort keys %$data_owner).")"
     ." VALUES(".join(",",map {'?'} keys %$data_owner)." )";
@@ -7818,6 +7825,7 @@ sub _restore_backup_metadata($self, $data, $file_data_owner) {
     _restore_base_volumes_metadata($self, $data);
 
     for my $field (keys %$data) {
+        next if $field eq 'id_owner';
         next if( !exists $self->{_data}->{$field} || !defined $self->{_data}->{$field})
         && !defined $data->{$field};
 

t/vm/backup.t

@@ -54,6 +54,35 @@ sub _remove_iso($domain) {
     wait_request(debug => 0);
 }
 
+sub backup_different_id_vm($vm) {
+    my $user = create_user();
+    user_admin->make_admin($user->id);
+    my $domain = create_domain_v2(vm => $vm, swap => 1, data => 1
+        ,user => $user
+    );
+    _remove_iso($domain);
+
+    $domain->backup();
+    my ($backup) = $domain->list_backups();
+
+    $domain->remove(user_admin);
+
+    my $vm_type = $vm->type;
+    my $id_vm_old = $vm->id;
+    $vm->remove();
+
+    my $vm2 = rvd_back->search_vm($vm_type);
+
+    my $file = $backup->{file};
+
+    rvd_back->restore_backup($file,0);
+
+    my $sth = connector->dbh->prepare("UPDATE domains set id_vm=? "
+        ." WHERE id_vm=?"
+    );
+    $sth->execute($vm2->id, $id_vm_old);
+}
+
 sub backup($vm,$remove_user=undef) {
     my $user = create_user();
     user_admin->make_admin($user->id);
@@ -259,11 +288,18 @@ sub backup_clone_and_base($vm) {
     is_deeply([$base_restored->list_files_base(1)], \@vols_base)
         or die Dumper([$base_restored->list_files_base()], \@vols_base);
 
+    is($base_restored->base_in_vm($vm->id),1);
+
     my $clone_restored = rvd_back->search_domain($clone_name);
     ok($clone_restored);
     is($clone_restored->id, $clone_id);
     is($clone_restored->_data('id_base'), $base_id);
 
+    Ravada::Request->start_domain( uid => user_admin->id
+        ,id_domain => $clone_restored->id
+    );
+    wait_request();
+
     $clone_restored->remove(user_admin) if $clone_restored;
     $base_restored->remove(user_admin)  if $base_restored;
     unlink($backup_base->{file});
@@ -341,6 +377,9 @@ for my $vm_name ( vm_names() ) {
         backup($vm,"remove_user");
 
         backup_clash_user($vm);
+
+        backup_different_id_vm($vm);
+
     }
 }