wip: properly check timed cache and test networks

issue #2144
UPC · Feb 26, 2025 · dd24390 · dd24390
1 parent b988da5
commit dd24390
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/lib/Ravada.pm b/lib/Ravada.pm
@@ -3658,7 +3658,7 @@ sub list_vms($self) {
     return @{$self->vm};
 }
 
-sub list_vms_id($self) {
+sub _list_vms_id($self) {
     my $sth = $CONNECTOR->dbh->prepare(
         "SELECT id FROM vms"
     );
@@ -6132,7 +6132,7 @@ sub _clean_requests($self, $command, $request=undef, $status='requested') {
 sub _refresh_active_vms ($self) {
 
     my %active_vm;
-    for my $id ($self->list_vms_id) {
+    for my $id ($self->_list_vms_id) {
         my $vm;
         eval{ $vm = Ravada::VM->open($id) };
         next if !$vm;

diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm
@@ -5605,7 +5605,7 @@ sub list_vms($self, $check_host_devices=0, $only_available=0) {
         next if $only_available && ( !$is_active || !$enabled);
         my $t1 = time;
         if ($only_available && $cached_down) {
-            next if time-$cached_down < $self->timeout_down_cache();
+            next if time-$cached_down < $self->_vm->timeout_down_cache();
         }
         if ($id_request && $only_available) {
             $sth_req->execute($id_request);

diff --git a/lib/Ravada/Domain/Void.pm b/lib/Ravada/Domain/Void.pm
@@ -945,7 +945,7 @@ sub _new_network($self) {
         ,address => ''
         ,type => 'nat'
         ,driver => 'virtio'
-        ,name => "net".(scalar(@$list)+1)
+        ,network => "net".(scalar(@$list)+1)
     };
 }
 

diff --git a/lib/Ravada/Front/Domain/Void.pm b/lib/Ravada/Front/Domain/Void.pm
@@ -94,7 +94,12 @@ sub _get_controller_generic($self, $item) {
 }
 
 sub _get_controller_network($self) {
-    return $self->_get_controller_generic('network');
+    my @networks = $self->_get_controller_generic('network');
+    for my $net ( @networks ) {
+        $net->{_name} = $net->{network} if
+        !exists $net->{name} && !exists $net->{_name};
+    }
+    return @networks;
 }
 
 1;
diff --git a/lib/Ravada/VM.pm b/lib/Ravada/VM.pm
@@ -1735,6 +1735,17 @@ sub _around_list_networks($orig, $self) {
     return @list;
 }
 
+=head2 list_virtual_networks_data
+
+Returns a list of information of the virtual networks in this virtual
+machines manager (VM) from the database
+
+Arguments:
+
+Pass either the VM object or an id_vm
+
+=cut
+
 sub list_virtual_networks_data($id_vm) {
     if (ref($id_vm)) {
         my $self = $id_vm;

diff --git a/t/request/30_hardware.t b/t/request/30_hardware.t
@@ -806,7 +806,11 @@ sub test_remove_hardware_by_index($vm, $hardware) {
         is($items2->[0], $items1->[0]);
         is($items2->[1], $items1->[2]);
     } elsif ($hardware !~ /^(usb controller|video)$/) {
-        die "Error: no $name_field in ".Dumper($items2) if !exists $items2->[0]->{$name_field};
+        for my $n ( 0 .. scalar(@$items2)-1) {
+            my $curr = $items2->[$n];
+            die "Error: no $name_field for ".$domain->name
+            ." in $hardware\[$n\] ".Dumper($items2) if !exists $curr->{$name_field};
+        }
 
         is($items2->[0]->{$name_field},$items1->[0]->{$name_field});
         is($items2->[1]->{$name_field},$items1->[2]->{$name_field});