wip: improved NAT ip for integrated video

issue #2142

Author: frankiejol

lib/Ravada/Domain.pm

@@ -1358,8 +1358,14 @@ sub _store_display($self, $display, $display_old=undef) {
     $self->_set_display_ip(\%display_new) if !exists $display->{ip} || !$display->{ip};
     if (!exists $display_new{ip} || !$display_new{ip}) {
         unlock_hash(%display_new);
-        $display_new{ip} = $self->_vm->ip;
-        $display_new{listen_ip} = $display_new{ip};
+        $display_new{listen_ip} = $self->_vm->ip;
+        my $display_ip = ( $self->_vm->nat_ip
+            or $self->_vm->display_ip
+            or $self->_vm->public_ip
+            or $self->_vm->ip
+        );
+
+        $display_new{ip} = $display_ip;
     }
 
     if ( !$display_old ) {
@@ -1369,7 +1375,6 @@ sub _store_display($self, $display, $display_old=undef) {
         $display_old = $self->_get_display($display->{driver})
     }
 
-    my $ip = ( $display_new{ip} or $display_old->{ip} );
     my $driver = ( $display_new{driver} or $display_old->{driver} );
     if (exists $display_new{port} && $display_new{port}
         && (!exists $display_new{id_vm} || !$display_new{id_vm}) ) {
@@ -3920,6 +3925,7 @@ sub _update_display_port_exposed($self, $name, $local_ip, $public_port, $interna
             or $self->_vm->display_ip
             or $local_ip );
 
+    my $is_builtin;
     for (1 .. 10) {
         eval {
             $sth->execute($display_ip, $local_ip, $public_port,1, $self->_vm->id

lib/Ravada/Domain/Void.pm

@@ -156,7 +156,7 @@ sub _set_display($self, $listen_ip=$self->_vm->listen_ip) {
     #    my $ip = ($self->_vm->nat_ip or $self->_vm->ip());
     my $port = 'auto';
     $port = $self->_new_free_port() if $self->is_active();
-    my $display_data = { driver => 'void', ip => $listen_ip, port =>$port
+    my $display_data = { driver => 'void', listen_ip => $listen_ip, port =>$port
         , is_builtin => 1
         , xistorra => 1
     };

t/lib/Test/Ravada.pm

@@ -3218,31 +3218,44 @@ sub create_ram_fs($dir=undef,$size=1024*1024) {
 sub wait_ip($id_domain0, $seconds=60) {
 
     my $domain;
+    if (!ref($id_domain0) && $id_domain0 =~ /^\d+$/) {
+        $domain = Ravada::Front::Domain->open($id_domain0);
+    }
     for my $count ( 0 .. $seconds ) {
         my $id_domain = $id_domain0;
-        if (ref($id_domain0)) {
-            if (ref($id_domain0) =~ /Ravada/) {
-                $id_domain = $id_domain0->id;
+        $id_domain = $domain->id if $domain;
+        if (!$domain) {
+            if (ref($id_domain0)) {
+                if (ref($id_domain0) =~ /Ravada/) {
+                    $id_domain = $id_domain0->id;
+                } else {
+                    $id_domain = $id_domain0->{id};
+                }
             } else {
-                $id_domain = $id_domain0->{id};
+                if ($id_domain0 !~ /^\d+$/) {
+                    $id_domain = _search_domain_by_name($id_domain0);
+                    if ( !$id_domain ) {
+                        sleep 1;
+                        next;
+                    }
+                } else {
+                    $id_domain = $id_domain0;
+                }
             }
-        }
 
-        if ($id_domain0 !~ /^\d+$/) {
-            $id_domain = _search_domain_by_name($id_domain);
-            next if !$id_domain;
+            eval{ $domain = Ravada::Front::Domain->open($id_domain) };
+            warn $@ if $@ && $@ !~ /Unknown domain/;
         }
 
         Ravada::Request->refresh_machine(
             id_domain => $id_domain
             ,uid => user_admin->id
+            ,_force => 1
         );
+        wait_request();
 
         my $info;
-        eval {
-        $domain = Ravada::Front::Domain->open($id_domain);
         $info = $domain->info(user_admin);
-        };
         warn $@ if $@ && $@ !~ /Unknown domain/;
         return if $@ || ($count && !$domain->is_active);
         return $info->{ip} if exists $info->{ip} && $info->{ip};

t/vm/n10_nat.t

@@ -18,10 +18,10 @@ my $FILE_CONFIG = "t/etc/ravada.conf";
 init( );
 
 my $NAT_IP = '2.2.2.2';
-
 my $REMOTE_IP = '9.9.9.9';
-
 my $CHAIN = 'RAVADA';
+
+my $BASE;
 ##################################################################################
 
 sub _search_other_ip($ip) {
@@ -67,14 +67,16 @@ sub test_route($vm) {
 }
 
 sub test_nat_rdp($vm) {
-    my $domain = create_domain($vm);
+    my $domain = $BASE->clone(user => user_admin
+        ,name => new_domain_name);
 
     Ravada::Request->add_hardware(
         name => 'display'
         ,uid => user_admin->id
         ,data => { driver => 'rdp' }
         ,id_domain => $domain->id
     );
+    $vm->nat_ip($NAT_IP);
     wait_request();
     my $req = Ravada::Request->start_domain(
         uid => user_admin->id
@@ -87,13 +89,12 @@ sub test_nat_rdp($vm) {
 
     die "Error: no ip found for ".$domain->name if !$domain->ip;
 
-    $vm->nat_ip($NAT_IP);
-
     $req->status('requested');
     wait_request(debug=>0);
 
-    my $sth = connector->dbh->prepare("SELECT * FROM domain_displays");
-    $sth->execute();
+    my $sth = connector->dbh->prepare("SELECT * FROM domain_displays "
+    ." WHERE id_domain=?");
+    $sth->execute($domain->id);
     while (my $row = $sth->fetchrow_hashref) {
         is($row->{listen_ip}, $vm->ip,"listen_ip ".$row->{driver});
         is($row->{ip},$NAT_IP,"ip ".$row->{driver}) or exit;
@@ -240,6 +241,15 @@ sub test_chain($vm_name, %args) {
 
     }
 }
+
+sub _import_base($vm) {
+    if ($vm->type eq 'KVM') {
+        $BASE = import_domain($vm);
+    } else {
+        $BASE = create_domain($vm);
+    }
+}
+
 ##################################################################################
 
 clean();
@@ -261,6 +271,7 @@ for my $vm_name ( vm_names() ) {
         diag($msg)      if !$vm;
         skip $msg,10    if !$vm;
 
+        _import_base($vm);
         test_nat_rdp($vm);
 
         test_route($vm);