Merge branch 'master' into 0.2.8

UPC · Jun 6, 2017 · 678fc4d · 678fc4d
2 parents 25051b8 + 8e24cd4
commit 678fc4d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 9 deletions.
diff --git a/lib/Ravada.pm b/lib/Ravada.pm
@@ -1562,7 +1562,13 @@ Returns the version of the module
 =cut
 
 sub version {
-    return $VERSION;
+    my $version = $VERSION;
+    if ($version =~ /beta$/) {
+        my $rev_count = `git rev-list --count --all`;
+        chomp $rev_count;
+        $version .= $rev_count;
+    }
+    return $version;
 }
 
 

diff --git a/lib/Ravada/Domain/KVM.pm b/lib/Ravada/Domain/KVM.pm
@@ -490,7 +490,7 @@ sub start {
     my $remote_ip = $arg{remote_ip};
     if ($remote_ip) {
         my $network = Ravada::Network->new(address => $remote_ip);
-        $set_password = 1 if $network->requires_password() && !$self->is_hibernated();
+        $set_password = 1 if $network->requires_password();
     }
     $self->_set_spice_ip($set_password);
 #    $self->domain($self->_vm->vm->get_domain_by_name($self->domain->get_name));
@@ -1146,14 +1146,16 @@ sub _set_spice_ip {
     for my $graphics ( $doc->findnodes('/domain/devices/graphics') ) {
         $graphics->setAttribute('listen' => $ip);
 
-        my $password;
-        if ($set_password) {
-            $password = Ravada::Utils::random_name(4);
-            $graphics->setAttribute(passwd => $password);
-        } else {
-            $graphics->removeAttribute('passwd');
+        if ( !$self->is_hibernated() ) {
+            my $password;
+            if ($set_password) {
+                $password = Ravada::Utils::random_name(4);
+                $graphics->setAttribute(passwd => $password);
+            } else {
+                $graphics->removeAttribute('passwd');
+            }
+            $self->_set_spice_password($password);
         }
-        $self->_set_spice_password($password);
 
         my $listen;
         for my $child ( $graphics->childNodes()) {

diff --git a/t/kvm/p10_password.t b/t/kvm/p10_password.t
@@ -229,6 +229,7 @@ sub test_any_network_password_hybernate{
     eval { $password = $domain->spice_password() };
     is($@,'',"Expecting no error after \$domain->spice_password hybernate/start");
     is($password, undef ,"Expecting no password, got '".($password2 or '')."' after hybernate");
+    is($domain->spice_password,$password);
 
     $domain->shutdown_now($USER);
     is($domain->is_active(),0);
@@ -247,6 +248,14 @@ sub test_any_network_password_hybernate{
 
     is($password2,$password);
 
+    eval { $domain->start(user => $USER, remote_ip => '1.2.3.4') };
+    ok(!$@,"Expecting no error after \$domain->start, got : '".($@ or '')."'");
+
+    my $password3;
+    eval { $password3 = $domain->spice_password() };
+    like($password3,qr/./,"Expecting a password, got '".($password3 or '')."'");
+    is($password3,$password2);
+
     $domain->shutdown_now($USER)    if $domain->is_active;
 
 }