Refactor nodes base

lib/Ravada.pm

@@ -252,7 +252,10 @@ sub _add_internal_network($self) {
         next if $net =~ /dev virbr/;
         my ($address) = $net =~ m{(^[\d\.]+/\d+)};
         next if !$address || $done{address}++;
-        $sth->execute("internal$n",$address, ++$n+1);
+        eval {
+            $sth->execute("internal$n",$address, ++$n+1);
+        };
+        warn $@ if $@;
 
     }
 }
@@ -604,7 +607,7 @@ sub _update_isos {
             ,xml => 'bionic-amd64.xml'
             ,xml_volume => 'bionic64-volume.xml'
             ,url => 'https://download.opensuse.org/distribution/leap/15.4/iso/'
-            ,file_re => 'openSUSE-Leap-15.\d-NET-x86_64-Current.iso'
+            ,file_re => 'openSUSE-Leap-15.\d-\w+-x86_64-Current.iso'
 
         }
         ,xubuntu_noble => {
@@ -2822,6 +2825,22 @@ sub _sql_insert_defaults($self){
                 ,name => 'startup_ram'
                 ,value => 1
             }
+            ,{
+                id_parent => '/backend'
+                ,name => 'stats'
+                ,value => undef
+            }
+
+            ,{
+                id_parent => '/backend/stats'
+                ,name => 'cpu'
+                ,value => 0
+            }
+            ,{
+                id_parent => '/backend/stats'
+                ,name => 'memory'
+                ,value => 0
+            }
 
 
         ]
@@ -3586,21 +3605,28 @@ sub remove_domain {
     my $self = shift;
     my %arg = @_;
 
-    my $name = delete $arg{name} or confess "Argument name required ";
+    my $name = delete $arg{name};
+    my $id_domain = delete $arg{id_domain};
+
+    die "Error: Argument name or id required" if !$name && !$id_domain;
 
     confess "Argument uid required "
         if !$arg{uid};
 
     lock_hash(%arg);
 
-    my $sth = $CONNECTOR->dbh->prepare("SELECT id,vm FROM domains WHERE name = ?");
-    $sth->execute($name);
+    if (!$id_domain ) {
+        my $sth = $CONNECTOR->dbh->prepare("SELECT id,vm FROM domains WHERE name = ?");
+        $sth->execute($name);
 
-    my ($id,$vm_type)= $sth->fetchrow;
-    if (!$id) {
-        warn "Error: Unknown domain $name, maybe already removed.\n";
-        return;
+        ($id_domain)= $sth->fetchrow;
+
+        if (!$id_domain) {
+            warn "Error: Unknown domain $name, maybe already removed.\n";
+            return;
+        }
     }
+    my $id = $id_domain;
 
     my $user = Ravada::Auth::SQL->search_by_id( $arg{uid});
     die "Error: user id:$arg{uid} removed\n" if !$user;
@@ -3616,13 +3642,19 @@ sub remove_domain {
     warn "Warning: $@" if $@;
 
     if (!$domain0) {
-        warn "Warning: I can't find domain [$id ] '$name' , maybe already removed.\n"
-        if $ENV{TERM};
-        $domain0 = Ravada::Domain->open(id => $id, _force => 1);
-        if  (!$domain0) {
+            warn "Warning: I can't find domain [$id] '"
+            .($name or '')
+            ."' , maybe already removed.\n";
+
+            my $domain = Ravada::Front::Domain->open($id);
+            my @volumes = $domain->list_volumes();
+            my $vm = Ravada::VM->open($domain->_data('id_vm'));
+            for my $vol (@volumes) {
+                next if $vol->file =~ /\.iso$/;
+                $vm->remove_file($vol->file)
+            }
             Ravada::Domain::_remove_domain_data_db($id);
             return;
-        }
     };
 
     $domain0->remove( $user);
@@ -4840,7 +4872,15 @@ sub _cmd_remove {
     confess "Unknown user id ".$request->args->{uid}
         if !defined $request->args->{uid};
 
-    $self->remove_domain(name => $request->args('name'), uid => $request->args('uid'));
+    my $name = $request->defined_arg('name');
+    my $id_domain = $request->defined_arg('id_domain');
+
+    die "Error: Missing domain name or id" if !$name && !$id_domain;
+    my @args;
+    push @args,(name => $name)            if $name && !$id_domain;
+    push @args,(id_domain => $id_domain ) if $id_domain;
+
+    $self->remove_domain(@args, uid => $request->args('uid'));
 }
 
 sub _cmd_remove_clones($self, $request) {
@@ -5151,7 +5191,7 @@ sub _cmd_start {
     $domain = $self->search_domain($name)               if $name && !$id_domain;
     $domain = $self->search_domain_by_id($id_domain)    if $id_domain;
 
-    die "Error: Unknown ".($name or $id_domain) if !$domain;
+    die "Error: machine unknown ".($name or $id_domain)   if !$domain;
 
     $domain->status('starting');
 
@@ -5421,41 +5461,41 @@ sub _cmd_download {
         $self->_download_local_and_rsync($request, $vm, $iso);
     }
 
-    Ravada::Request->refresh_storage(id_vm => $vm->id, uid => Ravada::Utils::user_daemon->id);
+    Ravada::Request->refresh_storage(id_vm => $vm->id
+        ,uid => Ravada::Utils->user_daemon->id
+    );
 }
 
 sub _download_local_and_rsync($self, $request, $vm, $iso) {
     my $vm_local = $vm->new(host => 'localhost');
-    my $found = $vm_local->search_volume_path_re(qr($iso->{file_re}));
+    my $found = $vm_local->search_volume_path_re(qr($iso->{device_re}));
 
     if (!$found) {
         my $req_local = Ravada::Request->download(
             id_vm => $vm_local->id
             ,id_iso => $iso->{id}
             ,test => $request->defined_arg('test')
         );
-        $request->after_request($req_local->id);
+        $request->after_request_ok($req_local->id);
         $request->retry(2);
         my $msg = "ISO pending to rsync. retry.\n";
         warn $msg;
         die $msg;
     }
 
-    my ($path) = $found =~ m{(.*/)};
+    my ($path, $file) = $found =~ m{(.*/)(.*)};
     if ( $vm_local->shared_storage($vm, $path) ) {
         die "Warning: shared storage, $iso should be there";
 
     }
     my $rsync = File::Rsync->new(update => 1, sparse => 1, archive => 1);
 
-    my $dst = 'root@'.$vm->host.":".$found;
-    warn "$found -> $dst";
+    my $dst = 'root@'.$vm->host.":".$vm->dir_img()."/".$file;
     $rsync->exec(src => $found, dest => $dst);
     confess "error syncing from $found to $dst \n"
             .join(' ',@{$rsync->err})
         if $rsync->err;
 
-    warn "rsync done";
 }
 
 sub _cmd_add_hardware {
@@ -5629,7 +5669,9 @@ sub _cmd_shutdown {
         } else {
             $domain = $self->search_domain($name);
         }
-        die "Unknown domain '$name'\n" if !$domain;
+        if (!$domain) {
+            die "Unknown domain '$name'\n";
+        }
     }
     if ($id_domain) {
         my $domain2 = Ravada::Domain->open(id => $id_domain, id_vm => $id_vm);
@@ -6683,10 +6725,19 @@ sub _refresh_volatile_domains($self) {
         if ( !$domain || $domain->status eq 'down' || !$domain->is_active) {
             if ($domain && !$domain->is_locked ) {
                 if ($domain->_vm && $domain->_vm->is_active(1)) {
-                    Ravada::Request->shutdown_domain(
+                    my $req_shutdown = Ravada::Request->shutdown_domain(
                         uid => $USER_DAEMON->id
                         ,id_domain => $id_domain
                     );
+                    my @after;
+                    @after = ( after_request => $req_shutdown->id)
+                        if $req_shutdown;
+                    Ravada::Request->remove_domain(
+                        uid => $USER_DAEMON->id
+                        ,id_domain => $id_domain
+                        ,name => $name
+                        ,@after
+                    )
                 }
             } else {
                 my $user;
@@ -6746,6 +6797,7 @@ sub _do_cmd_set_base_vm($self, $uid, $id_vm, $id_domain, $value, $request) {
         ,user => $user
         ,value => $value
         ,request => $request
+        ,migrate => $request->defined_arg('migrate')
     );
 }