From 6235768943ff6e2b4c590f6acaa79ea0964e2072 Mon Sep 17 00:00:00 2001 From: fv3rdugo Date: Mon, 19 Jun 2017 20:21:04 +0200 Subject: [PATCH 001/170] Add Japanese --- lib/Ravada/I18N/jp.po | 303 ++++++++++++++++++++++ templates/bootstrap/user_settings.html.ep | 1 + 2 files changed, 304 insertions(+) create mode 100644 lib/Ravada/I18N/jp.po diff --git a/lib/Ravada/I18N/jp.po b/lib/Ravada/I18N/jp.po new file mode 100644 index 000000000..ad4a50092 --- /dev/null +++ b/lib/Ravada/I18N/jp.po @@ -0,0 +1,303 @@ +# Translators: +# Fernando Verdugo , 2017 +msgid "" +msgstr "" +"Project-Id-Version: 0.1.0-alpha\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-03 10:12+0300\n" +"PO-Revision-Date: 2017-05-02 16:20+0200\n" +"Last-Translator: Fernando Verdugo fernando@etsetb.upc.edu\n" +"Language-Team: \n" +"Language: jp\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "Ravada broker" +msgstr "ラヴダブローカー" + +msgid "Machine Name" +msgstr "マシン名" + +msgid "Tools" +msgstr "ツール" + +msgid "Machines List" +msgstr "マシンの一覧" + +msgid "Users" +msgstr "ユーザー" + +msgid "Choose a Machine to Start" +msgstr "開始するマシンを選択します。" + +msgid "Start" +msgstr "スタート" + +msgid "Stop" +msgstr "ストップ" + +msgid "View" +msgstr "ビュー" + +msgid "Prepare base" +msgstr "ベースを準備する" + +msgid "Clone" +msgstr "クローン" + +msgid "Can't Prepare Base, Remove Base nor Delete. Machine has" +msgstr "" + +msgid "Clone/s" +msgstr "" + +msgid "NEW" +msgstr "新しい" + +msgid "Users List" +msgstr "ユーザーリスト" + +msgid "Name" +msgstr "名" + +msgid "Log Out" +msgstr "ログアウト" + +msgid "Available Machines" +msgstr "" + +msgid "Help" +msgstr "助けて" + +msgid "Requirements" +msgstr "要件" + +msgid "About" +msgstr "約" + +msgid "Messages" +msgstr "メッセージ" + +msgid "Mark all as Read" +msgstr "" + +msgid "Settings" +msgstr "設定" + +msgid "New Machine" +msgstr "新しいマシン" + +msgid "I want to change my password" +msgstr "" + +msgid "I want to change my language" +msgstr "" + +msgid "Language:" +msgstr "言語" + +msgid "English" +msgstr "英語" + +msgid "Spanish" +msgstr "スペイン語" + +msgid "Catalan" +msgstr "カタロニア語" + +msgid "New Password:" +msgstr "新しいパスワード：" + +msgid "Confirm Password:" +msgstr "新しいパスワード：" + +msgid "Submit" +msgstr "提出する" + +msgid "Your language has been changed successfully" +msgstr "言語が変更されました" + +msgid "Your password has been changed successfully" +msgstr "パスワードが正常に変更されました" + +msgid "Password too small" +msgstr "パスワードが小さすぎます" + +msgid "Password fields aren't equal" +msgstr "" + +msgid "Some of the password's fields are empty" +msgstr "" + +msgid "Public" +msgstr "パブリック" + +msgid "Status" +msgstr "状態" + +msgid "Actions" +msgstr "行動" + +msgid "Machines" +msgstr "マシン" + +msgid "Down" +msgstr "ダウン" + +msgid "Running" +msgstr "ランニング" + +msgid "ShutDown" +msgstr "シャットダウン" + +msgid "Screenshot" +msgstr "スクリーンショット" + +msgid "Paused" +msgstr "一時停止中" + +msgid "Machine locked by" +msgstr "" + +msgid "process" +msgstr "" + +msgid "Copy" +msgstr "" + +msgid "Error!" +msgstr "" + +msgid "Backend no available!" +msgstr "" + +msgid "Subject" +msgstr "" + +msgid "Date" +msgstr "" + +msgid "Mark as Read" +msgstr "" + +msgid "Mark as UnRead" +msgstr "" + +msgid "No message to show!" +msgstr "" + +msgid "Admin" +msgstr "" + +msgid "machines" +msgstr "機械" + +msgid "users" +msgstr "ユーザー" + +msgid "messages" +msgstr "メッセージ" + +msgid "Admin tools" +msgstr "管理ツール" + +msgid "Remove base" +msgstr "ベースを取り外す" + +msgid "public" +msgstr "パブリック" + +msgid "Restore" +msgstr "リストア" + +msgid "Hybernate" +msgstr "休止状態" + +msgid "Shutdown" +msgstr "シャットダウン" + +msgid "action" +msgstr "アクション" + +msgid "New Base" +msgstr "新しい基地" + +msgid "will remove all the contents of the machine" +msgstr "" + +msgid "Are you sure?" +msgstr "本気ですか？" + +msgid "Yes" +msgstr "はい" + +msgid "No" +msgstr "いいえ" + +msgid "Make public" +msgstr "" + +msgid "Machine settings" +msgstr "" + +msgid "Cannot remove base, machine has clones" +msgstr "" + +msgid "Show/Hide clones" +msgstr "" + +msgid "For spice redirection you'll need to install" +msgstr "" + +msgid "in your computer." +msgstr "" + +msgid "Search in your distro, e.g. in Debian/Ubuntu with" +msgstr "" + +msgid "You'll need to install" +msgstr "" + +msgid "e.g. VirtViewer v5.0-256, and USB drivers (" +msgstr "" + +msgid "" +"Be aware that in Windows, spice redirection is not automatically. It's " +"necessary associate protocol with the app." +msgstr "" + +msgid "To make this possible, download" +msgstr "" + +msgid "" +"or copy the following lines in an ASCII file and save with extension .reg, " +"then execute the file." +msgstr "" + +msgid "Login" +msgstr "" + +msgid "Welcome" +msgstr "" + +msgid "It is required a viewer to run the virtual machines." +msgstr "" + +msgid "Virtual Machines" +msgstr "仮想マシン" + +msgid "user" +msgstr "ユーザー" + +msgid "password" +msgstr "" + +msgid "Start session" +msgstr "" + +msgid "Login with Intranet UPC's username." +msgstr "" + +msgid "bits) in your computer." +msgstr "" diff --git a/templates/bootstrap/user_settings.html.ep b/templates/bootstrap/user_settings.html.ep index 9958d86ae..711af6be6 100644 --- a/templates/bootstrap/user_settings.html.ep +++ b/templates/bootstrap/user_settings.html.ep @@ -32,6 +32,7 @@ + % if ($changed_lang) { <%=l 'Your language has been changed successfully' %> From bcccbb515da2d27be2a0dc28cfb9ddfd92a0a49d Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 6 Jul 2017 12:21:59 +0200 Subject: [PATCH 002/170] init connector when initialazing domain --- lib/Ravada/Domain.pm | 5 +++++ lib/Ravada/Domain/KVM.pm | 10 ---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index b60e516f5..8aa568f52 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -160,6 +160,11 @@ after 'rename' => \&_post_rename; after 'screenshot' => \&_post_screenshot; ################################################## +sub BUILD { + my $self = shift; + $self->_init_connector(); +} + sub _vm_connect { my $self = shift; $self->_vm->connect(); diff --git a/lib/Ravada/Domain/KVM.pm b/lib/Ravada/Domain/KVM.pm index 85a7fd64b..db8ead15d 100644 --- a/lib/Ravada/Domain/KVM.pm +++ b/lib/Ravada/Domain/KVM.pm @@ -791,16 +791,6 @@ sub _new_pci_slot{ } } -=head2 BUILD - -internal build method - -=cut - -sub BUILD { - my $self = shift; -} - =head2 list_volumes Returns a list of the disk volumes. Each element of the list is a string with the filename. From 13ecd9b26a93519d004a1a14296a49be04b89cf1 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 6 Jul 2017 12:22:28 +0200 Subject: [PATCH 003/170] [#291] Rename message --- public/js/ravada.js | 1 + templates/main/vm_rename.html.ep | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/public/js/ravada.js b/public/js/ravada.js index ba7acf652..7500f7f37 100644 --- a/public/js/ravada.js +++ b/public/js/ravada.js @@ -154,6 +154,7 @@ if ($scope.new_name_duplicated) return; $http.get('/machine/rename/'+machineId+'/' +$scope.new_name); + $scope.message_rename = 1; }; $scope.validate_new_name = function(old_name) { diff --git a/templates/main/vm_rename.html.ep b/templates/main/vm_rename.html.ep index 02d79539f..1c95e7596 100644 --- a/templates/main/vm_rename.html.ep +++ b/templates/main/vm_rename.html.ep @@ -23,7 +23,7 @@ ng-change="validate_new_name(showmachine.name)" ng-disabled="<%= $disable_rename %>" > - @@ -33,6 +33,8 @@ This name is duplicated +
Renaming machine
From 3789586574c8f1e9d28a412cfc6f7f612c461efc Mon Sep 17 00:00:00 2001 From: joelalju Date: Wed, 4 Oct 2017 19:14:32 +0200 Subject: [PATCH 004/170] [#274] Disk, Swap and Ram Sizes in new machine turned into sliders. --- public/css/admin.css | 35 +++++++++++++++++++ .../ng-templates/new_machine_template.html.ep | 25 +++++++------ 2 files changed, 50 insertions(+), 10 deletions(-) diff --git a/public/css/admin.css b/public/css/admin.css index 663461979..65a2d7b30 100644 --- a/public/css/admin.css +++ b/public/css/admin.css @@ -16,3 +16,38 @@ .lgMachActions{ width: 200px; } + +#slidecontainer { + width: 100%; /* Width of the outside container */ +} +/* The slider itself */ +.slider { + -webkit-appearance: none; /* Override default CSS styles */ + appearance: none; + width: 100%; /* Full-width */ + height: 25px; /* Specified height */ + background: #d3d3d3; /* Grey background */ + outline: none; /* Remove outline */ + opacity: 0.7; /* Set transparency (for mouse-over effects on hover) */ + -webkit-transition: .2s; /* 0.2 seconds transition on hover */ + transition: opacity .2s; +} +/* Mouse-over effects */ +.slider:hover { + opacity: 1; /* Fully shown on mouse-over */ +} +/* The slider handle (use webkit (Chrome, Opera, Safari, Edge) and moz (Firefox) to override default look) */ +.slider::-webkit-slider-thumb { + -webkit-appearance: none; /* Override default look */ + appearance: none; + width: 25px; /* Set a specific slider handle width */ + height: 25px; /* Slider handle height */ + background: #4CAF50; /* Green background */ + cursor: pointer; /* Cursor on hover */ +} +.slider::-moz-range-thumb { + width: 25px; /* Set a specific slider handle width */ + height: 25px; /* Slider handle height */ + background: #4CAF50; /* Green background */ + cursor: pointer; /* Cursor on hover */ +} diff --git a/templates/ng-templates/new_machine_template.html.ep b/templates/ng-templates/new_machine_template.html.ep index 255263326..9b473d219 100644 --- a/templates/ng-templates/new_machine_template.html.ep +++ b/templates/ng-templates/new_machine_template.html.ep @@ -75,11 +75,11 @@
- +
- -
+ +
{{ddsize}} Remove swap -
- +
+
- -
+ +
{{swapsize.value}}
+ +
{{ramsize}} + +
From 85e8b71fbfb9ff18e051a72fcefe34732fbd60cf Mon Sep 17 00:00:00 2001 From: joelalju Date: Wed, 4 Oct 2017 19:19:46 +0200 Subject: [PATCH 005/170] [#274] Erased obsolete code. --- templates/ng-templates/new_machine_template.html.ep | 5 ----- 1 file changed, 5 deletions(-) diff --git a/templates/ng-templates/new_machine_template.html.ep b/templates/ng-templates/new_machine_template.html.ep index 9b473d219..1690a2d20 100644 --- a/templates/ng-templates/new_machine_template.html.ep +++ b/templates/ng-templates/new_machine_template.html.ep @@ -103,11 +103,6 @@
{{ramsize}} - -
From a4b50cc041f7c88fef67865916b8fcac1033ee33 Mon Sep 17 00:00:00 2001 From: joelalju Date: Fri, 6 Oct 2017 16:58:55 +0200 Subject: [PATCH 006/170] [#386] Bug solved --- rvd_front.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rvd_front.pl b/rvd_front.pl index 483bb0d65..7d330b3eb 100644 --- a/rvd_front.pl +++ b/rvd_front.pl @@ -957,8 +957,8 @@ sub req_new_domain { ,id_owner => $USER->id ,swap => $swap ); - $args{memory} = int($c->param('memory')*1024*1024) if $args{memory}; - $args{disk} = int($c->param('disk')*1024*1024*1024) if $args{disk}; + $args{memory} = int($c->param('memory')*1024*1024) if $c->param('memory'); + $args{disk} = int($c->param('disk')*1024*1024*1024) if $c->param('disk'); $args{id_template} = $c->param('id_template') if $vm =~ /^LX/; $args{id_iso} = $c->param('id_iso') if $vm eq 'KVM'; From 9953994709831d32a6bf5607e9b191f59f432b0a Mon Sep 17 00:00:00 2001 From: joelalju Date: Fri, 6 Oct 2017 17:08:15 +0200 Subject: [PATCH 007/170] [#274] Swap value goes to 1 when enabled, and 0 when disabled. --- public/js/admin.js | 3 ++- templates/ng-templates/new_machine_template.html.ep | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/js/admin.js b/public/js/admin.js index 3a0041b2a..0adb9784b 100644 --- a/public/js/admin.js +++ b/public/js/admin.js @@ -74,7 +74,8 @@ ravadaApp.directive("solShowMachine", swMach) $scope.show_swap = function() { $scope.seeswap = !($scope.seeswap); - $scope.swapsize.value=0; + if ($scope.seeswap == 1) $scope.swapsize.value=1; + else $scope.swapsize.value = 0; }; $http.get('/list_machines.json').then(function(response) { diff --git a/templates/ng-templates/new_machine_template.html.ep b/templates/ng-templates/new_machine_template.html.ep index 1690a2d20..1fb5ddad4 100644 --- a/templates/ng-templates/new_machine_template.html.ep +++ b/templates/ng-templates/new_machine_template.html.ep @@ -93,7 +93,7 @@
+ type="range" name="swap" min="1" max="4">
{{swapsize.value}}
From b9605f2bff040c134de4b3dea75e5ff00756953e Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 9 Oct 2017 11:45:45 +0200 Subject: [PATCH 008/170] [#202] Defining an unique uuid --- lib/Ravada/VM/KVM.pm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/Ravada/VM/KVM.pm b/lib/Ravada/VM/KVM.pm index 06996a5bd..a6861f644 100644 --- a/lib/Ravada/VM/KVM.pm +++ b/lib/Ravada/VM/KVM.pm @@ -1254,6 +1254,15 @@ sub _xml_modify_uuid { } } +sub _unique_uuid { + my ($self, $uuid, @uuids) = @_; + my ($first,$last) = $uuid =~ m{(.*)([0-9a-f]{6})}; + + my $new_last = int(rand(0x100000)); + my $new_uuid = sprintf("%s%04d",$first,$new_last); + +} + sub _xml_modify_cdrom { my ($doc, $iso) = @_; From fab5de9067fe654997954c185222d277516fe8b9 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 9 Oct 2017 11:47:27 +0200 Subject: [PATCH 009/170] [#202] check a new random uuid not duplicated --- lib/Ravada/VM/KVM.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/Ravada/VM/KVM.pm b/lib/Ravada/VM/KVM.pm index a6861f644..af9844e02 100644 --- a/lib/Ravada/VM/KVM.pm +++ b/lib/Ravada/VM/KVM.pm @@ -1258,9 +1258,13 @@ sub _unique_uuid { my ($self, $uuid, @uuids) = @_; my ($first,$last) = $uuid =~ m{(.*)([0-9a-f]{6})}; - my $new_last = int(rand(0x100000)); - my $new_uuid = sprintf("%s%04d",$first,$new_last); + for (1..100) { + my $new_last = int(rand(0x100000)); + my $new_uuid = sprintf("%s%06d",$first,$new_last); + return $new_uuid if !grep /^$new_uuid$/,@uuids; + } + confess "I can't find a new unique uuid"; } sub _xml_modify_cdrom { From a5ed09c8054e3e43e48c6e2154266c61162ac17b Mon Sep 17 00:00:00 2001 From: fv3rdugo Date: Wed, 11 Oct 2017 14:35:16 +0200 Subject: [PATCH 010/170] [#390] Fix problems in Debian or Ubuntu 16.04 OS If Ravada server has Debian or Ubuntu Xenial not supported machine type: pc-i440fx-xenial or pc-i440fx-yakkety respectively Fix with pc machine type is Standard PC (i440FX + PIIX, 1996) (alias of pc-i440fx-2.5) supported by both. List machine supported in your server: $qemu-system-x86_64 -machine help --- etc/xml/dsl-i386.xml | 2 +- etc/xml/jessie-amd64.xml | 2 +- etc/xml/jessie-i386.xml | 2 +- etc/xml/trusty-amd64.xml | 2 +- etc/xml/trusty-i386.xml | 2 +- etc/xml/win10.xml | 2 +- etc/xml/win7pro.xml | 2 +- etc/xml/win8.1.xml | 2 +- etc/xml/windows_10.xml | 2 +- etc/xml/windows_12.xml | 2 +- etc/xml/windows_7.xml | 2 +- etc/xml/windows_8.xml | 2 +- etc/xml/windows_xp.xml | 2 +- etc/xml/xenial-i386.xml | 2 +- etc/xml/xenial64-amd64.xml | 2 +- etc/xml/yakkety64-amd64.xml | 2 +- etc/xml/zesty-amd64.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/etc/xml/dsl-i386.xml b/etc/xml/dsl-i386.xml index c57ef09e8..332793ffd 100644 --- a/etc/xml/dsl-i386.xml +++ b/etc/xml/dsl-i386.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/etc/xml/jessie-amd64.xml b/etc/xml/jessie-amd64.xml index 8fb6d90f7..95bd26522 100644 --- a/etc/xml/jessie-amd64.xml +++ b/etc/xml/jessie-amd64.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/etc/xml/jessie-i386.xml b/etc/xml/jessie-i386.xml index 62388faf2..7dc7e278a 100644 --- a/etc/xml/jessie-i386.xml +++ b/etc/xml/jessie-i386.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/etc/xml/trusty-amd64.xml b/etc/xml/trusty-amd64.xml index c633f1f68..7dd58d2d1 100644 --- a/etc/xml/trusty-amd64.xml +++ b/etc/xml/trusty-amd64.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/etc/xml/trusty-i386.xml b/etc/xml/trusty-i386.xml index 247b835f6..221e14e96 100644 --- a/etc/xml/trusty-i386.xml +++ b/etc/xml/trusty-i386.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/etc/xml/win10.xml b/etc/xml/win10.xml index 1e1e0cc78..fcc38f48e 100644 --- a/etc/xml/win10.xml +++ b/etc/xml/win10.xml @@ -5,7 +5,7 @@ 4194304 4 - hvm + hvm diff --git a/etc/xml/win7pro.xml b/etc/xml/win7pro.xml index 89f072c6f..3091d5dbc 100644 --- a/etc/xml/win7pro.xml +++ b/etc/xml/win7pro.xml @@ -12,7 +12,7 @@ or other application using the libvirt API. 4194304 2 - hvm + hvm diff --git a/etc/xml/win8.1.xml b/etc/xml/win8.1.xml index 01c6621d7..39091f85d 100644 --- a/etc/xml/win8.1.xml +++ b/etc/xml/win8.1.xml @@ -12,7 +12,7 @@ or other application using the libvirt API. 4194304 2 - hvm + hvm diff --git a/etc/xml/windows_10.xml b/etc/xml/windows_10.xml index 19d648ffb..4553d0d4d 100644 --- a/etc/xml/windows_10.xml +++ b/etc/xml/windows_10.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/etc/xml/windows_12.xml b/etc/xml/windows_12.xml index 7e0c6e2ea..892e47fa5 100644 --- a/etc/xml/windows_12.xml +++ b/etc/xml/windows_12.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/etc/xml/windows_7.xml b/etc/xml/windows_7.xml index 87976833d..51134d14b 100644 --- a/etc/xml/windows_7.xml +++ b/etc/xml/windows_7.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/etc/xml/windows_8.xml b/etc/xml/windows_8.xml index f31ac6ff5..b3e7ff865 100644 --- a/etc/xml/windows_8.xml +++ b/etc/xml/windows_8.xml @@ -8,7 +8,7 @@ /machine - hvm + hvm diff --git a/etc/xml/windows_xp.xml b/etc/xml/windows_xp.xml index 30e84b1ba..55003ecd3 100644 --- a/etc/xml/windows_xp.xml +++ b/etc/xml/windows_xp.xml @@ -5,7 +5,7 @@ 524288 1 - hvm + hvm diff --git a/etc/xml/xenial-i386.xml b/etc/xml/xenial-i386.xml index 1067e8245..eacc20486 100644 --- a/etc/xml/xenial-i386.xml +++ b/etc/xml/xenial-i386.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/etc/xml/xenial64-amd64.xml b/etc/xml/xenial64-amd64.xml index 0ae7ee439..df94d60f8 100644 --- a/etc/xml/xenial64-amd64.xml +++ b/etc/xml/xenial64-amd64.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/etc/xml/yakkety64-amd64.xml b/etc/xml/yakkety64-amd64.xml index 7236e04cf..1e9128bc6 100644 --- a/etc/xml/yakkety64-amd64.xml +++ b/etc/xml/yakkety64-amd64.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/etc/xml/zesty-amd64.xml b/etc/xml/zesty-amd64.xml index 7236e04cf..1e9128bc6 100644 --- a/etc/xml/zesty-amd64.xml +++ b/etc/xml/zesty-amd64.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm From 5c67de50b8f5756644b6067d98a3819d64f111f9 Mon Sep 17 00:00:00 2001 From: joelalju Date: Wed, 11 Oct 2017 18:57:58 +0200 Subject: [PATCH 011/170] [#395]Bug solved --- templates/bootstrap/user_settings.html.ep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/bootstrap/user_settings.html.ep b/templates/bootstrap/user_settings.html.ep index ae3d9595e..2228c98e1 100644 --- a/templates/bootstrap/user_settings.html.ep +++ b/templates/bootstrap/user_settings.html.ep @@ -7,7 +7,7 @@
-
+
From 232a239f501d875d932ec81735cf38d2ec13a343 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 13 Oct 2017 12:33:32 +0200 Subject: [PATCH 012/170] Refresh the storage pool just in case Sometimes when retrieving a list of files it wouldn't show. --- lib/Ravada/VM/KVM.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Ravada/VM/KVM.pm b/lib/Ravada/VM/KVM.pm index af9844e02..a5fb0cc51 100644 --- a/lib/Ravada/VM/KVM.pm +++ b/lib/Ravada/VM/KVM.pm @@ -869,6 +869,7 @@ sub _iso_name { ); $sth->execute($device,$iso->{id}); } + $self->_refresh_storage_pools(); return $device; } From ec0f82df831a2444ffe61cde7d8a00e119c6acff Mon Sep 17 00:00:00 2001 From: Lucas Melin Date: Fri, 13 Oct 2017 22:15:36 -0400 Subject: [PATCH 013/170] Updated french translation Modified technical terms --- lib/Ravada/I18N/fr.po | 120 +++++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/lib/Ravada/I18N/fr.po b/lib/Ravada/I18N/fr.po index 9a5d606ed..7a8189781 100644 --- a/lib/Ravada/I18N/fr.po +++ b/lib/Ravada/I18N/fr.po @@ -1,5 +1,5 @@ # Translators: -# Kimia mirehbar kimia@etsetb.upc.edu +# Kimia mirehbar kimia@etsetb.upc.edu # french msgid "" msgstr "" @@ -22,7 +22,7 @@ msgid "Restore" msgstr "Restaurer" msgid "Machine Name" -msgstr "Nom de Machine" +msgstr "Nom du Machine" msgid "Tools" msgstr "Outils" @@ -34,13 +34,13 @@ msgid "Users" msgstr "Utilisateurs" msgid "Choose a Machine to Start" -msgstr "Choisir un Machine Pour Commencer" +msgstr "Choisisez une Machine pour Débuter" msgid "Start" msgstr "Début" msgid "Stop" -msgstr "Stop" +msgstr "Arrêt" msgid "View" msgstr "Vue" @@ -52,7 +52,7 @@ msgid "Clone" msgstr "Cloner" msgid "Can't Prepare Base, Remove Base nor Delete. Machine has" -msgstr "Ne Se Peux pas Preparer Base, Retirer ou Effacer la Base" +msgstr "Ne peut pas preparer la base, retirez ou effacez la base" msgid "Clone/s" msgstr "Clones" @@ -67,7 +67,7 @@ msgid "Name" msgstr "Nom" msgid "Log Out" -msgstr "Sortir" +msgstr "Déconnecter" msgid "Available Machines" msgstr "Machines Disponibles" @@ -79,31 +79,31 @@ msgid "Requirements" msgstr "Exigences" msgid "About" -msgstr "Sur" +msgstr "À propos" msgid "Messages" msgstr "Messages" msgid "Mark all as Read" -msgstr "Marquer Tout Comme Lu" +msgstr "Marquer tout comme lus" msgid "Settings" -msgstr "Réglages" +msgstr "Paramètres" msgid "New Machine" -msgstr "Machine Nouveau" +msgstr "Nouvelle Machine" msgid "Paused" msgstr "En Pause" msgid "Prepare base" -msgstr "Preparer Base" +msgstr "Preparez Base" msgid "Machine locked by requested" -msgstr "Machine Férme par demande" +msgstr "Machine verrouillée par demande" msgid "process" -msgstr "Procès" +msgstr "Processus" msgid "Copy" msgstr "Copie" @@ -112,7 +112,7 @@ msgid "Error!" msgstr "Erreur" msgid "Backend no available!" -msgstr "Backend Indisponible" +msgstr "Interne indisponible" msgid "Subject" msgstr "Sujet" @@ -131,13 +131,13 @@ msgstr "" "Actiones" msgid "Mark as Read" -msgstr "Marquer Comme Lu" +msgstr "Marquer comme lu" msgid "Mark as UnRead" -msgstr "Marquer Comme Non Lu" +msgstr "Marquer comme non lu" msgid "No message to show!" -msgstr "Pas de Messages à Lire" +msgstr "Aucune Message à Lire" msgid "Admin" msgstr "Administrateur" @@ -146,13 +146,13 @@ msgid "Show/Hide clones" msgstr "Afficher/Masquer des clones" msgid "I want to change my password" -msgstr "je voudrais changer mon mot de passe" +msgstr "Je veut changer mon mot de passe" msgid "I want to change my language" -msgstr "je voudrais modifier ma langue" +msgstr "Je veut modifier ma langue" msgid "Language:" -msgstr "Langue" +msgstr "Langue:" msgid "English" msgstr "Anglais" @@ -164,34 +164,34 @@ msgid "Catalan" msgstr "Catalan" msgid "New Password:" -msgstr "Mot de passe Nouveau" +msgstr "Nouvelle mot de passe:" msgid "Confirm Password:" -msgstr "confirmer mot de passe" +msgstr "Confirmer mot de passe" msgid "Submit" -msgstr "soumettre" +msgstr "Soumettre" msgid "Your language has been changed successfully" -msgstr "votre langue a été modifiée avec succès" +msgstr "Votre langue a été modifiée avec succès" msgid "Your password has been changed successfully" msgstr "votre mot de passe a été modifiée avec succès" msgid "Password too small" -msgstr "Mot de Passe petite" +msgstr "Votre mot de passe est trop court" msgid "Password fields aren't equal" -msgstr "les espaces du mot de passe n'est pas egaleés" +msgstr "Les mots de passe ne sont pas égales" msgid "Some of the password's fields are empty" -msgstr "quelques espaces du mot de passe sont vides" +msgstr "Quelques mots de passe sont vides" msgid "Public" msgstr "Public" msgid "Status" -msgstr "Statut" +msgstr "État" msgid "Machines" msgstr "Machines" @@ -200,13 +200,13 @@ msgid "Down" msgstr "Arrêté" msgid "Running" -msgstr "fonctionne" +msgstr "Fonctionne" msgid "ShutDown" msgstr "Fermer" msgid "Screenshot" -msgstr "capture d'écran" +msgstr "Capture d'écran" msgid "Machine locked by" msgstr "Machine verrouillée par" @@ -245,7 +245,7 @@ msgid "will remove all the contents of the machine" msgstr "supprimer tout les contenus de machine" msgid "Are you sure?" -msgstr "vous etes certain?" +msgstr "Vous êtes certain?" msgid "Yes" msgstr "Oui" @@ -260,7 +260,7 @@ msgid "Machine settings" msgstr "Réglage de machine" msgid "Cannot remove base, machine has clones" -msgstr "clones Ne peut pas enlever la base, la machine a un clone" +msgstr "Ne peut pas enlever la base, la machine a un clone" msgid "For spice redirection you'll need to install" msgstr "Pour Spice redirection vous necessitez installer" @@ -272,7 +272,7 @@ msgid "Search in your distro, e.g. in Debian/Ubuntu with" msgstr "Cherchez dans votre distro, par example dans Debian/Ubuntu avec" msgid "You'll need to install" -msgstr "vous necessitez installer " +msgstr "vous necessitez installer" msgid "e.g. VirtViewer v5.0-256 in your computer." msgstr "par example VirtViewer v5.0-256 dans votre ordinateur. " @@ -281,8 +281,8 @@ msgid "" "Be aware that in Windows, spice redirection is not automatically. It's " "necessary associate protocol with the app." msgstr "" -"Faites attention quoi dans Windows, Spice redirection no est pas automatiquement." -" il est necessaire associer le protocole avec l'app." +"Faites attention quoi dans Windows, Spice redirection n'est pas automatiquement activée." +"Il est necessaire d'associer le protocole avec l'application." msgid "To make this possible, download" msgstr "pour rendre cela possible, téléchargez" @@ -291,18 +291,18 @@ msgid "" "or copy the following lines in an ASCII file and save with extension .reg, " "then execute the file." msgstr "" -"ou copiez les lingnes suivants dans un fichier et Enregistrez avec extension .reg" +"ou copiez les lingnes suivantes dans un fichier et enregistrez avec extension .reg" "ensuit exécutez le fichier" msgid "Login" -msgstr "S'identifier" +msgstr "Connexion" msgid "Welcome" msgstr "Bienvenue" msgid "It is required a viewer to run the virtual machines." -msgstr "C'est necessaire un logiciel de Viewer pour fonctionner les machines virtuelles." +msgstr "Il necessite un logiciel visionneuse pour demarrer les machines virtuelles." msgid "Virtual Machines" msgstr "Machine Virtuelle" @@ -317,71 +317,71 @@ msgid "Start session" msgstr "Commencer session" msgid "Login with Intranet UPC's username." -msgstr "s'identifier avec Nom d'utilisateur de la UPC" +msgstr "Connectez avec le Nom d'utilisateur de la UPC" msgid "Permissions" msgstr "Permissions" msgid "can change the settings of owned virtual machines." -msgstr "On peut échanger les reglages des machines virtuelle Sur leur possession" +msgstr "Peut changer les reglages des machines virtuelles possédees" msgid "can change the settings of any virtual machines." -msgstr "On peut échanger les reglages des quelques machines virtuelles" +msgstr "Peut changer les reglages de n'importe quelle machine virtuelle" msgid "" "can change the settings of any virtual machines " "cloned from one base owned by the user." msgstr "" -"On peut échanger les reglages des quelques machines virtuelle" -"clonées d'une base sur la posession d'utilisateur" +"Peut changer les reglages des n'importe quelle machine virtuelle" +"clonées d'une base sous posession de l'utilisateur" msgid "can clone public virtual machines." -msgstr "On peut cloner machines virtuelles publiques" +msgstr "Peut cloner les machines virtuelles publiques" msgid "can clone any virtual machine." -msgstr "On peut cloner quelques machines virtuelles" +msgstr "Ppeut cloner n'importe quelle machine virtuelle" msgid "can create bases." -msgstr "On Peut créer bases" +msgstr "Peut créer des bases" msgid "can create virtual machines." -msgstr "On peut créer machines virtuelles" +msgstr "Peut créer des machines virtuelles" msgid "can grant permissions to other users" -msgstr "On peut donner la permission á autres utilisateurs" +msgstr "Peut donner des permissions á autres utilisateurs" msgid "can hibernate any virtual machine." -msgstr "On peut hiberner quelques machines virtuelles" +msgstr "Peut hiberner n'importe quelle machine virtuelle" msgid "can hibernate clones from virtual machines owned by the user." -msgstr "On peut hiberner clones des machines virtuelle Sur leur possession" +msgstr "Peut hiberner des clones des machines virtuelles possédees" msgid "can hibernate any clone." -msgstr "On peut hiberner quelques clones" +msgstr "Peut hiberner n'importe quelle clones" msgid "can remove any virtual machines owned by the user." -msgstr "On peut supprimer quelques machines virtuelles machines virtuelle Sur leur possession" +msgstr "Peut supprimer n'importe quelle machine virtuelle possédée par l'utilizateur" msgid "can remove any virtual machine." -msgstr "On peut supprimer quelques machine virtuelles" +msgstr "Peut supprimer n'importe quelle machine virtuelle" msgid "can remove clones from virtual machines owned by the user." -msgstr "On peut supprimer clones de machines virtuelle Sur leur possession" +msgstr "Peut supprimer des clones des machines virtuelles possédées par l'utilizateur" msgid "can remove any clone." -msgstr "On peut supprimer quelques clones" +msgstr "Peut supprimer n'importe quelle clones" msgid "can take a screenshot of any virtual machine owned by the user." -msgstr "On peut Prendre une capture d'écran de quelques machines virtuelle Sur leur possession" +msgstr "Peut prendre une capture d'écran de n'importe quelle machine virtuelle possédée par l'utilizateur" msgid "can take a screenshot of any virtual machine." -msgstr "On peut Prendre une capture d'écran de quelques machines virtuelles" +msgstr "Peut prendre une capture d'écran de n'importe quelle machine virtuelle possédée" msgid "can shutdown any virtual machine." -msgstr "On peut fermer quelques machines virtuelles" +msgstr "Peut fermer n'importe quelle machine virtuelle" msgid "can shutdown clones from virtual machines owned by the user." -msgstr "On peut fermer les clone des machines virtuelle Sur leur possession" +msgstr "Peut fermer les clones des machines virtuelles possédées par l'utilizateur" msgid "Submit Query" -msgstr "Soumettre Question" +msgstr "Soumettre Requête" From 5d7bcd54faef0e71a962c7644e3fdaca9a5753d9 Mon Sep 17 00:00:00 2001 From: joelalju Date: Mon, 16 Oct 2017 17:09:21 +0200 Subject: [PATCH 014/170] [#398] Spanish updated. --- lib/Ravada/I18N/es.po | 236 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 232 insertions(+), 4 deletions(-) diff --git a/lib/Ravada/I18N/es.po b/lib/Ravada/I18N/es.po index 61b3485de..012737e7a 100644 --- a/lib/Ravada/I18N/es.po +++ b/lib/Ravada/I18N/es.po @@ -154,12 +154,12 @@ msgid "ShutDown" msgstr "Apagar" msgid "Screenshot" -msgstr "" +msgstr "Captura de pantalla" msgid "Paused" msgstr "Pausado" -msgid "Machine locked by requested" +msgid "Machine locked by" msgstr "Máquina bloqueada por" msgid "process" @@ -168,8 +168,44 @@ msgstr "proceso" msgid "Copy" msgstr "Copia" +msgid "Error!" +msgstr "¡Error!" + +msgid "Error" +msgstr "Error" + +msgid "Backend no available!" +msgstr "¡Backend no disponible!" + +msgid "Subject" +msgstr "Asunto" + +msgid "Date" +msgstr "Fecha" + +msgid "Mark as Read" +msgstr "Marcar como leído" + +msgid "Mark as UnRead" +msgstr "Marcar como no leído" + +msgid "No message to show!" +msgstr "¡No hay mensaje por mostrar!" + +msgid "Admin" +msgstr "Admin" + +msgid "machines" +msgstr "máquinas" + +msgid "users" +msgstr "usuarios" + +msgid "messages" +msgstr "mensajes" + msgid "Admin tools" -msgstr "" +msgstr "Herramientas de admin" msgid "Remove base" msgstr "Elimina base" @@ -189,6 +225,9 @@ msgstr "Apagar" msgid "action" msgstr "acción" +msgid "New Base" +msgstr "Nueva Base" + msgid "will remove all the contents of the machine" msgstr "borrará todo el contenido de la máquina" @@ -199,7 +238,7 @@ msgid "Yes" msgstr "Si" msgid "No" -msgstr "" +msgstr "No" msgid "Make public" msgstr "Haz público" @@ -212,3 +251,192 @@ msgstr "No se puede borrar la base, la máquina tiene clones" msgid "Show/Hide clones" msgstr "Ver/Esconde clones" + +msgid "For spice redirection you'll need to install" +msgstr "Para la redirección de spice, necesitarás instalar" + +msgid "in your computer." +msgstr "en tu computadora." + +msgid "Search in your distro, e.g. in Debian/Ubuntu with" +msgstr "Busca en tu distro, p.e. en Debian/Ubuntu con" + +msgid "You'll need to install" +msgstr "Necesitarás instalar" + +msgid "e.g. VirtViewer v5.0-256, and USB drivers (" +msgstr "p.e. VirtViewer v5.0-256, y los drivers de USB (" + +msgid "" +"Be aware that in Windows, spice redirection is not automatically. It's " +"necessary associate protocol with the app." +msgstr "" +"Se consciente que en Windows, redirección con spice no es automático. Es " +"necesario asociar el protocolo con la app" + +msgid "To make this possible, download" +msgstr "Para hacer esto posible, descarga" + +msgid "" +"or copy the following lines in an ASCII file and save with extension .reg, " +"then execute the file." +msgstr "" +"o copia las siguientes líneas en un archivo ASCII y guarda con la extensión .reg, " +"luego ejecuta el archivo." + +msgid "Login" +msgstr "Conéctate" + +msgid "Welcome" +msgstr "Bienvenido" + +msgid "It is required a viewer to run the virtual machines." +msgstr "Se requiere de un visor para arrancar la máquina virtual." + +msgid "Virtual Machines" +msgstr "Máquinas Virtuales" + +msgid "user" +msgstr "usuario" + +msgid "password" +msgstr "contraseña" + +msgid "Start session" +msgstr "Iniciar sesión" + +msgid "Login with Intranet UPC's username." +msgstr "Conectarse con el usuario de la Intranet de la UPC" + +msgid "bits) in your computer." +msgstr "bits) en tu computadora." + +msgid "Permissions" +msgstr "Permisos" + +msgid "can change the settings of owned virtual machines." +msgstr "puede cambiar los ajustes de las máquinas virtuales en posesión." + +msgid "can change the settings of any virtual machines." +msgstr "puede cambiar los ajustes de cualquier máquina virtual." + +msgid "can change the settings of any virtual machines " +msgstr "puede cambiar los ajustes de cualquier máquina virtual " + +msgid "cloned from one base owned by the user." +msgstr "clonado desde una base en posesión del usuario." + +msgid "can clone public virtual machines." +msgstr "puede clonar máquinas virtuales públicas." + +msgid "can clone any virtual machine." +msgstr "puede clonar cualquier máquina virtual." + +msgid "can create bases." +msgstr "puede crear bases." + +msgid "can create virtual machines." +msgstr "puede crear máquinas virtuales." + +msgid "can grant permissions to other users" +msgstr "puede otorgar permisos a otros usuarios" + +msgid "can hibernate any virtual machine." +msgstr "puede hibernar cualquier máquina virtual." + +msgid "can hibernate clones from virtual machines owned by the user." +msgstr "puede hibernar clones de máquinas virtuales en posesión del usuario." + +msgid "can hibernate any clone." +msgstr "puede hibernar cualquier clon." + +msgid "can remove any virtual machines owned by the user." +msgstr "puede quitar cualquier máquina virtual en posesión del usuario." + +msgid "can remove any virtual machine." +msgstr "puede quitar cualquier máquina virtual." + +msgid "can remove clones from virtual machines owned by the user." +msgstr "puede quitar clones de máquinas virtuales en posesión del usuario." + +msgid "can remove any clone." +msgstr "puede quitar cualquier clon." + +msgid "can take a screenshot of any virtual machine owned by the user." +msgstr "puede tomar una captura de pantalla de cualquier máquina virtual en posesión del usuario" + +msgid "can take a screenshot of any virtual machine." +msgstr "puede tomar una captura de pantalla de cualquier máquina virtual." + +msgid "can shutdown any virtual machine." +msgstr "puede apagar cualquier máquina virtual." + +msgid "can shutdown clones from virtual machines owned by the user." +msgstr "puede apagar clones de máquinas virtuales en posesión del usuario." + +msgid "Submit Query" +msgstr "Enviar Consulta" + +msgid "From Template" +msgstr "Desde Plantilla" + +msgid "From Machine" +msgstr "Desde Máquina" + +msgid "Backend" +msgstr "Backend" + +msgid "Select Template" +msgstr "Selecciona Plantilla" + +msgid "This ISO image has not been already downloaded. This may take many minutes, even hours until the file is fetched from Internet." +msgstr "Esta imagen ISO no está ya descargada. Puede tardar bastantes minutos, incluso horas hasta que el archivo sea recuperado de Internet." + +msgid "Download now" +msgstr "Descargar ahora" + +msgid "Select ISO" +msgstr "Seleccionar ISO" + +msgid "Template" +msgstr "Plantilla" + +msgid "Disk Size: (GB)" +msgstr "Tamaño del Disco: (GB)" + +msgid "Swap Size: (GB)" +msgstr "Tamaño de Swap: (GB)" + +msgid "Ram: (GB)" +msgstr "Ram: (GB)" + +msgid "Machine name is required." +msgstr "El nombre de la máquina es necesario." + +msgid "Machine name can't exceed 20 characters." +msgstr "El nombre de la máquina no puede superar los 20 carácteres." + +msgid "Backend selection is required." +msgstr "Hace falta seleccionar un backend." + +msgid "ISO image selection is required." +msgstr "Hace falta seleccionar una imagen de ISO." + +msgid "Template selection is required." +msgstr "Hace falta seleccionar una plantilla." + +msgid "A machine with that name already exists." +msgstr "Una máquina con ese nombre ya existe." + +msgid "The machine name must contain only alphabetic, numbers, dashes and points." +msgstr "El nombre de la máquina debe contener solo carácteres alfanuméricos, líneas y puntos." + +msgid "Create" +msgstr "Crear" + +msgid "" +"can change the settings of any virtual machines " +"cloned from one base owned by the user." +msgstr "" +"puede cambiar los ajustes de cualquier máquina virtual clonada de una base " +"propiedad del usuario." From 1f657ca4ff0a9651f02cf0451244f6e676bb8588 Mon Sep 17 00:00:00 2001 From: joelalju Date: Mon, 16 Oct 2017 18:13:20 +0200 Subject: [PATCH 015/170] [#398]Catalan updated. --- lib/Ravada/I18N/ca.po | 145 +++++++++++++++++++++++++++++++++++++++++- lib/Ravada/I18N/en.po | 8 +-- lib/Ravada/I18N/es.po | 2 +- 3 files changed, 147 insertions(+), 8 deletions(-) diff --git a/lib/Ravada/I18N/ca.po b/lib/Ravada/I18N/ca.po index 170aeeb8d..98c0c2a16 100644 --- a/lib/Ravada/I18N/ca.po +++ b/lib/Ravada/I18N/ca.po @@ -155,7 +155,7 @@ msgid "ShutDown" msgstr "Atura" msgid "Screenshot" -msgstr "" +msgstr "Captura de pantalla" msgid "Paused" msgstr "Pausat" @@ -172,6 +172,9 @@ msgstr "Còpia" msgid "Error!" msgstr "Error!" +msgid "Error" +msgstr "Error" + msgid "Backend no available!" msgstr "Backend no disponible!" @@ -203,7 +206,7 @@ msgid "messages" msgstr "missatges" msgid "Admin tools" -msgstr "" +msgstr "Eines d'administrador" msgid "Remove base" msgstr "Esborra base" @@ -236,7 +239,7 @@ msgid "Yes" msgstr "Si" msgid "No" -msgstr "" +msgstr "No" msgid "Make public" msgstr "Fes públic" @@ -297,6 +300,15 @@ msgstr "pot crear bases." msgid "Virtual Machines" msgstr "Màquines Virtuals" +msgid "user" +msgstr "usuari" + +msgid "password" +msgstr "contrasenya" + +msgid "Permissions" +msgstr "Permissos" + msgid "User" msgstr "Usuari" @@ -311,3 +323,130 @@ msgstr "Identifiqueu-vos amb el nom d'usuari de la Intranet UPC." msgid "bits) in your computer." msgstr "bits) al teu ordinador." + +msgid "can change the settings of owned virtual machines." +msgstr "pot canviar les preferències de les seves màquines virtuals" + +msgid "can change the settings of any virtual machines." +msgstr "pot canviar les preferències de qualsevol màquina virtual." + +msgid "can change the settings of any virtual machines " +msgstr "pot canviar les preferències de qualsevol màquina virtual " + +msgid "cloned from one base owned by the user." +msgstr "clonat des d'una base de l'usuari." + +msgid "can clone public virtual machines." +msgstr "pot clonar màquines virtuals públiques." + +msgid "can clone any virtual machine." +msgstr "pot clonar qualsevol màquina virtual." + +msgid "can create bases." +msgstr "pot crear bases." + +msgid "can create virtual machines." +msgstr "pot crear màquines virtuals." + +msgid "can grant permissions to other users" +msgstr "pot donar permissos a altres usuaris" + +msgid "can hibernate any virtual machine." +msgstr "pot hibernar qualsevol màquina virtual." + +msgid "can hibernate clones from virtual machines owned by the user." +msgstr "pot hibernar clons des de qualsevol màquina virtual propietat de l'usuari." + +msgid "can hibernate any clone." +msgstr "pot hibernar qualsevol clon." + +msgid "can remove any virtual machines owned by the user." +msgstr "pot borrar qualsevol màquina virtual propietat de l'usuari." + +msgid "can remove any virtual machine." +msgstr "pot borrar qualsevol màquina virtual." + +msgid "can remove clones from virtual machines owned by the user." +msgstr "pot borrar clons de màquines virtuals propietat de l'usuari." + +msgid "can remove any clone." +msgstr "pot borrar qualsevol clon." + +msgid "can take a screenshot of any virtual machine owned by the user." +msgstr "pot realitzar una captura de pantalla de qualsevol màquina virtual propietat de l'usuari." + +msgid "can take a screenshot of any virtual machine." +msgstr "pot realitzar una captura de pantalla de qualsevol màquina virtual." + +msgid "can shutdown any virtual machine." +msgstr "pot apagar qualsevol màquina virtual." + +msgid "can shutdown clones from virtual machines owned by the user." +msgstr "pot apagar clons de màquines virtuals propietat de l'usuari." + +msgid "Submit Query" +msgstr "Enviar Pregunta" + +msgid "From Template" +msgstr "Des d'una plantilla" + +msgid "From Machine" +msgstr "Des d'una màquina" + +msgid "Backend" +msgstr "Backend" + +msgid "Select Template" +msgstr "Escull una plantilla" + +msgid "This ISO image has not been already downloaded. This may take many minutes, even hours until the file is fetched from Internet." +msgstr "Aquesta imatge ISO encara no ha estat descarregada. Pot trigar molts minuts, fins i tot hores, fins que l'arxiu hagi sigut extret de l'Internet." + +msgid "Download now" +msgstr "Descarrega ara" + +msgid "Select ISO" +msgstr "Escull ISO" + +msgid "Template" +msgstr "Plantilla" + +msgid "Disk Size: (GB)" +msgstr "Espai de disk: (GB)" + +msgid "Swap Size: (GB)" +msgstr "Espai d'swap: (GB)" + +msgid "Ram: (GB)" +msgstr "Ram: (GB)" + +msgid "Machine name is required." +msgstr "Fa falta el nom de la màquina." + +msgid "Machine name can't exceed 20 characters." +msgstr "El nom de la màquina no pot superar 20 caràcters." + +msgid "Backend selection is required." +msgstr "Fa falta seleccionar el backend." + +msgid "ISO image selection is required." +msgstr "Fa falta seleccionar una imatge ISO." + +msgid "Template selection is required." +msgstr "Fa falta seleccionar una plantilla." + +msgid "A machine with that name already exists." +msgstr "Una màquina amb aquest nom ja existeix." + +msgid "The machine name must contain only alphabetic, numbers, dashes and points." +msgstr "El nom de la màquina ha de tindre nomès caràcters alfanumèrics, línies i punts." + +msgid "Create" +msgstr "Crear" + +msgid "" +"can change the settings of any virtual machines " +"cloned from one base owned by the user." +msgstr "" +"pot canviar les preferències de qualsevol màquina virtual " +"clonat d'una base propietat de l'usuari." diff --git a/lib/Ravada/I18N/en.po b/lib/Ravada/I18N/en.po index cfe3ba57f..24188b6e9 100644 --- a/lib/Ravada/I18N/en.po +++ b/lib/Ravada/I18N/en.po @@ -159,7 +159,7 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Machine locked by" +msgid "Machine locked by requested" msgstr "" msgid "process" @@ -213,6 +213,9 @@ msgstr "" msgid "public" msgstr "" +msgid "New Base" +msgstr "" + msgid "Restore" msgstr "" @@ -225,9 +228,6 @@ msgstr "" msgid "action" msgstr "" -msgid "New Base" -msgstr "" - msgid "will remove all the contents of the machine" msgstr "" diff --git a/lib/Ravada/I18N/es.po b/lib/Ravada/I18N/es.po index 012737e7a..137886015 100644 --- a/lib/Ravada/I18N/es.po +++ b/lib/Ravada/I18N/es.po @@ -159,7 +159,7 @@ msgstr "Captura de pantalla" msgid "Paused" msgstr "Pausado" -msgid "Machine locked by" +msgid "Machine locked by requested" msgstr "Máquina bloqueada por" msgid "process" From 9fc90d8b4ddf0e8dad878cd0325c0ed4e0cbd77f Mon Sep 17 00:00:00 2001 From: joelalju Date: Tue, 17 Oct 2017 17:50:27 +0200 Subject: [PATCH 016/170] [#400] user_settings asks for user's current password when changing it. --- lib/Ravada/Auth/SQL.pm | 27 ++++++++++++++++++ rvd_front.pl | 34 +++++++++++++---------- templates/bootstrap/user_settings.html.ep | 1 + 3 files changed, 48 insertions(+), 14 deletions(-) diff --git a/lib/Ravada/Auth/SQL.pm b/lib/Ravada/Auth/SQL.pm index 5f9772df3..6f6613b60 100644 --- a/lib/Ravada/Auth/SQL.pm +++ b/lib/Ravada/Auth/SQL.pm @@ -420,6 +420,33 @@ sub change_password { $sth->execute(sha1_hex($password), $self->name); } +=head2 compare_password + +Changes the input with the password of an User + + $user->compare_password(); + +Arguments: password + +=cut + +sub compare_password { + my $self = shift; + my $password = shift or die "ERROR: password required\n"; + + _init_connector(); + + my $sth= $$CON->dbh->prepare("SELECT password FROM users WHERE name=?"); + $sth->execute($self->name); + my $hex_pass = $sth->fetchrow(); + if ($hex_pass eq sha1_hex($password)) { + return 1; + } + else { + return 0; + } +} + =head2 language Updates or selects the language selected for an User diff --git a/rvd_front.pl b/rvd_front.pl index 7d330b3eb..96aedcace 100644 --- a/rvd_front.pl +++ b/rvd_front.pl @@ -628,25 +628,31 @@ sub user_settings { $c->param('tongue' => $USER->language); my @errors; if ($c->param('button_click')) { - if (($c->param('password') eq "") || ($c->param('conf_password') eq "")) { + if (($c->param('password') eq "") || ($c->param('conf_password') eq "") || ($c->param('current_password') eq "")) { push @errors,("Some of the password's fields are empty"); } else { - if ($c->param('password') eq $c->param('conf_password')) { - eval { - $USER->change_password($c->param('password')); - _logged_in($c); - }; - if ($@ =~ /Password too small/) { - push @errors,("Password too small") + my $comp_password = $USER->compare_password($c->param('current_password')); + if ($comp_password) { + if ($c->param('password') eq $c->param('conf_password')) { + eval { + $USER->change_password($c->param('password')); + _logged_in($c); + }; + if ($@ =~ /Password too small/) { + push @errors,("Password too small"); + } + else { + $changed_pass = 1; + }; } else { - $changed_pass = 1; - }; - } - else { - push @errors,("Password fields aren't equal") - } + push @errors,("Password fields aren't equal"); + } + } + else { + push @errors, ("Input the current password properly"); + } } } $c->render(template => 'bootstrap/user_settings', changed_lang=> $changed_lang, changed_pass => $changed_pass diff --git a/templates/bootstrap/user_settings.html.ep b/templates/bootstrap/user_settings.html.ep index 2228c98e1..e66c94931 100644 --- a/templates/bootstrap/user_settings.html.ep +++ b/templates/bootstrap/user_settings.html.ep @@ -44,6 +44,7 @@

<%=l 'New Password:' %>

<%=l 'Confirm Password:' %>

+

<%=l 'Current Password:' %>

'> % if ($changed_pass) { <%=l 'Your password has been changed successfully' %> From 89d3e1e45d4546795da27a7527934b1b49da3042 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Wed, 18 Oct 2017 15:39:57 +0200 Subject: [PATCH 017/170] [#405] removed user data before rendering --- lib/Ravada/Front.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index cc6f5cdaf..6be30a05e 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -377,6 +377,7 @@ sub list_users($self,$name=undef) { my @users = (); while ( my $row = $sth->fetchrow_hashref) { next if defined $name && $row->{name} !~ /$name/; + delete $row->{password}; push @users, ($row); } $sth->finish; From 9935730fb6244a43860d91986112190dd30c9813 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Wed, 18 Oct 2017 15:40:27 +0200 Subject: [PATCH 018/170] [#405] deny access to non admins --- rvd_front.pl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rvd_front.pl b/rvd_front.pl index 7d330b3eb..e2fb1e40d 100644 --- a/rvd_front.pl +++ b/rvd_front.pl @@ -272,6 +272,7 @@ get '/list_machines.json' => sub { my $c = shift; + return access_denied($c) if !_logged_in($c) || !$USER->is_admin(); $c->render(json => $RAVADA->list_domains); }; @@ -284,6 +285,8 @@ get '/list_users.json' => sub { my $c = shift; + + return access_denied($c) if !_logged_in($c) || !$USER->is_admin(); $c->render(json => $RAVADA->list_users); }; @@ -304,6 +307,8 @@ my $c = shift; my $id = $c->stash('id'); die "No id " if !$id; + + #TODO check ownership $c->render(json => $RAVADA->domain_info(id => $id)); }; @@ -315,6 +320,7 @@ any '/machine/manage/(:id).(:type)' => sub { my $c = shift; + #TODO check ownership return manage_machine($c); }; @@ -323,6 +329,7 @@ my $id = $c->stash('id'); my $type = $c->stash('type'); + #TODO check ownership return view_machine($c); }; From 4d6473b743386d00943cff755da2d5f186c44424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joel=20Alarc=C3=B3n?= Date: Wed, 18 Oct 2017 16:12:31 +0200 Subject: [PATCH 019/170] Update rvd_front.pl --- rvd_front.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rvd_front.pl b/rvd_front.pl index 96aedcace..1398062c2 100644 --- a/rvd_front.pl +++ b/rvd_front.pl @@ -640,7 +640,7 @@ sub user_settings { _logged_in($c); }; if ($@ =~ /Password too small/) { - push @errors,("Password too small"); + push @errors,("New Password is too small"); } else { $changed_pass = 1; @@ -651,7 +651,7 @@ sub user_settings { } } else { - push @errors, ("Input the current password properly"); + push @errors, ("Invalid Current Password"); } } } From bc5c37dc1b16597a81577c8fbfeeeac623788ce1 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Wed, 18 Oct 2017 16:49:56 +0200 Subject: [PATCH 020/170] [#405] removed spice data from domains list --- lib/Ravada/Front.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index 6be30a05e..375b0a78f 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -84,6 +84,7 @@ sub list_bases { eval { $domain = $self->search_domain($row->{name}) }; next if !$domain; $row->{has_clones} = $domain->has_clones; + delete $row->{spice_password}; push @bases, ($row); } $sth->finish; From 09ee2c1926aebbdc765bb5a604158e22cf8337ea Mon Sep 17 00:00:00 2001 From: joelalju Date: Wed, 18 Oct 2017 17:01:10 +0200 Subject: [PATCH 021/170] [#398] Erased duplicated fields in ca.po --- lib/Ravada/I18N/ca.po | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/Ravada/I18N/ca.po b/lib/Ravada/I18N/ca.po index 98c0c2a16..5a8851299 100644 --- a/lib/Ravada/I18N/ca.po +++ b/lib/Ravada/I18N/ca.po @@ -294,9 +294,6 @@ msgstr "Benvingut" msgid "It is required a viewer to run the virtual machines." msgstr "Es necessita un visor per executar les màquines virtuals." -msgid "can create bases." -msgstr "pot crear bases." - msgid "Virtual Machines" msgstr "Màquines Virtuals" From 463fdaa50b77f40dbedb78e1630f6db7822aa669 Mon Sep 17 00:00:00 2001 From: joelalju Date: Wed, 18 Oct 2017 17:51:01 +0200 Subject: [PATCH 022/170] [#405]list_users.json erased. --- public/js/admin.js | 7 ------- public/js/ravada.js | 13 ------------- rvd_front.pl | 7 ------- 3 files changed, 27 deletions(-) diff --git a/public/js/admin.js b/public/js/admin.js index 0adb9784b..467a6ed4f 100644 --- a/public/js/admin.js +++ b/public/js/admin.js @@ -173,17 +173,10 @@ ravadaApp.directive("solShowMachine", swMach) $http.get('/pingbackend.json').then(function(response) { $scope.pingbe_fail = !response.data; }); - $scope.getUsers = function() { - $http.get('/list_users.json').then(function(response) { - $scope.list_users= response.data; - }); - } $scope.action = function(target,action,machineId){ $http.get('/'+target+'/'+action+'/'+machineId+'.json'); }; //On load code - $scope.getUsers(); - $scope.updatePromise = $interval($scope.getUsers,3000); }; function messagesPageC($scope, $http, $interval, request) { diff --git a/public/js/ravada.js b/public/js/ravada.js index 663fe3588..8192ac659 100644 --- a/public/js/ravada.js +++ b/public/js/ravada.js @@ -12,7 +12,6 @@ .service("request", gtRequest) .service("listMach", gtListMach) .service("listMess", gtListMess) - .service("listUsers", gtListUsers) .controller("SupportForm", suppFormCtrl) .controller("AddUserForm",addUserFormCrtl) // .controller("machines", machinesCrtl) @@ -270,10 +269,6 @@ // list users function usersCrtl($scope, $http, request, listUsers) { - $http.get('/list_users.json').then(function(response) { - $scope.list_users= response.data; - }); - $scope.make_admin = function(id) { $http.get('/users/make_admin/' + id + '.json') location.reload(); @@ -312,14 +307,6 @@ templateUrl: '/ng-templates/list_users.html', }; - }; - - function gtListUsers($resource){ - - return $resource('/list_users.json',{},{ - get:{isArray:true} - }); - }; function gtListMess($resource){ diff --git a/rvd_front.pl b/rvd_front.pl index e2fb1e40d..5175341a0 100644 --- a/rvd_front.pl +++ b/rvd_front.pl @@ -283,13 +283,6 @@ $c->render(json => $RAVADA->list_bases_anonymous(_remote_ip($c))); }; -get '/list_users.json' => sub { - my $c = shift; - - return access_denied($c) if !_logged_in($c) || !$USER->is_admin(); - $c->render(json => $RAVADA->list_users); -}; - get '/list_lxc_templates.json' => sub { my $c = shift; $c->render(json => $RAVADA->list_lxc_templates); From ae1ebcec1d745347b7dcf5c6fc89f3f132957127 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 19 Oct 2017 10:36:59 +0200 Subject: [PATCH 023/170] Fixed warning with public bases --- templates/main/list_bases2.html.ep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/main/list_bases2.html.ep b/templates/main/list_bases2.html.ep index 4e60b920f..22caa2b79 100644 --- a/templates/main/list_bases2.html.ep +++ b/templates/main/list_bases2.html.ep @@ -53,7 +53,7 @@ % for my $machine (@$machines) { % next if !$machine->{is_public} && !$user->is_admin;

+ ng-hide="!<%= $machine->{is_public} %> && only_public">

Date: Thu, 19 Oct 2017 10:47:23 +0200 Subject: [PATCH 024/170] [#405] removed spice data from base and machine --- lib/Ravada/Front.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index 375b0a78f..69e1589fe 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -127,7 +127,7 @@ sub list_machines_user { ,id_base => $id ); my %base = ( id => $id, name => $name - , is_public => $is_public + , is_public => ($is_public or 0) , screenshot => ($screenshot or '') , is_active => 0 , id_clone => undef @@ -213,6 +213,7 @@ sub list_domains { # $row->{disk_size} = 1 if $row->{disk_size} < 1; $row->{remote_ip} = $domain->remote_ip if $domain->is_active(); } + delete $row->{spice_password}; push @domains, ($row); } $sth->finish; @@ -745,6 +746,7 @@ sub list_bases_anonymous { my @bases = (); while ( my $row = $sth->fetchrow_hashref) { next if !$net->allowed_anonymous($row->{id}); + delete $row->{spice_password}; push @bases, ($row); } $sth->finish; From f6c5ad0e59941d34b0cae943223240fe66b639b1 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 19 Oct 2017 10:58:37 +0200 Subject: [PATCH 025/170] Fixed undefined warnings --- templates/main/vm_drivers.html.ep | 2 +- templates/main/vm_graphics.html.ep | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/main/vm_drivers.html.ep b/templates/main/vm_drivers.html.ep index a9f10e6e1..8ca8355f7 100644 --- a/templates/main/vm_drivers.html.ep +++ b/templates/main/vm_drivers.html.ep @@ -44,7 +44,7 @@
% if ($recommend{$driver_name}) { - <%= $recommend{$driver_name} or '' %> + <%= ($recommend{$driver_name} or '') %> % }
diff --git a/templates/main/vm_graphics.html.ep b/templates/main/vm_graphics.html.ep index 50e0930fa..0b720f80d 100644 --- a/templates/main/vm_graphics.html.ep +++ b/templates/main/vm_graphics.html.ep @@ -35,7 +35,8 @@ % for my $option( $driver->get_options ) { % my $selected =''; % $selected = 'selected' -% if $domain->get_driver($driver_name) eq $option->{value}; +% if $domain->get_driver($driver_name) +% && $domain->get_driver($driver_name) eq $option->{value}; @@ -45,7 +46,7 @@
% if ($recomend{$driver_name}) { - <%= $recomend{$driver_name} or '' %> + <%= ($recomend{$driver_name} or '') %> % }
From 237f9de7eec8317815dcab07e57a819732231d3a Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 19 Oct 2017 11:28:43 +0200 Subject: [PATCH 026/170] Allow - and _ in new domain name --- public/js/ravada.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/ravada.js b/public/js/ravada.js index 8192ac659..28bd26df9 100644 --- a/public/js/ravada.js +++ b/public/js/ravada.js @@ -172,7 +172,7 @@ $scope.new_name_invalid=true; return; } - var valid_domain_name = /^[a-zA-Z]\w+$/; + var valid_domain_name = /^[a-zA-Z][\w_-]+$/; if ( !valid_domain_name.test($scope.new_name)) { $scope.new_name_invalid = true; return; From 575ed4622d8bd0f84dfbaae29765b0f4466a0169 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 19 Oct 2017 11:37:21 +0200 Subject: [PATCH 027/170] [#405] Check access to settings --- rvd_front.pl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rvd_front.pl b/rvd_front.pl index 5175341a0..98571d6e7 100644 --- a/rvd_front.pl +++ b/rvd_front.pl @@ -1332,6 +1332,13 @@ sub manage_machine { sub settings_machine { my $c = shift; my ($domain) = _search_requested_machine($c); + + return access_denied($c) if !$domain; + + return access_denied($c) + unless $USER->is_admin + || $domain->id_owner == $USER->id; + return $c->render("Domain not found") if !$domain; $c->stash(domain => $domain); From 0582e678653b6dc67ff586c0c847d58015b2d4e5 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 19 Oct 2017 16:28:37 +0200 Subject: [PATCH 028/170] [408] Ubuntu AA 17.10 iso location --- lib/Ravada.pm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index fa2ffb63e..355270ced 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -171,7 +171,17 @@ sub _update_isos { my $table = 'iso_images'; my $field = 'name'; my %data = ( - zesty => { + artful => { + name => 'Ubuntu Artful Aardvak' + ,description => 'Ubuntu 17.10 Artful Aardvak 64 bits' + ,arch => 'amd64' + ,xml => 'yakkety64-amd64.xml' + ,xml_volume => 'yakkety64-volume.xml' + ,url => 'http://releases.ubuntu.com/17.10/' + ,file_re => ,'ubuntu-17.10.*desktop-amd64.iso' + ,md5_url => ,'http://releases.ubuntu.com/17.10/MD5SUMS' + } + ,zesty => { name => 'Ubuntu Zesty Zapus' ,description => 'Ubuntu 17.04 Zesty Zapus 64 bits' ,arch => 'amd64' From 3e0cecfb757f83f4efe03923c65f622788b67061 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 19 Oct 2017 17:03:16 +0200 Subject: [PATCH 029/170] [#408] lubuntu 17.10 --- lib/Ravada.pm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index 355270ced..b770163c0 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -231,6 +231,14 @@ sub _update_isos { ,md5 => 'fe495d34188a9568c8d166efc5898d22' ,rename_file => 'xubuntu_xenial_mini.iso' } + ,lubuntu_aardvark => { + name => 'Lubuntu Artful Aardvark' + ,description => 'Lubuntu 17.10 Artful Aardvark 64 bits' + ,url => 'http://cdimage.ubuntu.com/lubuntu/releases/17.10/release/lubuntu-17.10-desktop-amd64.iso' + ,md5_url => 'http://cdimage.ubuntu.com/lubuntu/releases/17.10/release/MD5SUMS' + ,xml => 'yakkety64-amd64.xml' + ,xml_volume => 'yakkety64-volume.xml' + } ,lubuntu_zesty => { name => 'Lubuntu Zesty Zapus' ,description => 'Lubuntu 17.04 Zesty Zapus 64 bits' From 7a1eeebef88c4d15fc665544cdf96ffe3d2cb548 Mon Sep 17 00:00:00 2001 From: joelalju Date: Thu, 19 Oct 2017 17:08:29 +0200 Subject: [PATCH 030/170] [#405] It now checks ownership. --- rvd_front.pl | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/rvd_front.pl b/rvd_front.pl index 98571d6e7..b1879d07c 100644 --- a/rvd_front.pl +++ b/rvd_front.pl @@ -301,7 +301,12 @@ my $id = $c->stash('id'); die "No id " if !$id; - #TODO check ownership + my ($domain) = _search_requested_machine($c); + return access_denied($c) if !$domain; + + return access_denied($c) unless $USER->is_admin + || $domain->id_owner == $USER->id; + $c->render(json => $RAVADA->domain_info(id => $id)); }; @@ -313,7 +318,13 @@ any '/machine/manage/(:id).(:type)' => sub { my $c = shift; - #TODO check ownership + + my ($domain) = _search_requested_machine($c); + return access_denied($c) if !$domain; + + return access_denied($c) unless $USER->is_admin + || $domain->id_owner == $USER->id; + return manage_machine($c); }; @@ -322,7 +333,12 @@ my $id = $c->stash('id'); my $type = $c->stash('type'); - #TODO check ownership + my ($domain) = _search_requested_machine($c); + return access_denied($c) if !$domain; + + return access_denied($c) unless $USER->is_admin + || $domain->id_owner == $USER->id; + return view_machine($c); }; From b89a226160de0b723cbebe7385d54ea774ed97c4 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 19 Oct 2017 11:20:10 +0200 Subject: [PATCH 031/170] Removed machine listing just to fetch the name --- public/js/ravada.js | 7 ++++--- templates/main/settings_machine.html.ep | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/js/ravada.js b/public/js/ravada.js index 8192ac659..f31181b4c 100644 --- a/public/js/ravada.js +++ b/public/js/ravada.js @@ -130,7 +130,7 @@ $http.get('/pingbackend.json').then(function(response) { $scope.pingbe_fail = !response.data; }); - $scope.getSingleMachine = function(){ +/* $scope.getSingleMachine = function(){ $http.get("/list_machines.json").then(function(response) { for (var i=0, iLength=response.data.length; i %= include 'bootstrap/navigation'
- -
+
From 2de2e6fded3e4fe8dea516bf649877e921d45443 Mon Sep 17 00:00:00 2001 From: Gabriel Silva Date: Fri, 20 Oct 2017 00:03:43 -0200 Subject: [PATCH 032/170] Adds Portuguese translations Signed-off-by: Gabriel Silva --- lib/Ravada/I18N/pt.po | 443 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 443 insertions(+) create mode 100644 lib/Ravada/I18N/pt.po diff --git a/lib/Ravada/I18N/pt.po b/lib/Ravada/I18N/pt.po new file mode 100644 index 000000000..8110874e9 --- /dev/null +++ b/lib/Ravada/I18N/pt.po @@ -0,0 +1,443 @@ +# Translators: +# Joel Alarcón , 2017 +# Fernando Verdugo , 2017 +msgid "" +msgstr "" +"Project-Id-Version: 0.1.0-alpha\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-03 10:12+0300\n" +"PO-Revision-Date: 2017-05-02 16:20+0200\n" +"Last-Translator: Fernando Verdugo fernando@etsetb.upc.edu\n" +"Language-Team: \n" +"Language: ca\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "Ravada broker" +msgstr "Agente do Ravada" + +msgid "Machine Name" +msgstr "Nome da Máquina" + +msgid "Tools" +msgstr "Ferramentas" + +msgid "Machines List" +msgstr "Lista de Máquinas" + +msgid "Users" +msgstr "Usuários" + +msgid "Choose a Machine to Start" +msgstr "Escolha uma Máquina para Começar" + +msgid "Start" +msgstr "Começar" + +msgid "Stop" +msgstr "Parar" + +msgid "View" +msgstr "Ver" + +msgid "Prepare base" +msgstr "Preparar base" + +msgid "Clone" +msgstr "Clonar" + +msgid "Can't Prepare Base, Remove Base nor Delete. Machine has" +msgstr "Não se pôde Preaparar ou Remover a Base. A Máquina tem" + +msgid "Clone/s" +msgstr "Clone/s" + +msgid "NEW" +msgstr "NOVO" + +msgid "Users List" +msgstr "Lista de Usuários" + +msgid "Name" +msgstr "Nome" + +msgid "Log Out" +msgstr "Sair" + +msgid "Available Machines" +msgstr "Máquinas Disponíveis" + +msgid "Help" +msgstr "Ajuda" + +msgid "Requirements" +msgstr "Requisitos" + +msgid "About" +msgstr "Sobre" + +msgid "Messages" +msgstr "Mensagens" + +msgid "Mark all as Read" +msgstr "Marcar Tudo como Lido" + +msgid "Settings" +msgstr "Configurações" + +msgid "New Machine" +msgstr "Nova Máquina" + +msgid "I want to change my password" +msgstr "Eu quero mudar a minha senha" + +msgid "I want to change my language" +msgstr "Eu quero alterar a minha linguagem" + +msgid "Language:" +msgstr "Linguagem:" + +msgid "English" +msgstr "Inglês" + +msgid "Spanish" +msgstr "Espanhol" + +msgid "Catalan" +msgstr "Catalão" + +msgid "New Password:" +msgstr "Nova Senha:" + +msgid "Confirm Password:" +msgstr "Confirmar Senha:" + +msgid "Submit" +msgstr "Enviar" + +msgid "Your language has been changed successfully" +msgstr "Sua linguagem foi alterada com sucesso" + +msgid "Your password has been changed successfully" +msgstr "Sua senha foi alterada com sucesso" + +msgid "Password too small" +msgstr "Senha muito pequena" + +msgid "Password fields aren't equal" +msgstr "Campos de senha não são iguais" + +msgid "Some of the password's fields are empty" +msgstr "Algum dos campos de senha está vazio" + +msgid "Public" +msgstr "Público" + +msgid "Status" +msgstr "Estado" + +msgid "Actions" +msgstr "Ações" + +msgid "Machines" +msgstr "Máquinas" + +msgid "Down" +msgstr "Parada" + +msgid "Running" +msgstr "Em execução" + +msgid "ShutDown" +msgstr "Desligada" + +msgid "Screenshot" +msgstr "Captura de Tela" + +msgid "Paused" +msgstr "Pausada" + +msgid "Machine locked by requested" +msgstr "Máquina travada por requisição" + +msgid "process" +msgstr "processo" + +msgid "Copy" +msgstr "Copiar" + +msgid "Error!" +msgstr "Erro!" + +msgid "Error" +msgstr "Erro" + +msgid "Backend no available!" +msgstr "Backend indisponível!" + +msgid "Subject" +msgstr "Assunto" + +msgid "Date" +msgstr "Data" + +msgid "Mark as Read" +msgstr "Marcar como Lido" + +msgid "Mark as UnRead" +msgstr "Marcar como não Lido" + +msgid "No message to show!" +msgstr "Nenhuma mensagem para mostrar!" + +msgid "Admin" +msgstr "Administrador" + +msgid "machines" +msgstr "máquinas" + +msgid "users" +msgstr "usuários" + +msgid "messages" +msgstr "mensagens" + +msgid "Admin tools" +msgstr "Ferramentas de administração" + +msgid "Remove base" +msgstr "Remover base" + +msgid "public" +msgstr "pública" + +msgid "New Base" +msgstr "Nova base" + +msgid "Restore" +msgstr "Restaurar" + +msgid "Hybernate" +msgstr "Hibernar" + +msgid "Shutdown" +msgstr "Desligar" + +msgid "action" +msgstr "ação" + +msgid "will remove all the contents of the machine" +msgstr "vai remover todos os conteúdos da máquina" + +msgid "Are you sure?" +msgstr "Você tem certeza?" + +msgid "Yes" +msgstr "Sim" + +msgid "No" +msgstr "Não" + +msgid "Make public" +msgstr "Tornar pública" + +msgid "Machine settings" +msgstr "Configurações da Máquina" + +msgid "Cannot remove base, machine has clones" +msgstr "Não é possível remover a base, a máquina tem clones" + +msgid "Show/Hide clones" +msgstr "Mostrar/Esconder clones" + +msgid "For spice redirection you'll need to install" +msgstr "Para redirecionamento de spice, você vai precisar instalar" + +msgid "in your computer." +msgstr "no seu computador." + +msgid "Search in your distro, e.g. in Debian/Ubuntu with" +msgstr "Pesquisar na sua distro, ex. no Debian/Ubuntu com" + +msgid "You'll need to install" +msgstr "Você vai precisar instalar" + +msgid "e.g. VirtViewer v5.0-256, and USB drivers (" +msgstr "ex. VirtViewer v5.0-256, e drivers USB (" + +msgid "" +"Be aware that in Windows, spice redirection is not automatically. It's " +"necessary associate protocol with the app." +msgstr "" +"Note que no Windows o redirecionamento de spice não é automático. É " +"necessário associar o protocol com a aplicação." + +msgid "To make this possible, download" +msgstr "Para tornar isto possível, faça o download de" + +msgid "" +"or copy the following lines in an ASCII file and save with extension .reg, " +"then execute the file." +msgstr "" +"Ou copie as seguintes linhas em um arquivo ASCII e salve-o com uma extensão " +".reg, então o execute" + +msgid "Login" +msgstr "Entrar" + +msgid "Welcome" +msgstr "Bem vindo" + +msgid "It is required a viewer to run the virtual machines." +msgstr "É necessário que um visualizador execute as máquinas virtuais" + +msgid "Virtual Machines" +msgstr "Máquinas Virtuais" + +msgid "user" +msgstr "usuário" + +msgid "password" +msgstr "senha" + +msgid "Start session" +msgstr "Iniciar seção" + +msgid "Login with Intranet UPC's username." +msgstr "Entrar com o usuário da Intranet UPC" + +msgid "bits) in your computer." +msgstr "bits) em seu computador" + +msgid "Permissions" +msgstr "Permissões" + +msgid "can change the settings of owned virtual machines." +msgstr "pode alterar configurações de máquinas virtuais que possuir." + +msgid "can change the settings of any virtual machines." +msgstr "pode alterar as configurações de qualquer máquina virtual." + +msgid "can change the settings of any virtual machines " +msgstr "pode alterar as configurações de qualquer máquina virtual " + +msgid "cloned from one base owned by the user." +msgstr "clonada de uma das bases que o usuário possuir." + +msgid "can clone public virtual machines." +msgstr "pode clinar máquinas virtuais públicas." + +msgid "can clone any virtual machine." +msgstr "pode clonar qualquer máquina virtual." + +msgid "can create bases." +msgstr "pode criar bases." + +msgid "can create virtual machines." +msgstr "pode criar máquinas virtuais." + +msgid "can grant permissions to other users" +msgstr "pode conceder permissões para outros usuários." + +msgid "can hibernate any virtual machine." +msgstr "pode hibernar qualquer máquina virtual." + +msgid "can hibernate clones from virtual machines owned by the user." +msgstr "pode hibernar clones de qualquer máquina virtual que o usuário possuir." + +msgid "can hibernate any clone." +msgstr "pode hibernar qualquer clone" + +msgid "can remove any virtual machines owned by the user." +msgstr "pode remover qualquer máquina virtuai que o usuário possuir." + +msgid "can remove any virtual machine." +msgstr "pode remover qualquer máquina virtual." + +msgid "can remove clones from virtual machines owned by the user." +msgstr "pode remover clones de qualquer máquina virtual que o usuário possuir." + +msgid "can remove any clone." +msgstr "pode remover qualquer clone." + +msgid "can take a screenshot of any virtual machine owned by the user." +msgstr "pode tirar capturas de tela de qualquer máquina virtual que o usuário possuir." + +msgid "can take a screenshot of any virtual machine." +msgstr "pode tirar capturas de tela de qualquer máquina virtual." + +msgid "can shutdown any virtual machine." +msgstr "pode desligar qualquer máquina virtual." + +msgid "can shutdown clones from virtual machines owned by the user." +msgstr "pode desligar clones de máquinas virtuais que o usuário possuir." + +msgid "Submit Query" +msgstr "Submeter Consulta" + +msgid "From Template" +msgstr "A partir de um Template" + +msgid "From Machine" +msgstr "A partir de uma Máquina" + +msgid "Backend" +msgstr "Backend" + +msgid "Select Template" +msgstr "Selecione um Template" + +msgid "This ISO image has not been already downloaded. This may take many minutes, even hours until the file is fetched from Internet." +msgstr "" +"O download desta imagem ISO ainda não foi feito. Isto pode levar alguns " +"minutos ou até horas até que o arquivo seja recuperado da Internet." + +msgid "Download now" +msgstr "Faça o Download agora" + +msgid "Select ISO" +msgstr "Selecione uma ISO" + +msgid "Template" +msgstr "Template" + +msgid "Disk Size: (GB)" +msgstr "Tamanho do Disco: (GB)" + +msgid "Swap Size: (GB)" +msgstr "Tamanho do Swap: (GB)" + +msgid "Ram: (GB)" +msgstr "Ram: (GB)" + +msgid "Machine name is required." +msgstr "Nome da máquina é exigido." + +msgid "Machine name can't exceed 20 characters." +msgstr "Nome da máquina não pode exceder 20 caracteres." + +msgid "Backend selection is required." +msgstr "Seleção de um Backend é exigida." + +msgid "ISO image selection is required." +msgstr "Seleção de uma imagem ISO é exigida." + +msgid "Template selection is required." +msgstr "Seleção de um template é exigida." + +msgid "A machine with that name already exists." +msgstr "Uma máquina com esse nome já existe." + +msgid "The machine name must contain only alphabetic, numbers, dashes and points." +msgstr "O nome da máquina deve conter apenas caracteres alfanuméricos, hífens e pontos" + +msgid "Create" +msgstr "Criar" + +msgid "" +"can change the settings of any virtual machines " +"cloned from one base owned by the user." +msgstr "" +"pode alterar as configurações de qualquer máquina virtual " +"clonada de uma base possuída pelo usuário." From 501ea8aedb2e1968325edb87bbc417f9217c320e Mon Sep 17 00:00:00 2001 From: Meike Hankewicz <30365050+Schlenges@users.noreply.github.com> Date: Tue, 24 Oct 2017 09:50:19 +0200 Subject: [PATCH 033/170] updated en translation --- lib/Ravada/I18N/en.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/Ravada/I18N/en.po b/lib/Ravada/I18N/en.po index 24188b6e9..fce0670ef 100644 --- a/lib/Ravada/I18N/en.po +++ b/lib/Ravada/I18N/en.po @@ -48,7 +48,7 @@ msgstr "" msgid "Clone" msgstr "" -msgid "Can't Prepare Base, Remove Base nor Delete. Machine has" +msgid "Can't Prepare Base, Remove Base or Delete. Machine has" msgstr "" msgid "Clone/s" @@ -123,7 +123,7 @@ msgstr "" msgid "Your password has been changed successfully" msgstr "" -msgid "Password too small" +msgid "Password too short" msgstr "" msgid "Password fields aren't equal" @@ -159,7 +159,7 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Machine locked by requested" +msgid "Machine locked by request" msgstr "" msgid "process" @@ -174,7 +174,7 @@ msgstr "" msgid "Error" msgstr "" -msgid "Backend no available!" +msgid "Backend not available!" msgstr "" msgid "Subject" @@ -186,7 +186,7 @@ msgstr "" msgid "Mark as Read" msgstr "" -msgid "Mark as UnRead" +msgid "Mark as Unread" msgstr "" msgid "No message to show!" @@ -255,7 +255,7 @@ msgstr "" msgid "For spice redirection you'll need to install" msgstr "" -msgid "in your computer." +msgid "on your computer." msgstr "" msgid "Search in your distro, e.g. in Debian/Ubuntu with" @@ -269,7 +269,7 @@ msgstr "" msgid "" "Be aware that in Windows, spice redirection is not automatically. It's " -"necessary associate protocol with the app." +"necessary to associate protocol with the app." msgstr "" msgid "To make this possible, download" @@ -286,7 +286,7 @@ msgstr "" msgid "Welcome" msgstr "" -msgid "It is required a viewer to run the virtual machines." +msgid "A viewer is required to run the virtual machines." msgstr "" msgid "Virtual Machines" @@ -385,7 +385,7 @@ msgstr "" msgid "Select Template" msgstr "" -msgid "This ISO image has not been already downloaded. This may take many minutes, even hours until the file is fetched from Internet." +msgid "This ISO image has not been downloaded yet. It may take some minutes, even hours until the file is fetched from the Internet." msgstr "" msgid "Download now" @@ -424,7 +424,7 @@ msgstr "" msgid "A machine with that name already exists." msgstr "" -msgid "The machine name must contain only alphabetic, numbers, dashes and points." +msgid "The machine name is only allowed to consist of alphabetic characters, numbers, dashes and points." msgstr "" msgid "Create" From bc22566c50d7db41f2c18cad002907ec0cc61ce7 Mon Sep 17 00:00:00 2001 From: Jirayu Laungwilawan Date: Tue, 24 Oct 2017 15:22:40 +0700 Subject: [PATCH 034/170] Fix Hybernate to Hibernate --- lib/Ravada/I18N/en.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Ravada/I18N/en.po b/lib/Ravada/I18N/en.po index 24188b6e9..3f4398bb6 100644 --- a/lib/Ravada/I18N/en.po +++ b/lib/Ravada/I18N/en.po @@ -219,7 +219,7 @@ msgstr "" msgid "Restore" msgstr "" -msgid "Hybernate" +msgid "Hibernate" msgstr "" msgid "Shutdown" From 48c222a45ba167929c54cf8e07c839c565e4f7c6 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Tue, 24 Oct 2017 11:32:39 +0200 Subject: [PATCH 035/170] [#411] Uppercase noun addressed by @ykshinde --- lib/Ravada/I18N/en.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Ravada/I18N/en.po b/lib/Ravada/I18N/en.po index 58f7cdb1b..caf6b88de 100644 --- a/lib/Ravada/I18N/en.po +++ b/lib/Ravada/I18N/en.po @@ -252,7 +252,7 @@ msgstr "" msgid "Show/Hide clones" msgstr "" -msgid "For spice redirection you'll need to install" +msgid "For Spice redirection you'll need to install" msgstr "" msgid "on your computer." @@ -268,7 +268,7 @@ msgid "e.g. VirtViewer v5.0-256, and USB drivers (" msgstr "" msgid "" -"Be aware that in Windows, spice redirection is not automatically. It's " +"Be aware that in Windows, Spice redirection is not automatically. It's " "necessary to associate protocol with the app." msgstr "" From 421bd139335e51f125d4d8586d246dc3e36cd89b Mon Sep 17 00:00:00 2001 From: Raghav Mittal Date: Tue, 24 Oct 2017 15:45:11 +0530 Subject: [PATCH 036/170] UPDATE - small corrections made --- lib/Ravada/I18N/en.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Ravada/I18N/en.po b/lib/Ravada/I18N/en.po index caf6b88de..615ccb766 100644 --- a/lib/Ravada/I18N/en.po +++ b/lib/Ravada/I18N/en.po @@ -129,7 +129,7 @@ msgstr "" msgid "Password fields aren't equal" msgstr "" -msgid "Some of the password's fields are empty" +msgid "Some of the password fields are empty" msgstr "" msgid "Public" @@ -150,7 +150,7 @@ msgstr "" msgid "Running" msgstr "" -msgid "ShutDown" +msgid "Shutdown" msgstr "" msgid "Screenshot" @@ -268,7 +268,7 @@ msgid "e.g. VirtViewer v5.0-256, and USB drivers (" msgstr "" msgid "" -"Be aware that in Windows, Spice redirection is not automatically. It's " +"Be aware that in Windows, Spice redirection is not automatic. It's " "necessary to associate protocol with the app." msgstr "" @@ -431,6 +431,6 @@ msgid "Create" msgstr "" msgid "" -"can change the settings of any virtual machines " +"can change the settings of all virtual machines " "cloned from one base owned by the user." msgstr "" From 87d1b0a7259a3dce078dba40f03240c45f315027 Mon Sep 17 00:00:00 2001 From: Sanjiv Lobo Date: Tue, 24 Oct 2017 17:19:20 +0530 Subject: [PATCH 037/170] UPDATE en.po Fixes minor grammatical errors and issues #411 --- lib/Ravada/I18N/en.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/Ravada/I18N/en.po b/lib/Ravada/I18N/en.po index caf6b88de..b9510a323 100644 --- a/lib/Ravada/I18N/en.po +++ b/lib/Ravada/I18N/en.po @@ -18,7 +18,7 @@ msgstr "" msgid "Ravada broker" msgstr "" -msgid "Machine Name" +msgid "Name of the Machine" msgstr "" msgid "Tools" @@ -93,7 +93,7 @@ msgstr "" msgid "I want to change my password" msgstr "" -msgid "I want to change my language" +msgid "I want to change my Language" msgstr "" msgid "Language:" @@ -126,10 +126,10 @@ msgstr "" msgid "Password too short" msgstr "" -msgid "Password fields aren't equal" +msgid "Password fields are not matching!" msgstr "" -msgid "Some of the password's fields are empty" +msgid "Some of the password fields are empty." msgstr "" msgid "Public" @@ -195,13 +195,13 @@ msgstr "" msgid "Admin" msgstr "" -msgid "machines" +msgid "Machines" msgstr "" -msgid "users" +msgid "Users" msgstr "" -msgid "messages" +msgid "Messages" msgstr "" msgid "Admin tools" @@ -210,7 +210,7 @@ msgstr "" msgid "Remove base" msgstr "" -msgid "public" +msgid "Public" msgstr "" msgid "New Base" @@ -225,10 +225,10 @@ msgstr "" msgid "Shutdown" msgstr "" -msgid "action" +msgid "Action" msgstr "" -msgid "will remove all the contents of the machine" +msgid "Will remove all the contents of the machine" msgstr "" msgid "Are you sure?" @@ -292,10 +292,10 @@ msgstr "" msgid "Virtual Machines" msgstr "" -msgid "user" +msgid "User" msgstr "" -msgid "password" +msgid "Password" msgstr "" msgid "Start session" From 62142aa93e64dd0bbae8ded083843a1bd94bd491 Mon Sep 17 00:00:00 2001 From: Dayyan O'Brien <32600016+dayyanobrien@users.noreply.github.com> Date: Tue, 24 Oct 2017 20:49:03 +0100 Subject: [PATCH 038/170] Updated en.po Improved some english throughout --- lib/Ravada/I18N/en.po | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/Ravada/I18N/en.po b/lib/Ravada/I18N/en.po index e7df0ee5d..cc19ef9d9 100644 --- a/lib/Ravada/I18N/en.po +++ b/lib/Ravada/I18N/en.po @@ -18,19 +18,19 @@ msgstr "" msgid "Ravada broker" msgstr "" -msgid "Name of the Machine" +msgid "Name of the machine" msgstr "" msgid "Tools" msgstr "" -msgid "Machines List" +msgid "Machines list" msgstr "" msgid "Users" msgstr "" -msgid "Choose a Machine to Start" +msgid "Choose a machine to start" msgstr "" msgid "Start" @@ -48,13 +48,13 @@ msgstr "" msgid "Clone" msgstr "" -msgid "Can't Prepare Base, Remove Base or Delete. Machine has" +msgid "Can't prepare base, remove base or delete. Machine has" msgstr "" msgid "Clone/s" msgstr "" -msgid "NEW" +msgid "New" msgstr "" msgid "Users List" @@ -66,7 +66,7 @@ msgstr "" msgid "Log Out" msgstr "" -msgid "Available Machines" +msgid "Available machines" msgstr "" msgid "Help" @@ -81,13 +81,13 @@ msgstr "" msgid "Messages" msgstr "" -msgid "Mark all as Read" +msgid "Mark all as read" msgstr "" msgid "Settings" msgstr "" -msgid "New Machine" +msgid "New machine" msgstr "" msgid "I want to change my password" @@ -117,19 +117,19 @@ msgstr "" msgid "Submit" msgstr "" -msgid "Your language has been changed successfully" +msgid "Your language has been successfully changed" msgstr "" -msgid "Your password has been changed successfully" +msgid "Your password has been successfully changed" msgstr "" -msgid "Password too short" +msgid "Password is too short" msgstr "" -msgid "Password fields are not matching!" +msgid "Password fields are not matching" msgstr "" -msgid "Some of the password fields are empty." +msgid "Some of the password fields are empty" msgstr "" msgid "Public" @@ -162,7 +162,7 @@ msgstr "" msgid "Machine locked by request" msgstr "" -msgid "process" +msgid "Process" msgstr "" msgid "Copy" @@ -183,13 +183,13 @@ msgstr "" msgid "Date" msgstr "" -msgid "Mark as Read" +msgid "Mark as read" msgstr "" -msgid "Mark as Unread" +msgid "Mark as unread" msgstr "" -msgid "No message to show!" +msgid "No messages to show" msgstr "" msgid "Admin" @@ -249,7 +249,7 @@ msgstr "" msgid "Cannot remove base, machine has clones" msgstr "" -msgid "Show/Hide clones" +msgid "Show/hide clones" msgstr "" msgid "For Spice redirection you'll need to install" From a6ed7ad30763a2cb48ce0da87314ef40daa6be08 Mon Sep 17 00:00:00 2001 From: fv3rdugo Date: Mon, 19 Jun 2017 20:21:04 +0200 Subject: [PATCH 039/170] Add Japanese --- lib/Ravada/I18N/jp.po | 303 ++++++++++++++++++++++ templates/bootstrap/user_settings.html.ep | 1 + 2 files changed, 304 insertions(+) create mode 100644 lib/Ravada/I18N/jp.po diff --git a/lib/Ravada/I18N/jp.po b/lib/Ravada/I18N/jp.po new file mode 100644 index 000000000..ad4a50092 --- /dev/null +++ b/lib/Ravada/I18N/jp.po @@ -0,0 +1,303 @@ +# Translators: +# Fernando Verdugo , 2017 +msgid "" +msgstr "" +"Project-Id-Version: 0.1.0-alpha\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-03 10:12+0300\n" +"PO-Revision-Date: 2017-05-02 16:20+0200\n" +"Last-Translator: Fernando Verdugo fernando@etsetb.upc.edu\n" +"Language-Team: \n" +"Language: jp\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "Ravada broker" +msgstr "ラヴダブローカー" + +msgid "Machine Name" +msgstr "マシン名" + +msgid "Tools" +msgstr "ツール" + +msgid "Machines List" +msgstr "マシンの一覧" + +msgid "Users" +msgstr "ユーザー" + +msgid "Choose a Machine to Start" +msgstr "開始するマシンを選択します。" + +msgid "Start" +msgstr "スタート" + +msgid "Stop" +msgstr "ストップ" + +msgid "View" +msgstr "ビュー" + +msgid "Prepare base" +msgstr "ベースを準備する" + +msgid "Clone" +msgstr "クローン" + +msgid "Can't Prepare Base, Remove Base nor Delete. Machine has" +msgstr "" + +msgid "Clone/s" +msgstr "" + +msgid "NEW" +msgstr "新しい" + +msgid "Users List" +msgstr "ユーザーリスト" + +msgid "Name" +msgstr "名" + +msgid "Log Out" +msgstr "ログアウト" + +msgid "Available Machines" +msgstr "" + +msgid "Help" +msgstr "助けて" + +msgid "Requirements" +msgstr "要件" + +msgid "About" +msgstr "約" + +msgid "Messages" +msgstr "メッセージ" + +msgid "Mark all as Read" +msgstr "" + +msgid "Settings" +msgstr "設定" + +msgid "New Machine" +msgstr "新しいマシン" + +msgid "I want to change my password" +msgstr "" + +msgid "I want to change my language" +msgstr "" + +msgid "Language:" +msgstr "言語" + +msgid "English" +msgstr "英語" + +msgid "Spanish" +msgstr "スペイン語" + +msgid "Catalan" +msgstr "カタロニア語" + +msgid "New Password:" +msgstr "新しいパスワード：" + +msgid "Confirm Password:" +msgstr "新しいパスワード：" + +msgid "Submit" +msgstr "提出する" + +msgid "Your language has been changed successfully" +msgstr "言語が変更されました" + +msgid "Your password has been changed successfully" +msgstr "パスワードが正常に変更されました" + +msgid "Password too small" +msgstr "パスワードが小さすぎます" + +msgid "Password fields aren't equal" +msgstr "" + +msgid "Some of the password's fields are empty" +msgstr "" + +msgid "Public" +msgstr "パブリック" + +msgid "Status" +msgstr "状態" + +msgid "Actions" +msgstr "行動" + +msgid "Machines" +msgstr "マシン" + +msgid "Down" +msgstr "ダウン" + +msgid "Running" +msgstr "ランニング" + +msgid "ShutDown" +msgstr "シャットダウン" + +msgid "Screenshot" +msgstr "スクリーンショット" + +msgid "Paused" +msgstr "一時停止中" + +msgid "Machine locked by" +msgstr "" + +msgid "process" +msgstr "" + +msgid "Copy" +msgstr "" + +msgid "Error!" +msgstr "" + +msgid "Backend no available!" +msgstr "" + +msgid "Subject" +msgstr "" + +msgid "Date" +msgstr "" + +msgid "Mark as Read" +msgstr "" + +msgid "Mark as UnRead" +msgstr "" + +msgid "No message to show!" +msgstr "" + +msgid "Admin" +msgstr "" + +msgid "machines" +msgstr "機械" + +msgid "users" +msgstr "ユーザー" + +msgid "messages" +msgstr "メッセージ" + +msgid "Admin tools" +msgstr "管理ツール" + +msgid "Remove base" +msgstr "ベースを取り外す" + +msgid "public" +msgstr "パブリック" + +msgid "Restore" +msgstr "リストア" + +msgid "Hybernate" +msgstr "休止状態" + +msgid "Shutdown" +msgstr "シャットダウン" + +msgid "action" +msgstr "アクション" + +msgid "New Base" +msgstr "新しい基地" + +msgid "will remove all the contents of the machine" +msgstr "" + +msgid "Are you sure?" +msgstr "本気ですか？" + +msgid "Yes" +msgstr "はい" + +msgid "No" +msgstr "いいえ" + +msgid "Make public" +msgstr "" + +msgid "Machine settings" +msgstr "" + +msgid "Cannot remove base, machine has clones" +msgstr "" + +msgid "Show/Hide clones" +msgstr "" + +msgid "For spice redirection you'll need to install" +msgstr "" + +msgid "in your computer." +msgstr "" + +msgid "Search in your distro, e.g. in Debian/Ubuntu with" +msgstr "" + +msgid "You'll need to install" +msgstr "" + +msgid "e.g. VirtViewer v5.0-256, and USB drivers (" +msgstr "" + +msgid "" +"Be aware that in Windows, spice redirection is not automatically. It's " +"necessary associate protocol with the app." +msgstr "" + +msgid "To make this possible, download" +msgstr "" + +msgid "" +"or copy the following lines in an ASCII file and save with extension .reg, " +"then execute the file." +msgstr "" + +msgid "Login" +msgstr "" + +msgid "Welcome" +msgstr "" + +msgid "It is required a viewer to run the virtual machines." +msgstr "" + +msgid "Virtual Machines" +msgstr "仮想マシン" + +msgid "user" +msgstr "ユーザー" + +msgid "password" +msgstr "" + +msgid "Start session" +msgstr "" + +msgid "Login with Intranet UPC's username." +msgstr "" + +msgid "bits) in your computer." +msgstr "" diff --git a/templates/bootstrap/user_settings.html.ep b/templates/bootstrap/user_settings.html.ep index e66c94931..cc8520d70 100644 --- a/templates/bootstrap/user_settings.html.ep +++ b/templates/bootstrap/user_settings.html.ep @@ -33,6 +33,7 @@ + % if ($changed_lang) { <%=l 'Your language has been changed successfully' %> From a02fa9eeabd0d1f199e1851ebc9cf7389aeef2a5 Mon Sep 17 00:00:00 2001 From: raghav Date: Thu, 26 Oct 2017 11:01:28 +0530 Subject: [PATCH 040/170] ADD - Hindi language translations --- lib/Ravada/I18N/hi.po | 442 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 442 insertions(+) create mode 100644 lib/Ravada/I18N/hi.po diff --git a/lib/Ravada/I18N/hi.po b/lib/Ravada/I18N/hi.po new file mode 100644 index 000000000..c171abae1 --- /dev/null +++ b/lib/Ravada/I18N/hi.po @@ -0,0 +1,442 @@ +# Translator: +# Raghav Mittal , 2017 +# Hindi +msgid "" +msgstr "" +"Project-Id-Version: 0.1.0-alpha\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-03 10:12+0300\n" +"PO-Revision-Date: 2017-10-26 16:20+0200\n" +"Last-Translator: Raghav Mittal raghavmittal101@gmail.com\n" +"Language-Team: Hindi raghavmittal101@gmail.com\n" +"Language: hi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.7.1\n" + +msgid "Ravada broker" +msgstr "रावदा ब्रोकर" + +msgid "Machine Name" +msgstr "मशीन का नाम" + +msgid "Tools" +msgstr "उपकरण" + +msgid "Machines List" +msgstr "मशीन की सूची" + +msgid "Users" +msgstr "उपयोगकर्ता" + +msgid "Choose a Machine to Start" +msgstr "शुरू करने के लिए एक मशीन चुनें" + +msgid "Start" +msgstr "शुरू करो" + +msgid "Stop" +msgstr "रोको" + +msgid "View" +msgstr "देखें" + +msgid "Prepare base" +msgstr "बेस तैयार करें" + +msgid "Clone" +msgstr "क्लोन" + +msgid "Can't Prepare Base, Remove Base or Delete. Machine has" +msgstr "आधार तैयार नहीं कर सकते, आधार निकालें या हटाएं |" + +msgid "Clone/s" +msgstr "क्लोन" + +msgid "NEW" +msgstr "नया" + +msgid "Users List" +msgstr "उपयोगकर्ता की सूची" + +msgid "Name" +msgstr "नाम" + +msgid "Log Out" +msgstr "लोग आउट" + +msgid "Available Machines" +msgstr "उपलब्ध मशीनें" + +msgid "Help" +msgstr "मदद" + +msgid "Requirements" +msgstr "आवश्यकताएँ" + +msgid "About" +msgstr "इसके बारे में" + +msgid "Messages" +msgstr "संदेश" + +msgid "Mark all as Read" +msgstr "सभी को पढ़ा हुआ मार्क करें" + +msgid "Settings" +msgstr "सेटिंग्स" + +msgid "New Machine" +msgstr "नई मशीन" + +msgid "I want to change my password" +msgstr "मैं अपना पासवर्ड बदलना चाहता हूं" + +msgid "I want to change my language" +msgstr "मैं अपनी भाषा बदलना चाहता हूं" + +msgid "Language:" +msgstr "भाषा:" + +msgid "English" +msgstr "अंग्रेज़ी" + +msgid "Spanish" +msgstr "स्पेनिश" + +msgid "Catalan" +msgstr "कैटलन" + +msgid "New Password:" +msgstr "नया पासवर्ड:" + +msgid "Confirm Password:" +msgstr "पासवर्ड की पुष्टि कीजिये:" + +msgid "Submit" +msgstr "जमा करें" + +msgid "Your language has been changed successfully" +msgstr "आपकी भाषा सफलतापूर्वक बदल दी गई है" + +msgid "Your password has been changed successfully" +msgstr "आपका पासवर्ड सफलतापूर्वक बदल दिया गया है" + +msgid "Password too short" +msgstr "पासवर्ड बहुत छोटा है" + +msgid "Password fields aren't equal" +msgstr "पासवर्ड फ़ील्ड समान नहीं हैं " + +msgid "Some of the password's fields are empty" +msgstr "कुछ पासवर्ड के क्षेत्र रिक्त हैं" + +msgid "Public" +msgstr "सार्वजनिक" + +msgid "Status" +msgstr "स्थिति" + +msgid "Actions" +msgstr "क्रिया" + +msgid "Machines" +msgstr "मशीनें" + +msgid "Down" +msgstr "नीचे" + +msgid "Running" +msgstr "चल रहा है" + +msgid "ShutDown" +msgstr "बंद करें" + +msgid "Screenshot" +msgstr "स्क्रीन की तस्वीर" + +msgid "Paused" +msgstr "रोके गए" + +msgid "Machine locked by request" +msgstr "अनुरोध द्वारा मशीन को लॉक किया गया" + +msgid "process" +msgstr "प्रक्रिया" + +msgid "Copy" +msgstr "प्रतिलिपि" + +msgid "Error!" +msgstr "समस्या है!" + +msgid "Error" +msgstr "समस्या है" + +msgid "Backend not available!" +msgstr "बैकएण्ड उपलब्ध नहीं है!" + +msgid "Subject" +msgstr "विषय" + +msgid "Date" +msgstr "दिनांक" + +msgid "Mark as Read" +msgstr "पढ़ा हुआ चिह्नित करें" + +msgid "Mark as Unread" +msgstr "न पढ़ा हुआ चिह्नित करें" + +msgid "No message to show!" +msgstr "दिखाने के लिए कोई संदेश नहीं है!" + +msgid "Admin" +msgstr "व्यवस्थापक" + +msgid "machines" +msgstr "मशीन" + +msgid "users" +msgstr "उपयोगकर्ताओं" + +msgid "messages" +msgstr "संदेश" + +msgid "Admin tools" +msgstr "व्यवस्थापक उपकरण" + +msgid "Remove base" +msgstr "आधार निकालें" + +msgid "public" +msgstr "सार्वजनिक" + +msgid "New Base" +msgstr "नया आधार" + +msgid "Restore" +msgstr "बहाल" + +msgid "Hibernate" +msgstr "हाइबरनेट करें" + +msgid "Shutdown" +msgstr "बंद करें" + +msgid "action" +msgstr "क्रिया" + +msgid "will remove all the contents of the machine" +msgstr "मशीन की सभी सामग्रियों को हटा देगा" + +msgid "Are you sure?" +msgstr "क्या आपको यकीन है?" + +msgid "Yes" +msgstr "हाँ" + +msgid "No" +msgstr "नहीं" + +msgid "Make public" +msgstr "सार्वजनिक करें" + +msgid "Machine settings" +msgstr "मशीन सेटिंग्स" + +msgid "Cannot remove base, machine has clones" +msgstr "आधार को हटा नहीं सकते, मशीन में क्लोन हैं I" + +msgid "Show/Hide clones" +msgstr "क्लोन दिखाएँ / छिपाएं" + +msgid "For Spice redirection you'll need to install" +msgstr "स्पाइस रीडायरेक्शन के लिए आपको इंस्टॉल करना होगा" + +msgid "on your computer." +msgstr "आपके कंप्युटर पर" + +msgid "Search in your distro, e.g. in Debian/Ubuntu with" +msgstr "अपने डिस्टो में खोज करें, जैसे डेबियन / उबंटू में के साथ" + +msgid "You'll need to install" +msgstr "आपको इंस्टॉल करना होगा" + +msgid "e.g. VirtViewer v5.0-256, and USB drivers (" +msgstr "जैसे VirtViewer v5.0-256, और यूएसबी ड्राइवर (" + +msgid "" +"Be aware that in Windows, Spice redirection is not automatically. It's " +"necessary to associate protocol with the app." +msgstr "" +"ध्यान रखें कि विंडोज में स्पाइस रीडायरेक्शन स्वचालित रूप से नहीं है, यह" +"एप्लिकेशन के साथ प्रोटोकॉल को संबद्ध करने के लिए आवश्यक है।" + +msgid "To make this possible, download" +msgstr "यह संभव बनाने के लिए, डाउनलोड करें" + +msgid "" +"or copy the following lines in an ASCII file and save with extension .reg, " +"then execute the file." +msgstr "" +"या किसी ASCII फ़ाइल में निम्न पंक्तियों की प्रतिलिपि बनाएँ और विस्तार के रूप में सहेजें .reg," +"फिर फ़ाइल निष्पादित करें।" + +msgid "Login" +msgstr "लॉग इन करें" + +msgid "Welcome" +msgstr "स्वागत हे" + +msgid "A viewer is required to run the virtual machines." +msgstr "वर्चुअल मशीन चलाने के लिए एक दर्शक की आवश्यकता है" + +msgid "Virtual Machines" +msgstr "वर्चुअल मशीन" + +msgid "user" +msgstr "उपयोगकर्ता" + +msgid "password" +msgstr "पासवर्ड " + +msgid "Start session" +msgstr "सत्र प्रारंभ करें" + +msgid "Login with Intranet UPC's username." +msgstr "इंट्रानेट UPC के उपयोगकर्ता नाम के साथ लॉगिन करें" + +msgid "bits) in your computer." +msgstr "बिट्स) आपके कंप्यूटर में" + +msgid "Permissions" +msgstr "अनुमतियां" + +msgid "can change the settings of owned virtual machines." +msgstr "स्वामित्व वाली वर्चुअल मशीन की सेटिंग बदल सकते हैं" + +msgid "can change the settings of any virtual machines." +msgstr "किसी भी वर्चुअल मशीन की सेटिंग बदल सकते हैं |" + +msgid "can change the settings of any virtual machines " +msgstr "किसी भी वर्चुअल मशीन की सेटिंग बदल सकते हैं" + +msgid "cloned from one base owned by the user." +msgstr "उपयोगकर्ता द्वारा स्वामित्व वाले एक आधार से क्लोन किया गया" + +msgid "can clone public virtual machines." +msgstr "सार्वजनिक वर्चुअल मशीन क्लोन कर सकते हैं" + +msgid "can clone any virtual machine." +msgstr "किसी भी वर्चुअल मशीन क्लोन कर सकते हैं" + +msgid "can create bases." +msgstr "आधार बना सकते हैं" + +msgid "can create virtual machines." +msgstr "वर्चुअल मशीन बना सकते हैं |" + +msgid "can grant permissions to other users" +msgstr "अन्य उपयोगकर्ताओं को अनुमति दे सकते हैं" + +msgid "can hibernate any virtual machine." +msgstr "कोई भी वर्चुअल मशीन को हाइबरनेट कर सकते हैं।" + +msgid "can hibernate clones from virtual machines owned by the user." +msgstr "उपयोगकर्ता के स्वामित्व वाले वर्चुअल मशीनों से क्लोन को हाइबरनेट कर सकते हैं" + +msgid "can hibernate any clone." +msgstr "कोई भी क्लोन हाइबरनेट कर सकते हैं।" + +msgid "can remove any virtual machines owned by the user." +msgstr "उपयोगकर्ता के स्वामित्व वाले किसी भी वर्चुअल मशीन को निकाल सकते हैं" + +msgid "can remove any virtual machine." +msgstr "किसी भी आभासी मशीन को निकाल सकते हैं" + +msgid "can remove clones from virtual machines owned by the user." +msgstr "उपयोगकर्ता के स्वामित्व वाले वर्चुअल मशीनों से क्लोन को निकाल सकते हैं" + +msgid "can remove any clone." +msgstr "किसी भी क्लोन को निकाल सकते हैं" + +msgid "can take a screenshot of any virtual machine owned by the user." +msgstr "उपयोगकर्ता के स्वामित्व वाले किसी भी आभासी मशीन की स्क्रीन की तस्वीर ले सकते हैं।" + +msgid "can take a screenshot of any virtual machine." +msgstr "किसी भी वर्चुअल मशीन की एक स्क्रीन की तस्वीर ले सकते हैं |" + +msgid "can shutdown any virtual machine." +msgstr "किसी भी वर्चुअल मशीन को बंद कर सकते हैं" + +msgid "can shutdown clones from virtual machines owned by the user." +msgstr "उपयोगकर्ता के स्वामित्व वाले वर्चुअल मशीनों से क्लोन को बंद कर सकते हैं।" + +msgid "Submit Query" +msgstr "प्रश्न दर्ज करें" + +msgid "From Template" +msgstr "टेम्पलेट से" + +msgid "From Machine" +msgstr "मशीन से" + +msgid "Backend" +msgstr "बैकएंड" + +msgid "Select Template" +msgstr "टेम्पलेट चुनें" + +msgid "This ISO image has not been downloaded yet. It may take some minutes, even hours until the file is fetched from the Internet." +msgstr "यह ISO छवि अभी तक डाउनलोड नहीं की गई है। फ़ाइल को इंटरनेट से प्राप्त होने तक कुछ मिनट लग सकते हैं।" + +msgid "Download now" +msgstr "अभी डाउनलोड करें" + +msgid "Select ISO" +msgstr "ISO का चयन करें" + +msgid "Template" +msgstr "टेम्पलेट" + +msgid "Disk Size: (GB)" +msgstr "डिस्क परिमाण: (जीबी)" + +msgid "Swap Size: (GB)" +msgstr "स्वैप परिमाण: (जीबी)" + +msgid "Ram: (GB)" +msgstr "रैम: (जीबी)" + +msgid "Machine name is required." +msgstr "मशीन का नाम आवश्यक है" + +msgid "Machine name can't exceed 20 characters." +msgstr "मशीन का नाम 20 वर्णों से अधिक नहीं हो सकता।" + +msgid "Backend selection is required." +msgstr "बैकएण्ड चयन आवश्यक है।" + +msgid "ISO image selection is required." +msgstr "ISO छवि चयन आवश्यक है" + +msgid "Template selection is required." +msgstr "टेम्पलेट चयन आवश्यक है" + +msgid "A machine with that name already exists." +msgstr "उस नाम वाला एक मशीन पहले से मौजूद है।" + +msgid "The machine name is only allowed to consist of alphabetic characters, numbers, dashes and points." +msgstr "मशीन के नाम में केवल वर्णानुक्रम वर्ण, संख्याएं, डैश और अंक शामिल हो सकते हैं।" + +msgid "Create" +msgstr "बनाओ" + +msgid "" +"can change the settings of any virtual machines " +"cloned from one base owned by the user." +msgstr "" +"किसी भी वर्चुअल मशीन की सेटिंग बदल सकते हैं" +"उपयोगकर्ता द्वारा स्वामित्व वाले एक आधार से क्लोन किया गया।" From 827bd202a7c1633fc79b137408666c1374e1a4b3 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 26 Oct 2017 11:07:24 +0200 Subject: [PATCH 041/170] Fixed hybernate typo --- templates/main/list_bases2.html.ep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/main/list_bases2.html.ep b/templates/main/list_bases2.html.ep index 4e60b920f..0579ee336 100644 --- a/templates/main/list_bases2.html.ep +++ b/templates/main/list_bases2.html.ep @@ -78,7 +78,7 @@ % if ($machine->{is_active}) { - + % } % if ($machine->{id_clone}) { From 45201762f7be0646e67f133930f731700157eb6d Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 26 Oct 2017 11:07:36 +0200 Subject: [PATCH 042/170] [#422] Added hindi to user settings --- templates/bootstrap/user_settings.html.ep | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/bootstrap/user_settings.html.ep b/templates/bootstrap/user_settings.html.ep index e66c94931..c6ef479b0 100644 --- a/templates/bootstrap/user_settings.html.ep +++ b/templates/bootstrap/user_settings.html.ep @@ -31,6 +31,7 @@ + From b053bb95570face98d1175636d604a101b24ae69 Mon Sep 17 00:00:00 2001 From: Omar Date: Thu, 26 Oct 2017 13:19:21 +0200 Subject: [PATCH 043/170] [#331]Cancel buttons added to all the machine setting forms. --- templates/main/vm_copy.html.ep | 3 ++- templates/main/vm_description.html.ep | 3 ++- templates/main/vm_drivers.html.ep | 12 ++++++++++-- templates/main/vm_options.html.ep | 3 ++- templates/main/vm_remove.html.ep | 1 + templates/main/vm_rename.html.ep | 2 +- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/templates/main/vm_copy.html.ep b/templates/main/vm_copy.html.ep index ea60f15f0..8e6c82f19 100644 --- a/templates/main/vm_copy.html.ep +++ b/templates/main/vm_copy.html.ep @@ -23,7 +23,8 @@
- + +
diff --git a/templates/main/vm_description.html.ep b/templates/main/vm_description.html.ep index 50c2105eb..7fbc5de57 100644 --- a/templates/main/vm_description.html.ep +++ b/templates/main/vm_description.html.ep @@ -15,7 +15,8 @@
- + +
diff --git a/templates/main/vm_drivers.html.ep b/templates/main/vm_drivers.html.ep index a9f10e6e1..157a19999 100644 --- a/templates/main/vm_drivers.html.ep +++ b/templates/main/vm_drivers.html.ep @@ -33,14 +33,18 @@ + +
+
% if ($recommend{$driver_name}) { @@ -50,8 +54,12 @@
+ + % } - + + +

diff --git a/templates/main/vm_options.html.ep b/templates/main/vm_options.html.ep index aac5eac64..fcbb88e85 100644 --- a/templates/main/vm_options.html.ep +++ b/templates/main/vm_options.html.ep @@ -27,7 +27,8 @@
The machine will shutdown after these minutes
- + +
diff --git a/templates/main/vm_remove.html.ep b/templates/main/vm_remove.html.ep index ead50335d..6b0e6175b 100644 --- a/templates/main/vm_remove.html.ep +++ b/templates/main/vm_remove.html.ep @@ -23,6 +23,7 @@ > <%=l 'Delete this machine' %> +
diff --git a/templates/main/vm_rename.html.ep b/templates/main/vm_rename.html.ep index e2dc2a60e..7cefa7188 100644 --- a/templates/main/vm_rename.html.ep +++ b/templates/main/vm_rename.html.ep @@ -28,7 +28,7 @@ ng-click="rename(showmachine.id, showmachine.name)"> Rename - +
- +
diff --git a/templates/main/vm_description.html.ep b/templates/main/vm_description.html.ep index 7fbc5de57..1a0a05f41 100644 --- a/templates/main/vm_description.html.ep +++ b/templates/main/vm_description.html.ep @@ -16,7 +16,7 @@
- +
diff --git a/templates/main/vm_drivers.html.ep b/templates/main/vm_drivers.html.ep index 157a19999..038c3b472 100644 --- a/templates/main/vm_drivers.html.ep +++ b/templates/main/vm_drivers.html.ep @@ -42,7 +42,6 @@ -
@@ -54,13 +53,11 @@
- % } - - +
diff --git a/templates/main/vm_options.html.ep b/templates/main/vm_options.html.ep index fcbb88e85..9738fb0aa 100644 --- a/templates/main/vm_options.html.ep +++ b/templates/main/vm_options.html.ep @@ -28,7 +28,7 @@
The machine will shutdown after these minutes
- + diff --git a/templates/main/vm_remove.html.ep b/templates/main/vm_remove.html.ep index 6b0e6175b..f543272e1 100644 --- a/templates/main/vm_remove.html.ep +++ b/templates/main/vm_remove.html.ep @@ -23,7 +23,7 @@ > <%=l 'Delete this machine' %> - +
diff --git a/templates/main/vm_rename.html.ep b/templates/main/vm_rename.html.ep index 7cefa7188..40588c8ad 100644 --- a/templates/main/vm_rename.html.ep +++ b/templates/main/vm_rename.html.ep @@ -28,7 +28,7 @@ ng-click="rename(showmachine.id, showmachine.name)"> Rename - +
% }
-
+
From 263eac73ec1fa440c5ff4ac33930c0cfa572cc6c Mon Sep 17 00:00:00 2001 From: Tim Fechner Date: Fri, 27 Oct 2017 10:37:21 +0200 Subject: [PATCH 048/170] Correct german translations --- lib/Ravada/I18N/de.po | 56 ++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/lib/Ravada/I18N/de.po b/lib/Ravada/I18N/de.po index 9e52d65cf..9076dfec4 100644 --- a/lib/Ravada/I18N/de.po +++ b/lib/Ravada/I18N/de.po @@ -23,13 +23,13 @@ msgid "Tools" msgstr "Werkzeuge" msgid "Machines list" -msgstr "Maschinen liste" +msgstr "Maschinenliste" msgid "Users" msgstr "Benutzer" msgid "Choose a machine to start" -msgstr "Wähle eine Maschine zum starten" +msgstr "Wähle eine Maschine zum starten aus" msgid "Start" msgstr "Start" @@ -44,10 +44,10 @@ msgid "Prepare base" msgstr "Basis Vorbereiten" msgid "Clone" -msgstr "Klon" +msgstr "Klonen" msgid "Can't prepare base, remove base or delete. Machine has" -msgstr "Basis kann nicht vorbereitet werden, entferne oder loesche die Basis" +msgstr "Basis kann nicht vorbereitet werden, entferne oder lösche die Basis" msgid "Clone/s" msgstr "Klone" @@ -56,13 +56,13 @@ msgid "New" msgstr "Neu" msgid "Users List" -msgstr "Benutzer Liste" +msgstr "Benutzerliste" msgid "Name" msgstr "Name" msgid "Log Out" -msgstr "Ausloggen" +msgstr "Abmelden" msgid "Available machines" msgstr "Verfügbare Maschinen" @@ -77,10 +77,10 @@ msgid "About" msgstr "Über" msgid "Messages" -msgstr "Nachricht" +msgstr "Nachrichten" msgid "Mark all as read" -msgstr "Markiere alle als gelesen" +msgstr "Alle als gelesen markieren" msgid "Settings" msgstr "Einstellungen" @@ -89,10 +89,10 @@ msgid "New machine" msgstr "Neue Maschine" msgid "I want to change my password" -msgstr "Ich möchte mein Passwort aendern" +msgstr "Ich möchte mein Passwort ändern" msgid "I want to change my Language" -msgstr "Ich will meine Sprache aendern" +msgstr "Ich will meine Sprache ändern" msgid "Language:" msgstr "Sprache:" @@ -107,31 +107,31 @@ msgid "Catalan" msgstr "Katalanisch" msgid "New Password:" -msgstr "Neues Passwort" +msgstr "Neues Passwort:" msgid "Confirm Password:" -msgstr "Bestätige Passwort" +msgstr "Bestätige Passwort:" msgid "Submit" msgstr "Einreichen" msgid "Your language has been successfully changed" -msgstr "Deine Sprache wurde erfolgreich geaendert" +msgstr "Deine Sprache wurde erfolgreich geändert" msgid "Your password has been successfully changed" -msgstr "Dein Passwort wurde erfolgreich geaendert" +msgstr "Dein Passwort wurde erfolgreich ge#ndert" msgid "Password is too short" msgstr "Passwort ist zu kurz" msgid "Password fields are not matching" -msgstr "Die Passwoerter stimmen nicht ueberein" +msgstr "Die Passwörter stimmen nicht überein" msgid "Some of the password fields are empty" msgstr "Einige der Passwortfelder sind leer" msgid "Public" -msgstr "Oeffentlich" +msgstr "Öffentlich" msgid "Status" msgstr "Status" @@ -146,7 +146,7 @@ msgid "Down" msgstr "Runter" msgid "Running" -msgstr "Laeuft" +msgstr "Läuft" msgid "Shutdown" msgstr "Herunterfahren" @@ -203,13 +203,13 @@ msgid "Messages" msgstr "Nachrichten" msgid "Admin tools" -msgstr "Administrator Werkzeuge" +msgstr "Administratorwerkzeuge" msgid "Remove base" msgstr "Entferne Basis" msgid "Public" -msgstr "Oeffentlich" +msgstr "Öffentlich" msgid "New Base" msgstr "Neue Basis" @@ -230,7 +230,7 @@ msgid "Will remove all the contents of the machine" msgstr "Entfernt den gesamten Inhalt der Maschine" msgid "Are you sure?" -msgstr "Bist du dir Sicher?" +msgstr "Sind Sie sicher?" msgid "Yes" msgstr "Ja" @@ -239,13 +239,13 @@ msgid "No" msgstr "Nein" msgid "Make public" -msgstr "Oeffentlich machen" +msgstr "Öffentlich machen" msgid "Machine settings" -msgstr "Maschinen einstellungen" +msgstr "Maschineneinstellungen" msgid "Cannot remove base, machine has clones" -msgstr "Base kann nicht entfernt werden, Maschine hat Klone" +msgstr "Basis kann nicht entfernt werden, Maschine hat Klone" msgid "Show/hide clones" msgstr "Zeige/Verstecke Klone" @@ -257,7 +257,7 @@ msgid "on your computer." msgstr "auf deinem Computer" msgid "Search in your distro, e.g. in Debian/Ubuntu with" -msgstr "" +msgstr "Suche in deiner Distribution (Debian/Ubuntu)" msgid "You'll need to install" msgstr "Suchen Sie in Ihrer Distribution, z.B. in Debian / Ubuntu mit" @@ -279,6 +279,8 @@ msgid "" "or copy the following lines in an ASCII file and save with extension .reg, " "then execute the file." msgstr "" +"oder kopieren Sie folgende zeilen in eine ASCII Datei und Speichern Sie diese mit" +"der .reg Erweiterung" msgid "Login" msgstr "Login" @@ -296,7 +298,7 @@ msgid "User" msgstr "Benutzer" msgid "Password" -msgstr "Password" +msgstr "Passwort" msgid "Start session" msgstr "Starte Sitzung" @@ -377,7 +379,7 @@ msgid "From Machine" msgstr "Von Maschine" msgid "Backend" -msgstr "Hintergrund" +msgstr "Server" msgid "Select Template" msgstr "Vorlage auswählen" @@ -404,7 +406,7 @@ msgid "Ram: (GB)" msgstr "Arbeitsspeicher: (GB)" msgid "Machine name is required." -msgstr "Maschinen name is erforderlich" +msgstr "Name der Maschinen ist erforderlich" msgid "Machine name can't exceed 20 characters." msgstr "Der Computername darf nicht länger als 20 Zeichen sein." From fe78f065ddb21ca06b94f2f7cbb51e3f1f8107c6 Mon Sep 17 00:00:00 2001 From: joelalju Date: Fri, 27 Oct 2017 17:50:00 +0200 Subject: [PATCH 049/170] [#405] list_bases edited. --- lib/Ravada/Front.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index dbf8eccd4..396fc6792 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -75,7 +75,7 @@ Returns a list of the base domains as a listref sub list_bases { my $self = shift; - my $sth = $CONNECTOR->dbh->prepare("SELECT id, id_base FROM domains where is_base=1"); + my $sth = $CONNECTOR->dbh->prepare("SELECT name, id FROM domains where is_base=1"); $sth->execute(); my @bases = (); From e5d4d5901fe57fb3d945aa00c88e84165469c646 Mon Sep 17 00:00:00 2001 From: Marc Schwede Date: Sat, 28 Oct 2017 21:54:50 +0200 Subject: [PATCH 050/170] Removed repeated occurence of msgid in en.po --- lib/Ravada/I18N/en.po | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/Ravada/I18N/en.po b/lib/Ravada/I18N/en.po index cc19ef9d9..02e344ec2 100644 --- a/lib/Ravada/I18N/en.po +++ b/lib/Ravada/I18N/en.po @@ -27,9 +27,6 @@ msgstr "" msgid "Machines list" msgstr "" -msgid "Users" -msgstr "" - msgid "Choose a machine to start" msgstr "" From cf16971680733ab9f91f7a8a2e8004cf5b7d2fca Mon Sep 17 00:00:00 2001 From: Marc Schwede Date: Sat, 28 Oct 2017 22:00:06 +0200 Subject: [PATCH 051/170] Removed repeated occurence of msgid in de.po --- lib/Ravada/I18N/de.po | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/lib/Ravada/I18N/de.po b/lib/Ravada/I18N/de.po index 9076dfec4..fcd30f3f7 100644 --- a/lib/Ravada/I18N/de.po +++ b/lib/Ravada/I18N/de.po @@ -25,9 +25,6 @@ msgstr "Werkzeuge" msgid "Machines list" msgstr "Maschinenliste" -msgid "Users" -msgstr "Benutzer" - msgid "Choose a machine to start" msgstr "Wähle eine Maschine zum starten aus" @@ -139,18 +136,12 @@ msgstr "Status" msgid "Actions" msgstr "Aktion" -msgid "Machines" -msgstr "Maschine" - msgid "Down" msgstr "Runter" msgid "Running" msgstr "Läuft" -msgid "Shutdown" -msgstr "Herunterfahren" - msgid "Screenshot" msgstr "Bildschirmfoto" @@ -199,18 +190,12 @@ msgstr "Maschinen" msgid "Users" msgstr "Benutzer" -msgid "Messages" -msgstr "Nachrichten" - msgid "Admin tools" msgstr "Administratorwerkzeuge" msgid "Remove base" msgstr "Entferne Basis" -msgid "Public" -msgstr "Öffentlich" - msgid "New Base" msgstr "Neue Basis" @@ -434,4 +419,4 @@ msgid "" "cloned from one base owned by the user." msgstr "" "kann die Einstellungen aller virtuellen Maschinen ändern " -"geklont von einer Basis, die dem Benutzer gehört."" +"geklont von einer Basis, die dem Benutzer gehört." \ No newline at end of file From cce4e84949aa43ad7370cec1e00b44e69f0e86ba Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 30 Oct 2017 11:41:28 +0100 Subject: [PATCH 052/170] Set type = KVM instead qemu --- lib/Ravada.pm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index fa2ffb63e..2c714ab3b 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -522,6 +522,15 @@ sub _update_data { $self->_update_user_grants(); $self->_update_domain_drivers_types(); $self->_update_domain_drivers_options(); + $self->_update_old_qemus(); +} + +sub _update_old_qemus($self) { + my $sth = $CONNECTOR->dbh->prepare("UPDATE vms SET vm_type='KVM'" + ." WHERE vm_type='qemu' AND name ='KVM_localhost'" + ); + $sth->execute; + } sub _set_url_isos($self, $new_url='http://localhost/iso/') { @@ -754,7 +763,7 @@ sub _create_vm_kvm { my $vm_kvm; - $vm_kvm = Ravada::VM::KVM->new( connector => ( $self->connector or $CONNECTOR )); + $vm_kvm = Ravada::VM::KVM->new( ); my ($internal_vm , $storage); $storage = $vm_kvm->dir_img(); From 301cd9567878c89586c9a9f87ec5beb6c7259e54 Mon Sep 17 00:00:00 2001 From: Tititesouris Date: Mon, 30 Oct 2017 13:57:18 +0100 Subject: [PATCH 053/170] Partially fixed French --- lib/Ravada/I18N/fr.po | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/Ravada/I18N/fr.po b/lib/Ravada/I18N/fr.po index 7a8189781..ee7dbc886 100644 --- a/lib/Ravada/I18N/fr.po +++ b/lib/Ravada/I18N/fr.po @@ -22,43 +22,43 @@ msgid "Restore" msgstr "Restaurer" msgid "Machine Name" -msgstr "Nom du Machine" +msgstr "Nom de la machine" msgid "Tools" msgstr "Outils" msgid "Machines List" -msgstr "Liste de Machines" +msgstr "Liste des machines" msgid "Users" msgstr "Utilisateurs" msgid "Choose a Machine to Start" -msgstr "Choisisez une Machine pour Débuter" +msgstr "Choisisez une machine pour commencer" msgid "Start" -msgstr "Début" +msgstr "Commencer" msgid "Stop" -msgstr "Arrêt" +msgstr "Arrêter" msgid "View" -msgstr "Vue" +msgstr "Voir" msgid "Prepare Base" -msgstr "Preparer Base" +msgstr "Preparer la base" msgid "Clone" msgstr "Cloner" msgid "Can't Prepare Base, Remove Base nor Delete. Machine has" -msgstr "Ne peut pas preparer la base, retirez ou effacez la base" +msgstr "La base ne peut pas être preparée, supprimée ou effacée. La machine a" msgid "Clone/s" -msgstr "Clones" +msgstr "Clone(s)" msgid "NEW" -msgstr "Nouveau" +msgstr "NOUVEAU" msgid "Users List" msgstr "Liste d'utilisateurs" @@ -67,16 +67,16 @@ msgid "Name" msgstr "Nom" msgid "Log Out" -msgstr "Déconnecter" +msgstr "Déconnexion" msgid "Available Machines" -msgstr "Machines Disponibles" +msgstr "Machines disponibles" msgid "Help" msgstr "Aide" msgid "Requirements" -msgstr "Exigences" +msgstr "Requis" msgid "About" msgstr "À propos" @@ -91,16 +91,16 @@ msgid "Settings" msgstr "Paramètres" msgid "New Machine" -msgstr "Nouvelle Machine" +msgstr "Nouvelle machine" msgid "Paused" -msgstr "En Pause" +msgstr "En pause" msgid "Prepare base" -msgstr "Preparez Base" +msgstr "Preparer la base" msgid "Machine locked by requested" -msgstr "Machine verrouillée par demande" +msgstr "Machine verrouillée sur demande" msgid "process" msgstr "Processus" @@ -109,10 +109,10 @@ msgid "Copy" msgstr "Copie" msgid "Error!" -msgstr "Erreur" +msgstr "Erreur !" msgid "Backend no available!" -msgstr "Interne indisponible" +msgstr "Système indisponible" msgid "Subject" msgstr "Sujet" From ffe6899d4358af5d0f827f76a63243564342cc6e Mon Sep 17 00:00:00 2001 From: Tititesouris Date: Mon, 30 Oct 2017 15:27:18 +0100 Subject: [PATCH 054/170] Fixed french translation --- lib/Ravada/I18N/fr.po | 106 +++++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/lib/Ravada/I18N/fr.po b/lib/Ravada/I18N/fr.po index ee7dbc886..828d1a7df 100644 --- a/lib/Ravada/I18N/fr.po +++ b/lib/Ravada/I18N/fr.po @@ -137,13 +137,13 @@ msgid "Mark as UnRead" msgstr "Marquer comme non lu" msgid "No message to show!" -msgstr "Aucune Message à Lire" +msgstr "Aucun message à lire" msgid "Admin" msgstr "Administrateur" msgid "Show/Hide clones" -msgstr "Afficher/Masquer des clones" +msgstr "Afficher/Masquer les clones" msgid "I want to change my password" msgstr "Je veut changer mon mot de passe" @@ -152,7 +152,7 @@ msgid "I want to change my language" msgstr "Je veut modifier ma langue" msgid "Language:" -msgstr "Langue:" +msgstr "Langue :" msgid "English" msgstr "Anglais" @@ -164,10 +164,10 @@ msgid "Catalan" msgstr "Catalan" msgid "New Password:" -msgstr "Nouvelle mot de passe:" +msgstr "Nouveau mot de passe :" msgid "Confirm Password:" -msgstr "Confirmer mot de passe" +msgstr "Confirmer le mot de passe" msgid "Submit" msgstr "Soumettre" @@ -176,16 +176,16 @@ msgid "Your language has been changed successfully" msgstr "Votre langue a été modifiée avec succès" msgid "Your password has been changed successfully" -msgstr "votre mot de passe a été modifiée avec succès" +msgstr "votre mot de passe a été modifié avec succès" msgid "Password too small" msgstr "Votre mot de passe est trop court" msgid "Password fields aren't equal" -msgstr "Les mots de passe ne sont pas égales" +msgstr "Les mots de passe sont différents" msgid "Some of the password's fields are empty" -msgstr "Quelques mots de passe sont vides" +msgstr "Un mot de passe n'a pas été renseigné" msgid "Public" msgstr "Public" @@ -200,10 +200,10 @@ msgid "Down" msgstr "Arrêté" msgid "Running" -msgstr "Fonctionne" +msgstr "En marche" msgid "ShutDown" -msgstr "Fermer" +msgstr "Éteindre" msgid "Screenshot" msgstr "Capture d'écran" @@ -224,7 +224,7 @@ msgid "Admin tools" msgstr "Outils d'administration" msgid "Remove base" -msgstr "Supprimer base" +msgstr "Supprimer la base" msgid "public" msgstr "Public" @@ -233,19 +233,19 @@ msgid "Hybernate" msgstr "Hiberner" msgid "Shutdown" -msgstr "Fermer" +msgstr "Éteindre" msgid "action" msgstr "action" msgid "New Base" -msgstr "Base Nouveau" +msgstr "Nouvelle base" msgid "will remove all the contents of the machine" -msgstr "supprimer tout les contenus de machine" +msgstr "supprimera tous les éléments de la machine" msgid "Are you sure?" -msgstr "Vous êtes certain?" +msgstr "Êtes-vous certain ?" msgid "Yes" msgstr "Oui" @@ -254,45 +254,45 @@ msgid "No" msgstr "Non" msgid "Make public" -msgstr "Rendre publique" +msgstr "Rendre public" msgid "Machine settings" -msgstr "Réglage de machine" +msgstr "Réglage de la machine" msgid "Cannot remove base, machine has clones" -msgstr "Ne peut pas enlever la base, la machine a un clone" +msgstr "La base ne peut pas être supprimée car elle a des clones" msgid "For spice redirection you'll need to install" -msgstr "Pour Spice redirection vous necessitez installer" +msgstr "Pour utiliser la redirection Spice vous devez installer" msgid "in your computer." -msgstr "dans votre ordinateur" +msgstr "sur votre ordinateur." msgid "Search in your distro, e.g. in Debian/Ubuntu with" -msgstr "Cherchez dans votre distro, par example dans Debian/Ubuntu avec" +msgstr "Cherchez dans votre distro, par exemple dans Debian/Ubuntu avec" msgid "You'll need to install" -msgstr "vous necessitez installer" +msgstr "Vous devez installer" msgid "e.g. VirtViewer v5.0-256 in your computer." -msgstr "par example VirtViewer v5.0-256 dans votre ordinateur. " +msgstr "par exemple VirtViewer v5.0-256 sur votre ordinateur." msgid "" "Be aware that in Windows, spice redirection is not automatically. It's " "necessary associate protocol with the app." msgstr "" -"Faites attention quoi dans Windows, Spice redirection n'est pas automatiquement activée." -"Il est necessaire d'associer le protocole avec l'application." +"Notez que sur Windows, la redirection Spice n'est pas automatiquement activée." +"Il est nécessaire d'associer le protocole à l'application." msgid "To make this possible, download" -msgstr "pour rendre cela possible, téléchargez" +msgstr "Pour que ce soit possible, téléchargez" msgid "" "or copy the following lines in an ASCII file and save with extension .reg, " "then execute the file." msgstr "" -"ou copiez les lingnes suivantes dans un fichier et enregistrez avec extension .reg" -"ensuit exécutez le fichier" +"ou copiez les lignes suivantes dans un fichier ASCII et enregistrez le avec l'extension .reg, " +"ensuite exécutez le fichier" msgid "Login" @@ -302,10 +302,10 @@ msgid "Welcome" msgstr "Bienvenue" msgid "It is required a viewer to run the virtual machines." -msgstr "Il necessite un logiciel visionneuse pour demarrer les machines virtuelles." +msgstr "Il est nécessaire d'avoir une visionneuse pour démarrer les machines virtuelles." msgid "Virtual Machines" -msgstr "Machine Virtuelle" +msgstr "Machines Virtuelles" msgid "user" msgstr "Utilisateur" @@ -314,74 +314,74 @@ msgid "password" msgstr "Mot de passe" msgid "Start session" -msgstr "Commencer session" +msgstr "Commencer la session" msgid "Login with Intranet UPC's username." -msgstr "Connectez avec le Nom d'utilisateur de la UPC" +msgstr "Connectez avec le nom d'utilisateur de l'intranet UPC." msgid "Permissions" msgstr "Permissions" msgid "can change the settings of owned virtual machines." -msgstr "Peut changer les reglages des machines virtuelles possédees" +msgstr "peut changer les réglages des machines virtuelles appartenant à l'utilisateur." msgid "can change the settings of any virtual machines." -msgstr "Peut changer les reglages de n'importe quelle machine virtuelle" +msgstr "peut changer les réglages de n'importe quelle machine virtuelle." msgid "" "can change the settings of any virtual machines " "cloned from one base owned by the user." msgstr "" -"Peut changer les reglages des n'importe quelle machine virtuelle" -"clonées d'une base sous posession de l'utilisateur" +"peut changer les réglages des n'importe quelle machine virtuelle " +"clonée d'une base appartenant à l'utilisateur." msgid "can clone public virtual machines." -msgstr "Peut cloner les machines virtuelles publiques" +msgstr "peut cloner les machines virtuelles publiques." msgid "can clone any virtual machine." -msgstr "Ppeut cloner n'importe quelle machine virtuelle" +msgstr "peut cloner n'importe quelle machine virtuelle." msgid "can create bases." -msgstr "Peut créer des bases" +msgstr "peut créer des bases." msgid "can create virtual machines." -msgstr "Peut créer des machines virtuelles" +msgstr "peut créer des machines virtuelles." msgid "can grant permissions to other users" -msgstr "Peut donner des permissions á autres utilisateurs" +msgstr "peut donner des permissions à d'autres utilisateurs" msgid "can hibernate any virtual machine." -msgstr "Peut hiberner n'importe quelle machine virtuelle" +msgstr "peut hiberner n'importe quelle machine virtuelle." msgid "can hibernate clones from virtual machines owned by the user." -msgstr "Peut hiberner des clones des machines virtuelles possédees" +msgstr "peut hiberner les clones des machines virtuelles appartenant à l'utilisateur." msgid "can hibernate any clone." -msgstr "Peut hiberner n'importe quelle clones" +msgstr "peut hiberner n'importe quel clone." msgid "can remove any virtual machines owned by the user." -msgstr "Peut supprimer n'importe quelle machine virtuelle possédée par l'utilizateur" +msgstr "peut supprimer n'importe quelle machine virtuelle appartenant à l'utilisateur." msgid "can remove any virtual machine." -msgstr "Peut supprimer n'importe quelle machine virtuelle" +msgstr "peut supprimer n'importe quelle machine virtuelle." msgid "can remove clones from virtual machines owned by the user." -msgstr "Peut supprimer des clones des machines virtuelles possédées par l'utilizateur" +msgstr "peut supprimer les clones des machines virtuelles appartenant à l'utilisateur." msgid "can remove any clone." -msgstr "Peut supprimer n'importe quelle clones" +msgstr "peut supprimer n'importe quel clone." msgid "can take a screenshot of any virtual machine owned by the user." -msgstr "Peut prendre une capture d'écran de n'importe quelle machine virtuelle possédée par l'utilizateur" +msgstr "peut prendre une capture d'écran de n'importe quelle machine virtuelle appartenant à l'utilisateur." msgid "can take a screenshot of any virtual machine." -msgstr "Peut prendre une capture d'écran de n'importe quelle machine virtuelle possédée" +msgstr "peut prendre une capture d'écran de n'importe quelle machine virtuelle." msgid "can shutdown any virtual machine." -msgstr "Peut fermer n'importe quelle machine virtuelle" +msgstr "peut éteindre n'importe quelle machine virtuelle." msgid "can shutdown clones from virtual machines owned by the user." -msgstr "Peut fermer les clones des machines virtuelles possédées par l'utilizateur" +msgstr "peut éteindre les clones des machines virtuelles appartenant à l'utilizateur" msgid "Submit Query" -msgstr "Soumettre Requête" +msgstr "Soumettre la requête" From 0a4368e7f2fa6059358b94abd5c4a393212efc5e Mon Sep 17 00:00:00 2001 From: Matthew Musgrove Date: Mon, 30 Oct 2017 14:18:16 -0500 Subject: [PATCH 055/170] Review English Translation --- lib/Ravada/I18N/en.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Ravada/I18N/en.po b/lib/Ravada/I18N/en.po index 02e344ec2..ad08a3586 100644 --- a/lib/Ravada/I18N/en.po +++ b/lib/Ravada/I18N/en.po @@ -18,7 +18,7 @@ msgstr "" msgid "Ravada broker" msgstr "" -msgid "Name of the machine" +msgid "Machine name" msgstr "" msgid "Tools" @@ -90,7 +90,7 @@ msgstr "" msgid "I want to change my password" msgstr "" -msgid "I want to change my Language" +msgid "I want to change my language" msgstr "" msgid "Language:" @@ -123,7 +123,7 @@ msgstr "" msgid "Password is too short" msgstr "" -msgid "Password fields are not matching" +msgid "Password fields do not match" msgstr "" msgid "Some of the password fields are empty" From b94b9bad6bdf19901fbb0d83e7453ac5dd1758bc Mon Sep 17 00:00:00 2001 From: Luca Bezerra Date: Mon, 30 Oct 2017 21:45:36 -0300 Subject: [PATCH 056/170] Fixed PT translation. --- lib/Ravada/I18N/pt.po | 59 ++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/lib/Ravada/I18N/pt.po b/lib/Ravada/I18N/pt.po index 8110874e9..ee8c301a9 100644 --- a/lib/Ravada/I18N/pt.po +++ b/lib/Ravada/I18N/pt.po @@ -1,13 +1,14 @@ # Translators: # Joel Alarcón , 2017 # Fernando Verdugo , 2017 +# Luca Bezerra , 2017 msgid "" msgstr "" "Project-Id-Version: 0.1.0-alpha\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-01-03 10:12+0300\n" "PO-Revision-Date: 2017-05-02 16:20+0200\n" -"Last-Translator: Fernando Verdugo fernando@etsetb.upc.edu\n" +"Last-Translator: Luca Bezerra lucabezerra@gmail.com\n" "Language-Team: \n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -48,7 +49,7 @@ msgid "Clone" msgstr "Clonar" msgid "Can't Prepare Base, Remove Base nor Delete. Machine has" -msgstr "Não se pôde Preaparar ou Remover a Base. A Máquina tem" +msgstr "Não é possível Preparar Base, Remover Base ou Deletar. A Máquina tem" msgid "Clone/s" msgstr "Clone/s" @@ -81,7 +82,7 @@ msgid "Messages" msgstr "Mensagens" msgid "Mark all as Read" -msgstr "Marcar Tudo como Lido" +msgstr "Marcar tudo como Lido" msgid "Settings" msgstr "Configurações" @@ -93,10 +94,10 @@ msgid "I want to change my password" msgstr "Eu quero mudar a minha senha" msgid "I want to change my language" -msgstr "Eu quero alterar a minha linguagem" +msgstr "Eu quero alterar o meu idioma" msgid "Language:" -msgstr "Linguagem:" +msgstr "Idioma:" msgid "English" msgstr "Inglês" @@ -117,7 +118,7 @@ msgid "Submit" msgstr "Enviar" msgid "Your language has been changed successfully" -msgstr "Sua linguagem foi alterada com sucesso" +msgstr "Seu idioma foi alterado com sucesso" msgid "Your password has been changed successfully" msgstr "Sua senha foi alterada com sucesso" @@ -150,7 +151,7 @@ msgid "Running" msgstr "Em execução" msgid "ShutDown" -msgstr "Desligada" +msgstr "Desligar" msgid "Screenshot" msgstr "Captura de Tela" @@ -186,7 +187,7 @@ msgid "Mark as Read" msgstr "Marcar como Lido" msgid "Mark as UnRead" -msgstr "Marcar como não Lido" +msgstr "Marcar como Não Lido" msgid "No message to show!" msgstr "Nenhuma mensagem para mostrar!" @@ -210,7 +211,7 @@ msgid "Remove base" msgstr "Remover base" msgid "public" -msgstr "pública" +msgstr "público" msgid "New Base" msgstr "Nova base" @@ -228,7 +229,7 @@ msgid "action" msgstr "ação" msgid "will remove all the contents of the machine" -msgstr "vai remover todos os conteúdos da máquina" +msgstr "vai remover todo o conteúdo da máquina" msgid "Are you sure?" msgstr "Você tem certeza?" @@ -271,7 +272,7 @@ msgid "" "necessary associate protocol with the app." msgstr "" "Note que no Windows o redirecionamento de spice não é automático. É " -"necessário associar o protocol com a aplicação." +"necessário associar o protocolo com a aplicação." msgid "To make this possible, download" msgstr "Para tornar isto possível, faça o download de" @@ -280,8 +281,8 @@ msgid "" "or copy the following lines in an ASCII file and save with extension .reg, " "then execute the file." msgstr "" -"Ou copie as seguintes linhas em um arquivo ASCII e salve-o com uma extensão " -".reg, então o execute" +"ou copie as seguintes linhas em um arquivo ASCII e salve-o com uma extensão " +".reg, então o execute." msgid "Login" msgstr "Entrar" @@ -290,7 +291,7 @@ msgid "Welcome" msgstr "Bem vindo" msgid "It is required a viewer to run the virtual machines." -msgstr "É necessário que um visualizador execute as máquinas virtuais" +msgstr "É necessário um visualizador para execute as máquinas virtuais." msgid "Virtual Machines" msgstr "Máquinas Virtuais" @@ -302,13 +303,13 @@ msgid "password" msgstr "senha" msgid "Start session" -msgstr "Iniciar seção" +msgstr "Iniciar sessão" msgid "Login with Intranet UPC's username." -msgstr "Entrar com o usuário da Intranet UPC" +msgstr "Entrar com o nome de usuário da Intranet UPC." msgid "bits) in your computer." -msgstr "bits) em seu computador" +msgstr "bits) em seu computador." msgid "Permissions" msgstr "Permissões" @@ -317,13 +318,13 @@ msgid "can change the settings of owned virtual machines." msgstr "pode alterar configurações de máquinas virtuais que possuir." msgid "can change the settings of any virtual machines." -msgstr "pode alterar as configurações de qualquer máquina virtual." +msgstr "pode alterar as configurações de quaisquer máquinas virtuais." msgid "can change the settings of any virtual machines " -msgstr "pode alterar as configurações de qualquer máquina virtual " +msgstr "pode alterar as configurações de quaisquer máquinas virtuais " msgid "cloned from one base owned by the user." -msgstr "clonada de uma das bases que o usuário possuir." +msgstr "clonada de uma das bases que o usuário possui." msgid "can clone public virtual machines." msgstr "pode clinar máquinas virtuais públicas." @@ -344,34 +345,34 @@ msgid "can hibernate any virtual machine." msgstr "pode hibernar qualquer máquina virtual." msgid "can hibernate clones from virtual machines owned by the user." -msgstr "pode hibernar clones de qualquer máquina virtual que o usuário possuir." +msgstr "pode hibernar clones de máquinas virtuais que o usuário possua." msgid "can hibernate any clone." -msgstr "pode hibernar qualquer clone" +msgstr "pode hibernar qualquer clone." msgid "can remove any virtual machines owned by the user." -msgstr "pode remover qualquer máquina virtuai que o usuário possuir." +msgstr "pode remover quaisquer máquinas virtuais que o usuário possua." msgid "can remove any virtual machine." msgstr "pode remover qualquer máquina virtual." msgid "can remove clones from virtual machines owned by the user." -msgstr "pode remover clones de qualquer máquina virtual que o usuário possuir." +msgstr "pode remover clones de máquinas virtuais que o usuário possua." msgid "can remove any clone." msgstr "pode remover qualquer clone." msgid "can take a screenshot of any virtual machine owned by the user." -msgstr "pode tirar capturas de tela de qualquer máquina virtual que o usuário possuir." +msgstr "pode tirar uma captura de tela de qualquer máquina virtual que o usuário possua." msgid "can take a screenshot of any virtual machine." -msgstr "pode tirar capturas de tela de qualquer máquina virtual." +msgstr "pode tirar uma captura de tela de qualquer máquina virtual." msgid "can shutdown any virtual machine." msgstr "pode desligar qualquer máquina virtual." msgid "can shutdown clones from virtual machines owned by the user." -msgstr "pode desligar clones de máquinas virtuais que o usuário possuir." +msgstr "pode desligar clones de máquinas virtuais que o usuário possua." msgid "Submit Query" msgstr "Submeter Consulta" @@ -439,5 +440,5 @@ msgid "" "can change the settings of any virtual machines " "cloned from one base owned by the user." msgstr "" -"pode alterar as configurações de qualquer máquina virtual " -"clonada de uma base possuída pelo usuário." +"pode alterar as configurações de quaisquer máquinas virtuais " +"clonadas de uma base possuída pelo usuário." From 3dc36f615799e057f98426b12c74516a73a0fb07 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Tue, 31 Oct 2017 09:09:23 +0100 Subject: [PATCH 057/170] [#411] Removed duplicated entries Thanks @mrmuskrat for pointing that out --- lib/Ravada/I18N/en.po | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/Ravada/I18N/en.po b/lib/Ravada/I18N/en.po index ad08a3586..76b00c8f8 100644 --- a/lib/Ravada/I18N/en.po +++ b/lib/Ravada/I18N/en.po @@ -75,9 +75,6 @@ msgstr "" msgid "About" msgstr "" -msgid "Messages" -msgstr "" - msgid "Mark all as read" msgstr "" @@ -129,18 +126,12 @@ msgstr "" msgid "Some of the password fields are empty" msgstr "" -msgid "Public" -msgstr "" - msgid "Status" msgstr "" msgid "Actions" msgstr "" -msgid "Machines" -msgstr "" - msgid "Down" msgstr "" @@ -219,9 +210,6 @@ msgstr "" msgid "Hibernate" msgstr "" -msgid "Shutdown" -msgstr "" - msgid "Action" msgstr "" From 2fc31c9210a9c041fb826d5c7b54ca5ecb8a9a22 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Tue, 31 Oct 2017 09:16:08 +0100 Subject: [PATCH 058/170] translators should read this --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 509a969e0..018176c22 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -50,6 +50,8 @@ everyone is a beginner at first :smile_cat: Follow this guide about running [Ravada in development mode](http://ravada.readthedocs.io/en/latest/devel-docs/run.html). +If you change a translation or language file make sure you follow this small [guide](http://ravada.readthedocs.io/en/latest/devel-docs/translations.html?highlight=translate) and don't forget to add the issue number when committing. + ### 6. Make a Pull Request At this point, you should switch back to your master branch and make sure it's From 393bde82ac353c6e5e45aee582e6ea90931d1de0 Mon Sep 17 00:00:00 2001 From: Varpie Date: Tue, 31 Oct 2017 11:14:58 +0000 Subject: [PATCH 059/170] Improving french translation Fixing a few typos, normalizing capital letters according to original text. --- lib/Ravada/I18N/fr.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/Ravada/I18N/fr.po b/lib/Ravada/I18N/fr.po index 828d1a7df..ae69d7537 100644 --- a/lib/Ravada/I18N/fr.po +++ b/lib/Ravada/I18N/fr.po @@ -34,7 +34,7 @@ msgid "Users" msgstr "Utilisateurs" msgid "Choose a Machine to Start" -msgstr "Choisisez une machine pour commencer" +msgstr "Choisissez une machine pour commencer" msgid "Start" msgstr "Commencer" @@ -46,13 +46,13 @@ msgid "View" msgstr "Voir" msgid "Prepare Base" -msgstr "Preparer la base" +msgstr "Préparer la base" msgid "Clone" msgstr "Cloner" msgid "Can't Prepare Base, Remove Base nor Delete. Machine has" -msgstr "La base ne peut pas être preparée, supprimée ou effacée. La machine a" +msgstr "La base ne peut pas être préparée, supprimée ou effacée. La machine a" msgid "Clone/s" msgstr "Clone(s)" @@ -76,7 +76,7 @@ msgid "Help" msgstr "Aide" msgid "Requirements" -msgstr "Requis" +msgstr "Prérequis" msgid "About" msgstr "À propos" @@ -97,7 +97,7 @@ msgid "Paused" msgstr "En pause" msgid "Prepare base" -msgstr "Preparer la base" +msgstr "Préparer la base" msgid "Machine locked by requested" msgstr "Machine verrouillée sur demande" @@ -167,7 +167,7 @@ msgid "New Password:" msgstr "Nouveau mot de passe :" msgid "Confirm Password:" -msgstr "Confirmer le mot de passe" +msgstr "Confirmer le mot de passe :" msgid "Submit" msgstr "Soumettre" @@ -176,7 +176,7 @@ msgid "Your language has been changed successfully" msgstr "Votre langue a été modifiée avec succès" msgid "Your password has been changed successfully" -msgstr "votre mot de passe a été modifié avec succès" +msgstr "Votre mot de passe a été modifié avec succès" msgid "Password too small" msgstr "Votre mot de passe est trop court" @@ -212,13 +212,13 @@ msgid "Machine locked by" msgstr "Machine verrouillée par" msgid "machines" -msgstr "Machines" +msgstr "machines" msgid "users" -msgstr "Utilisateurs" +msgstr "utilisateurs" msgid "messages" -msgstr "Messages" +msgstr "messages" msgid "Admin tools" msgstr "Outils d'administration" @@ -227,7 +227,7 @@ msgid "Remove base" msgstr "Supprimer la base" msgid "public" -msgstr "Public" +msgstr "public" msgid "Hybernate" msgstr "Hiberner" @@ -242,7 +242,7 @@ msgid "New Base" msgstr "Nouvelle base" msgid "will remove all the contents of the machine" -msgstr "supprimera tous les éléments de la machine" +msgstr "supprimera tout le contenu de la machine" msgid "Are you sure?" msgstr "Êtes-vous certain ?" From e781c8f4a01211df4e38e3acffdddebec1a90faf Mon Sep 17 00:00:00 2001 From: joelalju Date: Tue, 31 Oct 2017 16:21:58 +0100 Subject: [PATCH 060/170] [#405] Deleted unnecessary password fields on some selects from Front.pm --- lib/Ravada/Front.pm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index 396fc6792..4e5eff3d5 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -373,13 +373,12 @@ Returns a reference to a list of the users =cut sub list_users($self,$name=undef) { - my $sth = $CONNECTOR->dbh->prepare("SELECT id, name, password FROM users "); + my $sth = $CONNECTOR->dbh->prepare("SELECT id, name FROM users "); $sth->execute(); my @users = (); while ( my $row = $sth->fetchrow_hashref) { next if defined $name && $row->{name} !~ /$name/; - delete $row->{password}; push @users, ($row); } $sth->finish; @@ -574,8 +573,7 @@ sub search_domain { my $name = shift; - my $sth = $CONNECTOR->dbh->prepare("SELECT vm, id_owner, id_base, description, - spice_password FROM domains WHERE name=?"); + my $sth = $CONNECTOR->dbh->prepare("SELECT vm, id_owner, id_base, description FROM domains WHERE name=?"); $sth->execute($name); my $row = $sth->fetchrow_hashref; @@ -741,13 +739,12 @@ sub list_bases_anonymous { my $net = Ravada::Network->new(address => $ip); - my $sth = $CONNECTOR->dbh->prepare("SELECT id, id_base, spice_password FROM domains where is_base=1 AND is_public=1"); + my $sth = $CONNECTOR->dbh->prepare("SELECT id, id_base FROM domains where is_base=1 AND is_public=1"); $sth->execute(); my @bases = (); while ( my $row = $sth->fetchrow_hashref) { next if !$net->allowed_anonymous($row->{id}); - delete $row->{spice_password}; push @bases, ($row); } $sth->finish; From f798954b6ef8a428c4211b47ecb407e384c1d067 Mon Sep 17 00:00:00 2001 From: joelalju Date: Tue, 31 Oct 2017 17:44:35 +0100 Subject: [PATCH 061/170] [#425]Icon buttons added --- .../ng-templates/new_machine_template.html.ep | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/templates/ng-templates/new_machine_template.html.ep b/templates/ng-templates/new_machine_template.html.ep index 1fb5ddad4..f25be4a67 100644 --- a/templates/ng-templates/new_machine_template.html.ep +++ b/templates/ng-templates/new_machine_template.html.ep @@ -1,8 +1,8 @@
- -
+ +

- -
+ +
- -
+ +
@@ -90,7 +90,7 @@ align="right">Remove swap
- +
@@ -98,7 +98,7 @@
- +
From 9491c822492936b39df5395a3a018acf2672b14e Mon Sep 17 00:00:00 2001 From: joelalju Date: Tue, 31 Oct 2017 18:09:11 +0100 Subject: [PATCH 062/170] [#425] The info icons now have a field for the info --- templates/ng-templates/new_machine_template.html.ep | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/templates/ng-templates/new_machine_template.html.ep b/templates/ng-templates/new_machine_template.html.ep index f25be4a67..80366ea62 100644 --- a/templates/ng-templates/new_machine_template.html.ep +++ b/templates/ng-templates/new_machine_template.html.ep @@ -1,7 +1,8 @@
- +

- +
+ title="Choose the OS you want to install.">
Date: Fri, 3 Nov 2017 08:26:00 +0100 Subject: [PATCH 064/170] Get driver for any domain kind empty by default --- lib/Ravada/Domain.pm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index 199902b12..0674e9a8d 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -1554,6 +1554,19 @@ sub list_requests { return map { Ravada::Request->open($_->{id}) } @list; } +=head2 get_driver + +Returns the driver from a domain + +Argument: name of the device [ optional ] +Returns all the drivers if not passwed + + my $driver = $domain->get_driver('video'); + +=cut + +sub get_driver {} + sub _dbh { my $self = shift; _init_connector() if !$CONNECTOR || !$$CONNECTOR; From 3be21f3e608dd19722345cd448f103c5219c4d69 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 3 Nov 2017 12:23:23 +0100 Subject: [PATCH 065/170] [#443] fixed unique mac --- lib/Ravada/VM/KVM.pm | 49 ++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/lib/Ravada/VM/KVM.pm b/lib/Ravada/VM/KVM.pm index a5fb0cc51..6bea4ef27 100644 --- a/lib/Ravada/VM/KVM.pm +++ b/lib/Ravada/VM/KVM.pm @@ -1606,7 +1606,10 @@ sub _unique_mac { for my $nic ( $doc->findnodes('/domain/devices/interface/mac')) { my $nic_mac = $nic->getAttribute('address'); - return 0 if $mac eq lc($nic_mac); + if ( $mac eq lc($nic_mac) ) { + warn "mac clashes with domain ".$dom->get_name; + return 0; + } } } return 1; @@ -1631,31 +1634,37 @@ sub _xml_modify_mac { my @macparts = split/:/,$mac; + my @old_macs; + + for my $dom ($self->vm->list_all_domains) { + my $doc = $XML->load_xml(string => $dom->get_xml_description()) or die "ERROR: $!\n"; + + for my $nic ( $doc->findnodes('/domain/devices/interface/mac')) { + my $nic_mac = $nic->getAttribute('address'); + push @old_macs,($nic_mac); + } + } + + my $new_mac; - my $n_part = scalar(@macparts) -2; + for my $cont ( 1 .. 1000 ) { + my $pos = int(rand(2))+4; + my $num =sprintf "%02X", rand(0xff); + die "Missing num " if !defined $num; + $macparts[$pos] = $num; + $new_mac = lc(join(":",@macparts)); + my $n_part = scalar(@macparts) -2; + + last if (! grep /^$new_mac$/i,@old_macs); + } - for (;;) { - for my $last ( 0 .. 254 ) { - $last = sprintf("%X", $last); - $last = "0$last" if length($last)<2; - $macparts[-1] = $last; - $new_mac = join(":",@macparts); - if ( $self->_unique_mac($new_mac) ) { + if ( $self->_unique_mac($new_mac) ) { $if_mac->setAttribute(address => $new_mac); return; - } - $new_mac = undef; - } - my $new_part = hex($macparts[$n_part])+1; - if ($new_part > 255) { - $n_part--; - $new_part = 0; - die "I can't find a new unique mac" if !$n_part<0; - } - $macparts[$n_part] = sprintf("%X", $new_part); + } else { + die "I can't find a new unique mac"; } - die "I can't find a new unique mac" if !$new_mac; } From 5fc21453e89ea002499039a3c1d19109a145b48f Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Tue, 31 Oct 2017 16:25:05 +0100 Subject: [PATCH 066/170] [#439] test many nodes --- t/vm/z_101.t | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 t/vm/z_101.t diff --git a/t/vm/z_101.t b/t/vm/z_101.t new file mode 100644 index 000000000..65ad41e63 --- /dev/null +++ b/t/vm/z_101.t @@ -0,0 +1,97 @@ +use warnings; +use strict; + +use Data::Dumper; +use Test::More; +use Test::SQL::Data; + +use lib 't/lib'; +use Test::Ravada; + +my $test = Test::SQL::Data->new(config => 't/etc/sql.conf'); + +use_ok('Ravada'); + +my $FILE_CONFIG = 't/etc/ravada.conf'; + +my $RVD_BACK = rvd_back($test->connector, $FILE_CONFIG); +my $RVD_FRONT= rvd_front($test->connector, $FILE_CONFIG); + +my %ARG_CREATE_DOM = ( + KVM => [ id_iso => 1 ] + ,Void => [ ] +); + +my @ARG_RVD = ( config => $FILE_CONFIG, connector => $test->connector); + +my @VMS = keys %ARG_CREATE_DOM; + +############################################################# + +clean(); + +for my $vm_name (reverse sort @VMS) { + + diag("Testing $vm_name VM"); + + my $vm; + + eval { $vm = rvd_back->search_vm($vm_name) }; + + SKIP: { + my $msg = "SKIPPED test: No $vm_name VM found "; + if ($vm && $vm_name =~ /kvm/i && $>) { + $msg = "SKIPPED: Test must run as root"; + $vm = undef; + } + + diag($msg) if !$vm; + skip $msg,10 if !$vm; + + my $domain = create_domain($vm_name); + my $t0 = time; + my $clone0; + + my $n_clones = 102; + for my $count ( 1 .. $n_clones ) { + my $name = new_domain_name(); + my $clone; + eval { + $clone = $domain->clone( + name => $name + ,user => user_admin + ); + }; + is(''.$@,'') or next; + ok($clone,"Expecting a clone from ".$domain->name) or next; + + eval { $clone->start(user_admin) }; + is(''.$@,''); + is($clone->is_active,1); + + if ($clone0 ) { + eval { $clone0->shutdown_now(user_admin) }; + is(''.$@,''); + is($clone0->is_active,0); + + if (time - $t0 > 5 ) { + $t0 = time; + diag("[$vm_name] testing clone $count of $n_clones ".$clone0->name); + } + } + $clone0 = $clone; + if ($clone->can_hybernate) { + eval { $clone->hybernate(user_admin) }; + is(''.$@,''); + is($clone->is_paused,1); + + eval { $clone->start(user_admin) }; + is(''.$@,''); + is($clone->is_active,1); + } + } + } +} + +clean(); +done_testing(); From 99e3278bdae580d87d875f1ee6030bed59ddf27b Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Tue, 31 Oct 2017 16:25:26 +0100 Subject: [PATCH 067/170] [#439] Create the new uuid from a large random number --- lib/Ravada/VM/KVM.pm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/Ravada/VM/KVM.pm b/lib/Ravada/VM/KVM.pm index a5fb0cc51..5924c2035 100644 --- a/lib/Ravada/VM/KVM.pm +++ b/lib/Ravada/VM/KVM.pm @@ -1244,25 +1244,24 @@ sub _xml_modify_uuid { my $doc = shift; my ($uuid) = $doc->findnodes('/domain/uuid/text()'); - random:while (1) { - my $new_uuid = _new_uuid($uuid); - next if $new_uuid eq $uuid; - for my $dom ($self->vm->list_all_domains) { - next random if $dom->get_uuid_string eq $new_uuid; - } - $uuid->setData($new_uuid); - last; + my @known_uuids; + for my $dom ($self->vm->list_all_domains) { + push @known_uuids,($dom->get_uuid_string); } + my $new_uuid = _unique_uuid($uuid,@known_uuids); + $uuid->setData($new_uuid); } sub _unique_uuid { my ($self, $uuid, @uuids) = @_; my ($first,$last) = $uuid =~ m{(.*)([0-9a-f]{6})}; - for (1..100) { + for (1..1000) { my $new_last = int(rand(0x100000)); - my $new_uuid = sprintf("%s%06d",$first,$new_last); + my $new_uuid = sprintf("%s%06d",$first,substr($new_last,0,6)); + confess "Wrong uuid size ".length($new_uuid)." <> ".length($uuid) + if length($new_uuid) != length($uuid); return $new_uuid if !grep /^$new_uuid$/,@uuids; } confess "I can't find a new unique uuid"; From f404ee28d864b92ca182c6b711737e746cc43682 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 6 Nov 2017 12:27:24 +0100 Subject: [PATCH 068/170] [#408] added xubuntu artful 17.10 --- lib/Ravada.pm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index b770163c0..bd747d95a 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -212,6 +212,16 @@ sub _update_isos { ,xml_volume => 'xenial64-volume.xml' ,sha256_url => 'http://fedora.mirrors.ovh.net/linux/releases/25/Workstation/x86_64/iso/Fedora-Workstation-25-.*-x86_64-CHECKSUM' } + ,xubuntu_artful => { + name => 'Xubuntu Artful Aardvark' + ,description => 'Xubuntu 17.10 Artful Aardvark 64 bits' + ,arch => 'amd64' + ,xml => 'yakkety64-amd64.xml' + ,xml_volume => 'yakkety64-volume.xml' + ,md5_url => 'http://archive.ubuntu.com/ubuntu/dists/artful/main/installer-amd64/current/images/MD5SUMS' + ,url => 'http://archive.ubuntu.com/ubuntu/dists/artful/main/installer-amd64/current/images/netboot/mini.iso' + ,rename_file => 'xubuntu_artful.iso' + } ,xubuntu_zesty => { name => 'Xubuntu Zesty Zapus' ,description => 'Xubuntu 17.04 Zesty Zapus 64 bits' From 4ced2a100b0519d979bef3d3d5329b886dc9e626 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 6 Nov 2017 12:43:11 +0100 Subject: [PATCH 069/170] Allow install in older ubuntus --- Makefile.PL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.PL b/Makefile.PL index 55dd35e79..c51cad995 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -6,7 +6,7 @@ use ExtUtils::MakeMaker; WriteMakefile( VERSION => '0.01', PREREQ_PM => { - 'Mojolicious' => '7.14' + 'Mojolicious' => '7.01' ,'DBIx::Connector' => 0 ,'Authen::Passphrase' => 0 ,'IPC::Run3' => 0 From 0e0585cbf1f1dbc95bdc56c072a546ee73c52804 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 6 Nov 2017 19:34:43 +0100 Subject: [PATCH 070/170] [#420] test storage refresh --- t/request/50_refresh_storage.t | 48 ++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 t/request/50_refresh_storage.t diff --git a/t/request/50_refresh_storage.t b/t/request/50_refresh_storage.t new file mode 100644 index 000000000..2837f698b --- /dev/null +++ b/t/request/50_refresh_storage.t @@ -0,0 +1,48 @@ +use warnings; +use strict; + +use Carp qw(carp confess cluck); +use Data::Dumper; +use POSIX qw(WNOHANG); +use Test::More; +use Test::SQL::Data; + +use_ok('Ravada'); +use_ok('Ravada::Request'); + +use lib 't/lib'; +use Test::Ravada; + +my $test = Test::SQL::Data->new(config => 't/etc/sql.conf'); + +init($test->connector, 't/etc/ravada.conf'); + +my $USER = create_user("foo","bar"); + +################################################################### + +clean(); + +for my $vm_name (qw(KVM)) { + my $vm; + my $msg = "SKIPPED: virtual manager $vm_name not found"; + eval { + $vm= rvd_back->search_vm($vm_name) if rvd_back(); + + if ($vm && $vm_name =~ /kvm/i && $>) { + $msg = "SKIPPED: Test must run as root"; + $vm= undef; + } + + }; + + SKIP: { + diag($msg) if $msg; + skip($msg,10) if !$vm; + + diag("Testing requests with $vm_name"); + } +} + +done_testing(); +clean(); From 46709e1af774c7698fc44252cdb593db92c9ebf3 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Tue, 7 Nov 2017 11:02:14 +0100 Subject: [PATCH 071/170] [#420] test refresh VM --- t/request/50_refresh_storage.t | 58 ++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/t/request/50_refresh_storage.t b/t/request/50_refresh_storage.t index 2837f698b..683e90bb1 100644 --- a/t/request/50_refresh_storage.t +++ b/t/request/50_refresh_storage.t @@ -21,6 +21,55 @@ my $USER = create_user("foo","bar"); ################################################################### +sub test_request { + my $vm_name = shift; + my $id_vm = shift; + + my $file = "a.iso"; + + my $vm = rvd_back->search_vm($vm_name); + + # clean old files + my @files = $vm->search_volume_path($file); + for my $old_file (@files) { + unlink $old_file or die "$! $old_file" + if -e $old_file; + } + $vm->_refresh_storage_pools(); + + # check there are no files + @files = $vm->search_volume_path($file); + ok(!scalar @files) or next; + + my $file_out = $vm->dir_img."/$file"; + unlink $file_out or die "$! $file_out" + if -e $file_out; + + open my $out,'>',$file_out or die "$! $file_out"; + print $out "rosa d'abril\n"; + close $out; + ok(-e $file_out,"Expecting a file $file_out"); + + my $request; + + eval { + my @args; + @args = (id_vm => $id_vm ) if $id_vm; + $request = Ravada::Request->refresh_storage(@args); + }; + is($@,''); + ok($request,"Expecting a request") or next; + rvd_back->_process_all_requests_dont_fork(); + + is($request->status,'done'); + is($request->error,''); + + @files = $vm->search_volume_path($file); + ok(scalar @files,"Expecting $file exists on storage pool"); +} + +######################################################### + clean(); for my $vm_name (qw(KVM)) { @@ -37,12 +86,17 @@ for my $vm_name (qw(KVM)) { }; SKIP: { - diag($msg) if $msg; + diag($msg) if !$vm; skip($msg,10) if !$vm; diag("Testing requests with $vm_name"); + + test_request($vm_name, $vm->id); + test_request($vm_name); } + + } -done_testing(); clean(); +done_testing(); From 2b02261c2d894d81362ca6c8da4087b304e07b45 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Tue, 7 Nov 2017 11:02:40 +0100 Subject: [PATCH 072/170] [#420] call to refresh storage from request --- lib/Ravada.pm | 12 ++++++++++++ lib/Ravada/Request.pm | 24 ++++++++++++++++++++++++ lib/Ravada/VM/KVM.pm | 10 ++++++++++ 3 files changed, 46 insertions(+) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index 2c714ab3b..f63e2d81b 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -1858,6 +1858,17 @@ sub _cmd_set_driver { $domain->set_driver_id($request->args('id_option')); } +sub _cmd_refresh_storage($self, $request) { + + my $vm; + if ($request->defined_arg('id_vm')) { + $vm = Ravada::VM->open($request->defined_arg('id_vm')); + } else { + $vm = $self->search_vm('KVM'); + } + $vm->refresh_storage(); +} + sub _req_method { my $self = shift; my $cmd = shift; @@ -1882,6 +1893,7 @@ sub _req_method { ,open_iptables => \&_cmd_open_iptables ,list_vm_types => \&_cmd_list_vm_types ,force_shutdown => \&_cmd_force_shutdown +,refresh_storage => \&_cmd_refresh_storage ); return $methods{$cmd}; diff --git a/lib/Ravada/Request.pm b/lib/Ravada/Request.pm index 75a48c841..a129cb5c6 100644 --- a/lib/Ravada/Request.pm +++ b/lib/Ravada/Request.pm @@ -60,6 +60,7 @@ our %VALID_ARG = ( ,set_driver => {uid => 1, id_domain => 1, id_option => 1} ,hybernate=> {uid => 1, id_domain => 1} ,download => {uid => 2, id_iso => 1, id_vm => 2, delay => 2} + ,refresh_storage => { id_vm => 2 } ); our %CMD_SEND_MESSAGE = map { $_ => 1 } @@ -808,6 +809,29 @@ sub download { } +=head2 refresh_storage + +Refreshes a storage pool + +=cut + +sub refresh_storage { + my $proto = shift; + my $class = ref($proto) || $proto; + + my $args = _check_args('refresh_storage', @_ ); + + my $self = {}; + bless($self,$class); + + return $self->_new_request( + command => 'refresh_storage' + , args => $args + ); + + +} + sub AUTOLOAD { my $self = shift; diff --git a/lib/Ravada/VM/KVM.pm b/lib/Ravada/VM/KVM.pm index 477794835..38ad2d30b 100644 --- a/lib/Ravada/VM/KVM.pm +++ b/lib/Ravada/VM/KVM.pm @@ -272,6 +272,16 @@ sub _refresh_storage_pools($self) { } } +=head2 refresh_storage + +Refreshes all the storage pools + +=cut + +sub refresh_storage($self) { + $self->_refresh_storage_pools(); +} + =head2 search_volume_path_re Searches for a volume in all the storage pools known to the Virtual Manager From 834a3abf80e5f57169e3c0cbfc43ab06ed43bdc7 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Tue, 7 Nov 2017 11:02:54 +0100 Subject: [PATCH 073/170] [#420] refresh storage before new machine --- rvd_front.pl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rvd_front.pl b/rvd_front.pl index a708911b2..95d3fafc1 100644 --- a/rvd_front.pl +++ b/rvd_front.pl @@ -954,6 +954,9 @@ sub new_machine { req_new_domain($c); $c->redirect_to("/admin/machines"); } + } else { + my $req = Ravada::Request->refresh_storage(); + # TODO handle possible errors } $c->stash(errors => \@error); push @{$c->stash->{js}}, '/js/admin.js'; From daf7cf72fdace0f823684043628e999ecbf1b53c Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Tue, 7 Nov 2017 12:36:41 +0100 Subject: [PATCH 074/170] [#416] escape values as suggested by nonamed01 --- lib/Ravada/Auth/LDAP.pm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/Ravada/Auth/LDAP.pm b/lib/Ravada/Auth/LDAP.pm index 32974de31..1236ebc6b 100644 --- a/lib/Ravada/Auth/LDAP.pm +++ b/lib/Ravada/Auth/LDAP.pm @@ -18,6 +18,7 @@ use Moose; use Net::LDAP; use Net::LDAPS; use Net::LDAP::Entry; +use Net::LDAP::Util qw(escape_filter_value); use Net::Domain qw(hostdomain); use Ravada::Auth::SQL; @@ -65,6 +66,9 @@ sub add_user { _init_ldap_admin(); + $name = escape_filter_value($name); + $password = escape_filter_value($password); + confess "No dc base in config ".Dumper($$CONFIG->{ldap}) if !_dc_base(); my ($givenName, $sn) = $name =~ m{(\w+)\.(.*)}; @@ -124,6 +128,8 @@ Search user by uid sub search_user { my $username = shift; + $username = escape_filter_value($username); + _init_ldap(); my $ldap = (shift or $LDAP_ADMIN); @@ -172,6 +178,8 @@ sub add_group { my $name = shift; my $base = (shift or _dc_base()); + $name = escape_filter_value($name); + my $mesg = $LDAP_ADMIN->add( cn => $name ,dn => "cn=$name,ou=groups,$base" @@ -224,6 +232,8 @@ sub search_group { my $base = ( $args{base} or "ou=groups,"._dc_base() ); my $ldap = ( $args{ldap} or $LDAP ); + $name = escape_filter_value($name); + my $mesg = $ldap ->search ( filter => "cn=$name" ,base => $base From 432e00229ee42783ee92d21b6f726d5f499478ed Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 9 Nov 2017 15:27:43 +0100 Subject: [PATCH 075/170] [#457] remove old debian 9 link --- lib/Ravada.pm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index f63e2d81b..5a87b9153 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -515,9 +515,19 @@ sub _update_table($self, $table, $field, $data) { } } +sub _remove_old_isos { + my $self = shift; + my $sth = $CONNECTOR->dbh->prepare("DELETE FROM iso_images " + ." WHERE url like '%debian-9.0%iso'" + ); + $sth->execute(); + $sth->finish; +} + sub _update_data { my $self = shift; + $self->_remove_old_isos(); $self->_update_isos(); $self->_update_user_grants(); $self->_update_domain_drivers_types(); From f6f09143623b03d633924570c083e8b15b736f15 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 9 Nov 2017 16:09:12 +0100 Subject: [PATCH 076/170] [#449] copy permission does not exist --- rvd_front.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rvd_front.pl b/rvd_front.pl index 95d3fafc1..cc2903d77 100644 --- a/rvd_front.pl +++ b/rvd_front.pl @@ -438,8 +438,7 @@ any '/machine/copy' => sub { my $c = shift; - return access_denied($c) if !$USER -> can_copy(); -# return access_denied($c) if !$USER -> can_clone_all(); + return access_denied($c) if !$USER -> can_clone_all(); return copy_machine($c); }; From 384fc112aa0c6aebe5ece23da0c07680e1ada057 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 3 Nov 2017 08:38:38 +0100 Subject: [PATCH 077/170] [#443] check if domain is hibernated --- templates/main/vm_rename.html.ep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/main/vm_rename.html.ep b/templates/main/vm_rename.html.ep index 40588c8ad..4b53bdeff 100644 --- a/templates/main/vm_rename.html.ep +++ b/templates/main/vm_rename.html.ep @@ -4,7 +4,7 @@ % $message_rename = 'This VM is running and can\'t be renamed.'; % $disable_rename = 1; % } -% if ( $domain->is_hibernated ) { +% if ( $domain->is_hibernated) { % $message_rename = 'This VM has a saved hybernated state and can\'t be renamed.'; % $disable_rename = 1; % } From 2a27b5b6415c7c1440ed606d929b857d56ec4558 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 3 Nov 2017 09:09:48 +0100 Subject: [PATCH 078/170] [#443] check the domain has drivers --- lib/Ravada/Domain.pm | 2 +- templates/main/settings_machine_tabs_head.html.ep | 2 +- templates/main/vm_graphics.html.ep | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index 0674e9a8d..027bbb392 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -1467,7 +1467,7 @@ sub drivers { _init_connector(); - $type = 'qemu' if $type =~ /^KVM$/; + $type = 'KVM' if $type =~ /qemu/; my $query = "SELECT id from domain_drivers_types " ." WHERE vm=?"; $query .= " AND name=?" if $name; diff --git a/templates/main/settings_machine_tabs_head.html.ep b/templates/main/settings_machine_tabs_head.html.ep index 82c36584b..6ddb9840d 100644 --- a/templates/main/settings_machine_tabs_head.html.ep +++ b/templates/main/settings_machine_tabs_head.html.ep @@ -7,7 +7,7 @@ % if ($USER->can_change_settings && $domain->drivers) {
  • Drivers
    • % } -% if ($domain->type eq 'KVM') { +% if ($domain->drivers) {
  • Graphics
    • % } % if ($USER->can_clone_all){ diff --git a/templates/main/vm_graphics.html.ep b/templates/main/vm_graphics.html.ep index 0b720f80d..1069898b1 100644 --- a/templates/main/vm_graphics.html.ep +++ b/templates/main/vm_graphics.html.ep @@ -5,11 +5,9 @@
    % } % my $driver = $domain->drivers("image"); -% my ($first, $second) = $driver->get_options();
    " class="alert alert-danger"> This machine has not Graphics parameters!
    - % my %recomend = ( % image => 'auto_glz' % ,jpeg => 'auto' @@ -22,7 +20,7 @@
    % for my $driver_name (qw(image jpeg zlib playback streaming)) { -% my $driver = $domain->drivers($driver_name); +% my $driver = $domain->drivers($driver_name) or next;
    From d433dca22269d43a6e2f0cd4a6a200baf21c4748 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 3 Nov 2017 12:20:40 +0100 Subject: [PATCH 079/170] [#443] check copy new name --- templates/main/vm_copy.html.ep | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/templates/main/vm_copy.html.ep b/templates/main/vm_copy.html.ep index e69b3d9ac..466775afa 100644 --- a/templates/main/vm_copy.html.ep +++ b/templates/main/vm_copy.html.ep @@ -11,7 +11,10 @@
    + value="{{showmachine.name}}-copy" + ng-model="new_name" + ng-change="validate_new_name(showmachine.name)" + >
    @@ -23,9 +26,23 @@
    - + +
    + + +
    +
    From c4e854b51953a1c4dde03d8d6e875ad634ed2dee Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 3 Nov 2017 12:21:47 +0100 Subject: [PATCH 080/170] [#443] get the current machine for angular --- public/js/ravada.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/public/js/ravada.js b/public/js/ravada.js index bd7addda9..8297f2bd1 100644 --- a/public/js/ravada.js +++ b/public/js/ravada.js @@ -169,8 +169,8 @@ $scope.validate_new_name = function(old_name) { $scope.new_name_duplicated = false; - if(!$scope.new_name || old_name == $scope.new_name) { - $scope.new_name_invalid=true; + if(old_name == $scope.new_name) { + $scope.new_name_invalid=false; return; } var valid_domain_name = /^[a-zA-Z][\w_-]+$/; @@ -194,6 +194,9 @@ //On load code $scope.showmachineId = window.location.pathname.split("/")[3].split(".")[0] || -1 ; + $http.get('/machine/info/'+$scope.showmachineId+'.json').then(function(response) { + $scope.showmachine=response.data; + }); // $scope.getSingleMachine(); // $scope.updatePromise = $interval($scope.getSingleMachine,3000); }; From ba2ef125eb30a2e316b7c95be3b011d8141dec7a Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 3 Nov 2017 12:23:06 +0100 Subject: [PATCH 081/170] [#443] get domain info --- lib/Ravada/Front.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index 4e5eff3d5..b28206752 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -186,7 +186,7 @@ sub list_domains { my $self = shift; my %args = @_; - my $query = "SELECT name, id, id_base, is_base FROM domains ORDER BY name"; + my $query = "SELECT name, id, id_base, is_base FROM domains "; my $where = ''; for my $field ( sort keys %args ) { @@ -195,7 +195,7 @@ sub list_domains { } $where = "WHERE $where" if $where; - my $sth = $CONNECTOR->dbh->prepare("$query $where"); + my $sth = $CONNECTOR->dbh->prepare("$query $where ORDER BY name"); $sth->execute(map { $args{$_} } sort keys %args); my @domains = (); From b042510bb886260148ec815eaf6e8819c9ae3aac Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 3 Nov 2017 12:23:23 +0100 Subject: [PATCH 082/170] [#443] fixed unique mac From 9c2414573bd5c48d43e7bc33dc62de837c4c9ef8 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 3 Nov 2017 14:46:38 +0100 Subject: [PATCH 083/170] [#443] type KVM domains and its drivers too --- lib/Ravada.pm | 10 +++++----- lib/Ravada/Domain.pm | 8 +++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index 5a87b9153..82d480d5d 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -295,32 +295,32 @@ sub _update_domain_drivers_types($self) { id => 4, ,name => 'image' ,description => 'Graphics Options' - ,vm => 'qemu' + ,vm => 'KVM' }, jpeg => { id => 5, ,name => 'jpeg' ,description => 'Graphics Options' - ,vm => 'qemu' + ,vm => 'KVM' }, zlib => { id => 6, ,name => 'zlib' ,description => 'Graphics Options' - ,vm => 'qemu' + ,vm => 'KVM' }, playback => { id => 7, ,name => 'playback' ,description => 'Graphics Options' - ,vm => 'qemu' + ,vm => 'KVM' }, streaming => { id => 8, ,name => 'streaming' ,description => 'Graphics Options' - ,vm => 'qemu' + ,vm => 'KVM' } }; diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index 027bbb392..09b2cca10 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -1467,14 +1467,16 @@ sub drivers { _init_connector(); - $type = 'KVM' if $type =~ /qemu/; + my $type2 = $type; + $type2 = 'KVM' if $type =~ /qemu/; + $type2 = 'qemu' if $type =~ /KVM;/; my $query = "SELECT id from domain_drivers_types " - ." WHERE vm=?"; + ." WHERE (vm=? or vm=?)"; $query .= " AND name=?" if $name; my $sth = $$CONNECTOR->dbh->prepare($query); - my @sql_args = ($type); + my @sql_args = ($type,$type2); push @sql_args,($name) if $name; $sth->execute(@sql_args); From f1738605d5fd74e784a569d4f5b7f922b157206f Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 3 Nov 2017 14:46:57 +0100 Subject: [PATCH 084/170] [#443] testing drivers --- t/kvm/62_images.t | 2 ++ 1 file changed, 2 insertions(+) diff --git a/t/kvm/62_images.t b/t/kvm/62_images.t index 07b2a8d6c..571a70d43 100644 --- a/t/kvm/62_images.t +++ b/t/kvm/62_images.t @@ -72,6 +72,8 @@ sub test_drivers_type { isa_ok(\@drivers,'ARRAY'); my $driver_type = $domain->drivers($type); + ok($driver_type,"[$vm_name] Expecting a driver type $type") or return; + isa_ok($driver_type, "Ravada::Domain::Driver") or return; my $value = $driver_type->get_value(); is($value,undef,"Expecting no value for $type"); From 74eebf3c0aabf550c02554f02e96efc4b5078245 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 3 Nov 2017 12:23:23 +0100 Subject: [PATCH 085/170] [#443] fixed unique mac From 8df52e3bbdf753d8910883ff18fd84de24a6a0a7 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 9 Nov 2017 16:39:18 +0100 Subject: [PATCH 086/170] Check for undefined memory data --- lib/Ravada/Domain.pm | 1 + lib/Ravada/Domain/Void.pm | 3 +++ 2 files changed, 4 insertions(+) diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index 0674e9a8d..ad006f376 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -371,6 +371,7 @@ sub _check_used_memory { next if !$alive; my $info = $domain->get_info; + confess "No info memory ".Dumper($info) if !exists $info->{memory}; $used_memory += $info->{memory}; } diff --git a/lib/Ravada/Domain/Void.pm b/lib/Ravada/Domain/Void.pm index b13a1d78c..ab613ef30 100644 --- a/lib/Ravada/Domain/Void.pm +++ b/lib/Ravada/Domain/Void.pm @@ -352,6 +352,9 @@ sub can_screenshot { return $IMPORT; } sub get_info { my $self = shift; my $info = $self->_value('info'); + $self->_set_default_info() + if !$info->{memory}; + $info = $self->_value('info'); lock_keys(%$info); return $info; } From 0c2a1aa664f249a85fa58c221f497b37a8952bb6 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 9 Nov 2017 16:42:17 +0100 Subject: [PATCH 087/170] Import KVM must be run from root --- t/kvm/40_import.t | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/t/kvm/40_import.t b/t/kvm/40_import.t index 0ef7d94d5..5d245366c 100644 --- a/t/kvm/40_import.t +++ b/t/kvm/40_import.t @@ -163,6 +163,10 @@ for my $vm_name (@VMS) { my $vm = $RVD_BACK->search_vm($vm_name); SKIP : { my $msg = "SKIPPED test: No $vm_name VM found "; + if ($vm_name eq 'KVM') { + $msg = "SKIPPED test: $vm_name must be tested from root user"; + $vm = undef; + } diag($msg) if !$vm; skip $msg,10 if !$vm; From 7492d686f444ec1fb824a5d86ddb8877622ca755 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Tue, 31 Oct 2017 14:40:46 +0100 Subject: [PATCH 088/170] [#405] domains in list bases should have is_base field --- lib/Ravada/Front.pm | 2 +- t/front/10_load.t | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index b28206752..ad1308632 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -75,7 +75,7 @@ Returns a list of the base domains as a listref sub list_bases { my $self = shift; - my $sth = $CONNECTOR->dbh->prepare("SELECT name, id FROM domains where is_base=1"); + my $sth = $CONNECTOR->dbh->prepare("SELECT name, id, is_base FROM domains where is_base=1"); $sth->execute(); my @bases = (); diff --git a/t/front/10_load.t b/t/front/10_load.t index 7ba29ef97..3a60543bf 100644 --- a/t/front/10_load.t +++ b/t/front/10_load.t @@ -69,9 +69,11 @@ sub test_add_domain_db { $bases = $RVD_FRONT->list_bases(); ok($bases,"No bases list returned"); ok(scalar @$bases == 1, "There should 1 base, got ".scalar(@$bases)) or exit; + + is($bases->[0]->{name}, $domain_name); for my $base ( @$bases ) { - ok($base->{is_base} ); + ok($base->{is_base},"[$vm_name] Expecting base for ".Dumper($base) ); } } From f67f6ae33d78bb65a4a926a3276661d16769963a Mon Sep 17 00:00:00 2001 From: fv3rdugo Date: Thu, 9 Nov 2017 18:36:01 +0100 Subject: [PATCH 089/170] [#408] Fix screenshot in 17.10 - Apply img-thumbnail class - Resize screenshot 250x188 - Fix create img in test. Problems with wayland --- lib/Ravada/Domain.pm | 2 +- lib/Ravada/Domain/KVM.pm | 28 ++++++++++++++-------------- lib/Ravada/Domain/Void.pm | 9 ++++----- templates/main/list_bases2.html.ep | 2 +- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index 199902b12..d59700e5f 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -909,7 +909,7 @@ sub _convert_png { my $self = shift; my ($file_in ,$file_out) = @_; - my $in = Image::Magick->new(); + my $in = Image::Magick->new(size=>'250x188'); my $err = $in->Read($file_in); confess $err if $err; diff --git a/lib/Ravada/Domain/KVM.pm b/lib/Ravada/Domain/KVM.pm index 1a88bb3fc..85895267f 100644 --- a/lib/Ravada/Domain/KVM.pm +++ b/lib/Ravada/Domain/KVM.pm @@ -858,6 +858,17 @@ Takes a screenshot, it stores it in file. =cut +sub handler { + my ($stream, $data, $n) = @_; + my $file_tmp = "/var/tmp/$$.tmp"; + + open my $out ,'>>',$file_tmp; + print $out $data; + close $out; + + return $n; +} + sub screenshot { my $self = shift; my $file = (shift or $self->_file_screenshot); @@ -869,24 +880,13 @@ sub screenshot { my $stream = $self->{_vm}->vm->new_stream(); my $mimetype = $self->domain->screenshot($stream,0); + $stream->recv_all(\&handler); - my $file_tmp = "$file.tmp"; - my $data; - my $bytes = 0; - open my $out, '>', $file_tmp or die "$! $file_tmp"; - while ( my $rv =$stream->recv($data,1024)) { - $bytes += $rv; - last if $rv<=0; - print $out $data; - } - close $out; + my $file_tmp = "/var/tmp/$$.tmp"; + $stream->finish; $self->_convert_png($file_tmp,$file); unlink $file_tmp or warn "$! removing $file_tmp"; - - $stream->finish; - - return $bytes; } sub _file_screenshot { diff --git a/lib/Ravada/Domain/Void.pm b/lib/Ravada/Domain/Void.pm index b13a1d78c..11263b88d 100644 --- a/lib/Ravada/Domain/Void.pm +++ b/lib/Ravada/Domain/Void.pm @@ -27,8 +27,8 @@ has '_ip' => ( our $DIR_TMP = "/var/tmp/rvd_void"; -our $IMPORT = `which import`; -chomp $IMPORT; +our $CONVERT = `which convert`; +chomp $CONVERT; #######################################3 sub BUILD { @@ -334,8 +334,7 @@ sub screenshot { my $self = shift; my $file = (shift or $self->_file_screenshot); - my @cmd =($IMPORT,'-window','root' - ,'-resize','400x300' + my @cmd =($CONVERT,'-size', '400x300', 'xc:white' ,$file ); my ($in,$out,$err); @@ -347,7 +346,7 @@ sub _file_screenshot { return $DIR_TMP."/".$self->name.".png"; } -sub can_screenshot { return $IMPORT; } +sub can_screenshot { return $CONVERT; } sub get_info { my $self = shift; diff --git a/templates/main/list_bases2.html.ep b/templates/main/list_bases2.html.ep index 4e60b920f..989d0b2e2 100644 --- a/templates/main/list_bases2.html.ep +++ b/templates/main/list_bases2.html.ep @@ -63,7 +63,7 @@ % } % if ($machine->{screenshot} ) { - + % }
    From 8140b5c66d1b4a1741ef3e62b33eed08c8aab5b2 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 10 Nov 2017 08:45:23 +0100 Subject: [PATCH 090/170] Trying to fix domain setttings wasn't testing Loads all the drivers, the test fails though --- lib/Ravada/Domain.pm | 31 +++++++++++++++++++++---------- t/kvm/65_dom_settings_req.t | 2 +- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index 4abdbda71..edc62dccc 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -1464,21 +1464,32 @@ List the drivers available for a domain. It may filter for a given type. sub drivers { my $self = shift; my $name = shift; - my $type = (shift or $self->_vm->type); + my $type = shift; + $type = $self->_vm->type if $self && !$type; _init_connector(); - my $type2 = $type; - $type2 = 'KVM' if $type =~ /qemu/; - $type2 = 'qemu' if $type =~ /KVM;/; - my $query = "SELECT id from domain_drivers_types " - ." WHERE (vm=? or vm=?)"; - $query .= " AND name=?" if $name; + my $query = "SELECT id from domain_drivers_types "; - my $sth = $$CONNECTOR->dbh->prepare($query); + my @sql_args = (); - my @sql_args = ($type,$type2); - push @sql_args,($name) if $name; + my @where; + if ($name) { + push @where,("name=?"); + push @sql_args,($name); + } + if ($type) { + my $type2 = $type; + if ($type =~ /qemu/) { + $type2 = 'KVM'; + } elsif ($type =~ /KVM/) { + $type2 = 'qemu'; + } + push @where, ("( vm=? OR vm=?)"); + push @sql_args, ($type,$type2); + } + $query .= "WHERE ".join(" AND ",@where) if @where; + my $sth = $$CONNECTOR->dbh->prepare($query); $sth->execute(@sql_args); diff --git a/t/kvm/65_dom_settings_req.t b/t/kvm/65_dom_settings_req.t index ba2abbe12..f351bebc8 100644 --- a/t/kvm/65_dom_settings_req.t +++ b/t/kvm/65_dom_settings_req.t @@ -121,7 +121,7 @@ sub test_settings { my $vm_name = shift; for my $driver ( Ravada::Domain::drivers(undef,undef,$vm_name) ) { - next if $driver->name ne 'video'; +# next if $driver->name ne 'video'; diag("Testing drivers for $vm_name ".$driver->name); test_drivers_id($vm_name, $driver->name); } From 1b802bc9329abbba09888f671aeca03ccc288137 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 10 Nov 2017 08:51:27 +0100 Subject: [PATCH 091/170] [#408] scale the screenshot --- lib/Ravada/Domain.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index d59700e5f..1d52b1178 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -909,10 +909,11 @@ sub _convert_png { my $self = shift; my ($file_in ,$file_out) = @_; - my $in = Image::Magick->new(size=>'250x188'); + my $in = Image::Magick->new(); my $err = $in->Read($file_in); confess $err if $err; + $in->Scale(width => 250, height => 188); $in->Write("png24:$file_out"); chmod 0755,$file_out or die "$! chmod 0755 $file_out"; From 618dcbece5d63464834f012b7058213146abbf56 Mon Sep 17 00:00:00 2001 From: fv3rdugo Date: Thu, 9 Nov 2017 18:36:01 +0100 Subject: [PATCH 092/170] [#408] Fix screenshot in 17.10 - Apply img-thumbnail class - Resize screenshot 250x188 - Fix create img in test. Problems with wayland --- lib/Ravada/Domain.pm | 2 +- lib/Ravada/Domain/KVM.pm | 28 ++++++++++++++-------------- lib/Ravada/Domain/Void.pm | 9 ++++----- templates/main/list_bases2.html.ep | 2 +- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index edc62dccc..c2d13d21e 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -910,7 +910,7 @@ sub _convert_png { my $self = shift; my ($file_in ,$file_out) = @_; - my $in = Image::Magick->new(); + my $in = Image::Magick->new(size=>'250x188'); my $err = $in->Read($file_in); confess $err if $err; diff --git a/lib/Ravada/Domain/KVM.pm b/lib/Ravada/Domain/KVM.pm index 1a88bb3fc..85895267f 100644 --- a/lib/Ravada/Domain/KVM.pm +++ b/lib/Ravada/Domain/KVM.pm @@ -858,6 +858,17 @@ Takes a screenshot, it stores it in file. =cut +sub handler { + my ($stream, $data, $n) = @_; + my $file_tmp = "/var/tmp/$$.tmp"; + + open my $out ,'>>',$file_tmp; + print $out $data; + close $out; + + return $n; +} + sub screenshot { my $self = shift; my $file = (shift or $self->_file_screenshot); @@ -869,24 +880,13 @@ sub screenshot { my $stream = $self->{_vm}->vm->new_stream(); my $mimetype = $self->domain->screenshot($stream,0); + $stream->recv_all(\&handler); - my $file_tmp = "$file.tmp"; - my $data; - my $bytes = 0; - open my $out, '>', $file_tmp or die "$! $file_tmp"; - while ( my $rv =$stream->recv($data,1024)) { - $bytes += $rv; - last if $rv<=0; - print $out $data; - } - close $out; + my $file_tmp = "/var/tmp/$$.tmp"; + $stream->finish; $self->_convert_png($file_tmp,$file); unlink $file_tmp or warn "$! removing $file_tmp"; - - $stream->finish; - - return $bytes; } sub _file_screenshot { diff --git a/lib/Ravada/Domain/Void.pm b/lib/Ravada/Domain/Void.pm index ab613ef30..2d3b9076a 100644 --- a/lib/Ravada/Domain/Void.pm +++ b/lib/Ravada/Domain/Void.pm @@ -27,8 +27,8 @@ has '_ip' => ( our $DIR_TMP = "/var/tmp/rvd_void"; -our $IMPORT = `which import`; -chomp $IMPORT; +our $CONVERT = `which convert`; +chomp $CONVERT; #######################################3 sub BUILD { @@ -334,8 +334,7 @@ sub screenshot { my $self = shift; my $file = (shift or $self->_file_screenshot); - my @cmd =($IMPORT,'-window','root' - ,'-resize','400x300' + my @cmd =($CONVERT,'-size', '400x300', 'xc:white' ,$file ); my ($in,$out,$err); @@ -347,7 +346,7 @@ sub _file_screenshot { return $DIR_TMP."/".$self->name.".png"; } -sub can_screenshot { return $IMPORT; } +sub can_screenshot { return $CONVERT; } sub get_info { my $self = shift; diff --git a/templates/main/list_bases2.html.ep b/templates/main/list_bases2.html.ep index ce2377595..ce02ab04d 100644 --- a/templates/main/list_bases2.html.ep +++ b/templates/main/list_bases2.html.ep @@ -63,7 +63,7 @@ % } % if ($machine->{screenshot} ) { - + % }
    From b3e990f3db4146d3623019e3436556393d3c79cc Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 6 Nov 2017 12:27:24 +0100 Subject: [PATCH 093/170] [#408] added xubuntu artful 17.10 --- lib/Ravada.pm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index 82d480d5d..fc4ee0df6 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -202,6 +202,16 @@ sub _update_isos { ,xml_volume => 'xenial64-volume.xml' ,sha256_url => 'http://fedora.mirrors.ovh.net/linux/releases/25/Workstation/x86_64/iso/Fedora-Workstation-25-.*-x86_64-CHECKSUM' } + ,xubuntu_artful => { + name => 'Xubuntu Artful Aardvark' + ,description => 'Xubuntu 17.10 Artful Aardvark 64 bits' + ,arch => 'amd64' + ,xml => 'yakkety64-amd64.xml' + ,xml_volume => 'yakkety64-volume.xml' + ,md5_url => 'http://archive.ubuntu.com/ubuntu/dists/artful/main/installer-amd64/current/images/MD5SUMS' + ,url => 'http://archive.ubuntu.com/ubuntu/dists/artful/main/installer-amd64/current/images/netboot/mini.iso' + ,rename_file => 'xubuntu_artful.iso' + } ,xubuntu_zesty => { name => 'Xubuntu Zesty Zapus' ,description => 'Xubuntu 17.04 Zesty Zapus 64 bits' From 53ee883989b8c28422cdd583d37aea472ce3fbc0 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 19 Oct 2017 17:03:16 +0200 Subject: [PATCH 094/170] [#408] lubuntu 17.10 --- lib/Ravada.pm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index fc4ee0df6..df25f5ef1 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -231,6 +231,14 @@ sub _update_isos { ,md5 => 'fe495d34188a9568c8d166efc5898d22' ,rename_file => 'xubuntu_xenial_mini.iso' } + ,lubuntu_aardvark => { + name => 'Lubuntu Artful Aardvark' + ,description => 'Lubuntu 17.10 Artful Aardvark 64 bits' + ,url => 'http://cdimage.ubuntu.com/lubuntu/releases/17.10/release/lubuntu-17.10-desktop-amd64.iso' + ,md5_url => 'http://cdimage.ubuntu.com/lubuntu/releases/17.10/release/MD5SUMS' + ,xml => 'yakkety64-amd64.xml' + ,xml_volume => 'yakkety64-volume.xml' + } ,lubuntu_zesty => { name => 'Lubuntu Zesty Zapus' ,description => 'Lubuntu 17.04 Zesty Zapus 64 bits' From 5975ee3e96ae846853f68746a44f17dae3f2e8a1 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 19 Oct 2017 16:28:37 +0200 Subject: [PATCH 095/170] [408] Ubuntu AA 17.10 iso location --- lib/Ravada.pm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index df25f5ef1..767c34af5 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -171,7 +171,17 @@ sub _update_isos { my $table = 'iso_images'; my $field = 'name'; my %data = ( - zesty => { + artful => { + name => 'Ubuntu Artful Aardvak' + ,description => 'Ubuntu 17.10 Artful Aardvak 64 bits' + ,arch => 'amd64' + ,xml => 'yakkety64-amd64.xml' + ,xml_volume => 'yakkety64-volume.xml' + ,url => 'http://releases.ubuntu.com/17.10/' + ,file_re => ,'ubuntu-17.10.*desktop-amd64.iso' + ,md5_url => ,'http://releases.ubuntu.com/17.10/MD5SUMS' + } + ,zesty => { name => 'Ubuntu Zesty Zapus' ,description => 'Ubuntu 17.04 Zesty Zapus 64 bits' ,arch => 'amd64' From 8767254689c5facf3aa639082e3b8af3efef8e6a Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 10 Nov 2017 08:51:27 +0100 Subject: [PATCH 096/170] [#408] scale the screenshot --- lib/Ravada/Domain.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index c2d13d21e..72e37a78f 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -910,10 +910,11 @@ sub _convert_png { my $self = shift; my ($file_in ,$file_out) = @_; - my $in = Image::Magick->new(size=>'250x188'); + my $in = Image::Magick->new(); my $err = $in->Read($file_in); confess $err if $err; + $in->Scale(width => 250, height => 188); $in->Write("png24:$file_out"); chmod 0755,$file_out or die "$! chmod 0755 $file_out"; From fc69fa0f96e64be7f3af4561f081808728e038ce Mon Sep 17 00:00:00 2001 From: fv3rdugo Date: Fri, 10 Nov 2017 10:07:55 +0100 Subject: [PATCH 097/170] [#459] Polish select Screenshot link to start Update bootstrap to 3.3.7 Add icons in select --- templates/bootstrap/header.html.ep | 2 +- templates/bootstrap/scripts.html.ep | 2 +- templates/main/list_bases2.html.ep | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/templates/bootstrap/header.html.ep b/templates/bootstrap/header.html.ep index c299e32ac..b9f42c163 100644 --- a/templates/bootstrap/header.html.ep +++ b/templates/bootstrap/header.html.ep @@ -9,7 +9,7 @@ % } Ravada VDI - + diff --git a/templates/bootstrap/scripts.html.ep b/templates/bootstrap/scripts.html.ep index 3f1d5eaf5..c848dc03b 100644 --- a/templates/bootstrap/scripts.html.ep +++ b/templates/bootstrap/scripts.html.ep @@ -1,6 +1,6 @@ - + diff --git a/templates/main/list_bases2.html.ep b/templates/main/list_bases2.html.ep index ce2377595..55b0b1840 100644 --- a/templates/main/list_bases2.html.ep +++ b/templates/main/list_bases2.html.ep @@ -24,7 +24,7 @@
    -
    +

    <%=l 'Choose a Machine to Start' %>

    % if ($user->is_admin && $public_bases && $private_bases) { @@ -54,16 +54,16 @@ % next if !$machine->{is_public} && !$user->is_admin;
    -
    +
    -

    <%= $machine->{name} %> +

    <%= $machine->{name} %> % if ( !$machine->{is_public} ) { ( not public ) % }

    % if ($machine->{screenshot} ) { - + % }
    @@ -72,16 +72,16 @@ % } % if (!$machine->{is_locked}) { % if ( $machine->{id_clone} && $machine->{is_active} ) { - % } elsif ($machine->{id_clone}) { From c32a8aaab5f331d33529b36405aa1fd8507c949b Mon Sep 17 00:00:00 2001 From: fv3rdugo Date: Fri, 10 Nov 2017 10:43:20 +0100 Subject: [PATCH 098/170] [#459] Add default screenshot --- public/css/sb-admin.css | 5 +++++ public/img/default_screenshot.png | Bin 0 -> 19466 bytes public/img/screenshot.jpg | Bin 154020 -> 0 bytes templates/main/list_bases2.html.ep | 5 ++++- 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100755 public/img/default_screenshot.png delete mode 100644 public/img/screenshot.jpg diff --git a/public/css/sb-admin.css b/public/css/sb-admin.css index f94c802f0..4a77abcdf 100644 --- a/public/css/sb-admin.css +++ b/public/css/sb-admin.css @@ -388,3 +388,8 @@ ul.alert-dropdown { border-left:1px solid #d73a49; border-right:1px solid #d73a49; } + +.screenshot-default{ + opacity: 0.5; + filter: alpha(opacity=50); /* For IE8 and earlier */ +} diff --git a/public/img/default_screenshot.png b/public/img/default_screenshot.png new file mode 100755 index 0000000000000000000000000000000000000000..40bd223281dce624c7874259dcdeb608c84dbbaf GIT binary patch literal 19466 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 z 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�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 % if ($machine->{screenshot} ) { - + +% }else{ + % } +

    % if ($_user->can_screenshot) { From 910b7f25adcb06023dddc8634742e0049727a670 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 10 Nov 2017 11:49:58 +0100 Subject: [PATCH 099/170] Skip some settings not set by default --- t/kvm/65_dom_settings_req.t | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/t/kvm/65_dom_settings_req.t b/t/kvm/65_dom_settings_req.t index f351bebc8..d3881af8a 100644 --- a/t/kvm/65_dom_settings_req.t +++ b/t/kvm/65_dom_settings_req.t @@ -21,6 +21,8 @@ my %ARG_CREATE_DOM = ( ); our $TIMEOUT_SHUTDOWN = 10; +our %SKIP_DEFAULT_VALUE = map { $_ => 1 } qw(image jpeg playback streaming zlib); + ################################################################ sub test_create_domain { my $vm_name = shift; @@ -66,8 +68,10 @@ sub test_drivers_id { my $driver_type = $domain->drivers($type); - my $value = $driver_type->get_value(); - ok($value); + if (!$SKIP_DEFAULT_VALUE{$type}) { + my $value = $driver_type->get_value(); + ok($value,"[$vm_name] Expecting a value for driver $type"); + } my @options = $driver_type->get_options(); isa_ok(\@options,'ARRAY'); From 4217f78d52e60c16fe716876a678c58c9148ac90 Mon Sep 17 00:00:00 2001 From: Omar Date: Fri, 10 Nov 2017 15:35:28 +0100 Subject: [PATCH 100/170] I have introduced some missing translations to the ca.po and the es.po files and i have also introduced the missing translation marks to some texts of the templates directory --- lib/Ravada/I18N/ca.po | 76 +++++++++++++- lib/Ravada/I18N/es.po | 100 ++++++++++++++++++- templates/main/about.html.ep | 22 ++-- templates/main/admin_machines.html.ep | 12 +-- templates/main/admin_users.html.ep | 8 +- templates/main/list_bases2.html.ep | 8 +- templates/main/manage_machine.html.ep | 8 +- templates/main/manage_user.html.ep | 2 +- templates/main/manage_user_admin.html.ep | 2 +- templates/main/requirements.html.ep | 2 +- templates/main/vm_status.html | 4 +- templates/ng-templates/user_machines.html.ep | 2 +- 12 files changed, 207 insertions(+), 39 deletions(-) diff --git a/lib/Ravada/I18N/ca.po b/lib/Ravada/I18N/ca.po index 170aeeb8d..67eef5249 100644 --- a/lib/Ravada/I18N/ca.po +++ b/lib/Ravada/I18N/ca.po @@ -164,7 +164,7 @@ msgid "Machine locked by requested" msgstr "Màquina bloquejada per" msgid "process" -msgstr "procés" +msgstr " procés" msgid "Copy" msgstr "Còpia" @@ -173,7 +173,7 @@ msgid "Error!" msgstr "Error!" msgid "Backend no available!" -msgstr "Backend no disponible!" +msgstr " Backend no disponible!" msgid "Subject" msgstr "Assumpte" @@ -311,3 +311,75 @@ msgstr "Identifiqueu-vos amb el nom d'usuari de la Intranet UPC." msgid "bits) in your computer." msgstr "bits) al teu ordinador." + +msgid "For more information, check " +msgstr "Per a més informació, reviseu " + +msgid "the Windows Clients documentation" +msgstr "la documentació de Windows Clients" + +msgid "Version" +msgstr "Versió" + +msgid "Authors" +msgstr "Autors" + +msgid "Development" +msgstr "Desenvolupament" + +msgid "Below are listed the technologies used in this project:" +msgstr "A continuació hi ha la llista de tecnologies usades en aquest projecte:" + +msgid "The code is available on " +msgstr "El codi està disponible a " + +msgid "The code is " +msgstr "El codi està " + +msgid "License" +msgstr "Licència" + +msgid "hide clones" +msgstr "amaga els clons" + +msgid "Machine locked by" +msgstr "Màquina bloquejada per" + +msgid "This Machine is a base" +msgstr "Aquesta màquina és una base" + +msgid "Cloned" +msgstr "Clonada" + +msgid "is admin" +msgstr "és administrador" + +msgid "Add new user" +msgstr "Afegeix nou usuari" + +msgid "Register" +msgstr "Registrar" + +msgid "Search" +msgstr "Cerca" + +msgid "Admin tools" +msgstr "Eines d'administració" + +msgid "Admin tools" +msgstr "Eines d'administració" + +msgid "There are no public bases available in this system." +msgstr "No hi ha bases públiques disponibles en aquest sistema." + +msgid "There are no machines available in this system." +msgstr "No hi ha màquines disponibles en aquest sistema." + +msgid "Create one." +msgstr "Crea'n una." + +msgid "not public" +msgstr "no pública" + +msgid "User Settings" +msgstr "Configuració d'usuari" diff --git a/lib/Ravada/I18N/es.po b/lib/Ravada/I18N/es.po index 61b3485de..0f2380db6 100644 --- a/lib/Ravada/I18N/es.po +++ b/lib/Ravada/I18N/es.po @@ -193,10 +193,10 @@ msgid "will remove all the contents of the machine" msgstr "borrará todo el contenido de la máquina" msgid "Are you sure?" -msgstr "Estas seguro/a?" +msgstr "Estás seguro/a?" msgid "Yes" -msgstr "Si" +msgstr "Sí" msgid "No" msgstr "" @@ -212,3 +212,99 @@ msgstr "No se puede borrar la base, la máquina tiene clones" msgid "Show/Hide clones" msgstr "Ver/Esconde clones" + +msgid "User Settings" +msgstr "Configuración de usuario" + +msgid "For spice redirection you'll need to install" +msgstr "Para redirección a spice necesitarás instalar" + +msgid "Search in your distro, e.g. in Debian/Ubuntu with" +msgstr "Busca en tu distribución, p.e. Debian/Ubuntu con" + +msgid "You'll need to install" +msgstr "Necesitarás instalar" + +msgid "e.g. VirtViewer v5.0-256, and USB drivers (" +msgstr "p.e. VirtViewer v5.0-256, y USB drivers (" + +msgid "or" +msgstr "o" + +msgid "bits) in your computer." +msgstr "bits) en tu ordenador." + +msgid "Be aware that in Windows, spice redirection is not automatically. It\'s necessary associate protocol with the app." +msgstr "Atención a que en Windows, la redirección spice no es automàtica. Es necesario asociar el protocolo con la app." + +msgid "To make this possible, download" +msgstr "Para hacer esto posible, descarga" + +msgid "or copy the following lines in an ASCII file and save with extension .reg, then execute the file." +msgstr "o copia las linias siguientes en un documento ASCII y guárdalo con extensión .reg, después ejécutalo." + +msgid "For more information, check " +msgstr "Para más información, revisa " + +msgid "the Windows Clients documentation" +msgstr "la documentación de Windows Clients" + +msgid "in your computer." +msgstr "en tu ordenador." + +msgid "Admin tools" +msgstr "Herramientas de administración" + +msgid "machines" +msgstr "máquinas" + +msgid "users" +msgstr "usuarios" + +msgid "messages" +msgstr "mensajes" + +msgid "Virtual Machines" +msgstr "Máquinas Virtuales" + +msgid "hide clones" +msgstr "esconder clones" + +msgid "This Machine is a base" +msgstr "Esta Máquina es base" + +msgid "Machine locked by" +msgstr "Máquina bloqueada por" + +msgid "Cloned" +msgstr "Clonada" + +msgid "Search" +msgstr "Buscar" + +msgid "Register" +msgstr "Registrar" + +msgid "Subject" +msgstr "Asunto" + +msgid "Date" +msgstr "Fecha" + +msgid "There are no public bases available in this system." +msgstr "No hay bases públicas disponibles en este sistema." + +msgid "There are no machines available in this system." +msgstr "No hay máquinas disponibles en este sistema." + +msgid "not public" +msgstr "no pública" + +msgid "Create one." +msgstr "Crea una." + +msgid "Error!" +msgstr "Error!" + +msgid "Backend no available!" +msgstr " Backend no disponible!" diff --git a/templates/main/about.html.ep b/templates/main/about.html.ep index 690c70757..2f45a8149 100644 --- a/templates/main/about.html.ep +++ b/templates/main/about.html.ep @@ -9,24 +9,24 @@
    -

    About

    +

    <%=l 'About' %>

    -

    Version

    +

    <%=l 'Version' %>

    <%= $version %> -

    Authors

    +

    <%=l 'Authors' %>

    %= include 'bootstrap/authors' -

    Development

    -

    Below are listed the technologies used in this project:

    +

    <%=l 'Development' %>

    +

    <%=l 'Below are listed the technologies used in this project:' %>

    -

    The code is available on Github.

    -

    License

    -

    The code is GPL licensed.

    +

    <%=l 'The code is available on ' %>Github.

    +

    <%=l 'License' %>

    +

    <%=l 'The code is ' %>GPL<%=l ' licensed.' %>

    diff --git a/templates/main/admin_machines.html.ep b/templates/main/admin_machines.html.ep index 4caa9351a..a24b198a8 100644 --- a/templates/main/admin_machines.html.ep +++ b/templates/main/admin_machines.html.ep @@ -10,7 +10,7 @@
    - Error! Backend no available! + <%=l 'Error!' %><%=l 'Backend no available!' %>

    <%=l 'Virtual Machines' %>

    @@ -50,7 +50,7 @@ align="right">show clones hide clones + align="right"><%=l 'hide clones' %>
    % } @@ -142,9 +142,9 @@ % }
    -
    Machine locked by process
    +
    Machine locked by %=l 'process' %>
    This Machine is a base
    + ng-cloak><%=l 'This Machine is a base' %>
    @@ -154,7 +154,7 @@  {{child.name}} - [ Cloned ] + [ <%=l 'Cloned' %> ]
    -
    Machine locked by process
    +
    <%=l 'Machine locked by' %> <%=l 'process' %>
    diff --git a/templates/main/admin_users.html.ep b/templates/main/admin_users.html.ep index 442f02ca3..ab9cb304c 100644 --- a/templates/main/admin_users.html.ep +++ b/templates/main/admin_users.html.ep @@ -6,11 +6,11 @@ %= include 'bootstrap/navigation'
    -

    Users

    +

    <%=l 'Users' %>

    - - - + + +
    diff --git a/templates/main/list_bases2.html.ep b/templates/main/list_bases2.html.ep index 4e60b920f..48a6d1566 100644 --- a/templates/main/list_bases2.html.ep +++ b/templates/main/list_bases2.html.ep @@ -42,10 +42,10 @@
    % if ($_user->is_admin) { - There are no public bases available in this system. - Create one. + <%=l 'There are no public bases available in this system.' %> + <%=l 'Create one.' %> % } else { - There are no machines available in this system. + <%=l 'There are no machines available in this system.' %> % }
    @@ -59,7 +59,7 @@

    <%= $machine->{name} %> % if ( !$machine->{is_public} ) { - ( not public ) + (<%=l 'not public' %>) % }

    % if ($machine->{screenshot} ) { diff --git a/templates/main/manage_machine.html.ep b/templates/main/manage_machine.html.ep index 9883bd1ab..2037e42b4 100644 --- a/templates/main/manage_machine.html.ep +++ b/templates/main/manage_machine.html.ep @@ -18,10 +18,10 @@ > > > - View - PrepareBase - Remove - Screenshot + <%=l View %> + <%=l PrepareBase %> + <%=l Remove %> + <%=l Screenshot %> diff --git a/templates/main/manage_user.html.ep b/templates/main/manage_user.html.ep index c87de602c..c671f5211 100644 --- a/templates/main/manage_user.html.ep +++ b/templates/main/manage_user.html.ep @@ -8,7 +8,7 @@ ment">
    -

    User <%= $user->name %>

    +

    <%=l 'User' %><%= $user->name %>

    diff --git a/templates/main/vm_status.html b/templates/main/vm_status.html index 336e5ca05..4fc05cff7 100644 --- a/templates/main/vm_status.html +++ b/templates/main/vm_status.html @@ -8,11 +8,11 @@ <%=l 'Running' %> - <%=l 'Down'%> + <%=l 'Down' %>
    <%=l 'Machine locked by' %> - <%=l 'process' %> + <%=l ' process' %>
    diff --git a/templates/ng-templates/user_machines.html.ep b/templates/ng-templates/user_machines.html.ep index 085bb1339..b6ce95344 100644 --- a/templates/ng-templates/user_machines.html.ep +++ b/templates/ng-templates/user_machines.html.ep @@ -1,6 +1,6 @@
    - Error! Backend no available! + <%=l 'Error!' %><%=l 'Backend no available!' %>
    From e335d9dfbf4e291d0e74aa51dce77199c4dbae96 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 10 Nov 2017 15:36:18 +0100 Subject: [PATCH 101/170] Check if there is a localhost/iso web --- t/request/20_download_local.t | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/t/request/20_download_local.t b/t/request/20_download_local.t index d45e8d9ff..136eb02c7 100644 --- a/t/request/20_download_local.t +++ b/t/request/20_download_local.t @@ -6,6 +6,7 @@ use Data::Dumper; use IPC::Run3; use Test::More; use Test::SQL::Data; +use Mojo::UserAgent; use lib 't/lib'; use Test::Ravada; @@ -100,6 +101,14 @@ sub search_id_isos { } return @id_iso; } + +sub httpd_localhost { + my $ua = Mojo::UserAgent->new; + eval { return $ua->get('http://localhost/iso')->result->is_success }; + diag($@) if $@ !~ /Connection refused/; + return; +} + ################################################################## @@ -113,6 +122,10 @@ for my $vm_name ('KVM') { $msg = "SKIPPED: Test must run as root"; $vm = undef; } + if (!httpd_localhost()) { + $vm = undef; + $msg = "SKIPPED: No http on localhost with /iso"; + } diag($msg) if !$vm; skip($msg,10) if !$vm; From 1459b99effd107c9b733da5edd4ecb7d5c699557 Mon Sep 17 00:00:00 2001 From: joelalju Date: Fri, 10 Nov 2017 16:38:57 +0100 Subject: [PATCH 102/170] [#425] Select ISO's help button takes to the doc page. --- templates/ng-templates/new_machine_template.html.ep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/ng-templates/new_machine_template.html.ep b/templates/ng-templates/new_machine_template.html.ep index ceb7fe3a2..e4a7797fd 100644 --- a/templates/ng-templates/new_machine_template.html.ep +++ b/templates/ng-templates/new_machine_template.html.ep @@ -42,7 +42,7 @@

    + title="Select the .iso file the machine will utilize when installing the OS." href="http://ravada.readthedocs.io/en/latest/docs/new_iso_image.html">
    {id_clone}) { -% if ($_user->can_change_settings){ +% if ($user->can_change_settings){ % }
    From 0e30ceaa533c5c418fa32cb26eddda3375057074 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Wed, 15 Nov 2017 12:43:54 +0100 Subject: [PATCH 106/170] [#320] allow running anonymous domains --- rvd_front.pl | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/rvd_front.pl b/rvd_front.pl index e6df79de6..7e64215ad 100644 --- a/rvd_front.pl +++ b/rvd_front.pl @@ -124,9 +124,13 @@ if $url =~ /(screenshot|\.json)/ && !_logged_in($c); + if ($url =~ m{^/machine/display/} && !_logged_in($c)) { + $USER = _get_anonymous_user($c); + return if $USER->is_temporary; + } return login($c) if - $url !~ m{^/(anonymous|login|logout|requirements|robots.txt)} + $url !~ m{^/(anonymous|login|logout|requirements|request|robots.txt)} && $url !~ m{^/(css|font|img|js)} && !_logged_in($c); @@ -527,6 +531,15 @@ return _show_request($c,$id); }; +get '/anonymous/request/(:id).(:type)' => sub { + my $c = shift; + my $id = $c->stash('id'); + + $USER = _anonymous_user($c); + + return _show_request($c,$id); +}; + get '/requests.json' => sub { my $c = shift; return list_requests($c); @@ -1090,7 +1103,10 @@ sub provision { $c->stash(error => "Domain provisioning request not finished, status='".$req->status."'."); - $c->stash(link => "/request/".$req->id.".html"); + my $req_link = "/request/".$req->id.".html"; + $req_link = "/anonymous$req_link" if $USER->is_temporary; + + $c->stash(link => $req_link); $c->stash(link_msg => ''); return; } @@ -1128,7 +1144,9 @@ sub show_link { && $req->error !~ /already running/i && $req->status ne 'waiting'; - return $c->redirect_to("/request/".$req->id.".html"); + my $req_link = "/request/".$req->id.".html"; + $req_link = "/anonymous$req_link" if $USER->is_temporary; + return $c->redirect_to($req_link); # if !$req->status eq 'done'; } if ( $domain->is_paused) { @@ -1440,10 +1458,11 @@ sub view_machine { my $c = shift; my $domain = shift; - return login($c) if !_logged_in($c); + return login($c) unless ( defined $USER && $USER->is_temporary) || _logged_in($c); $domain = _search_requested_machine($c) if !$domain; return $c->render(template => 'main/fail') if !$domain; + return show_link($c, $domain); } @@ -1731,6 +1750,21 @@ sub _remote_ip { ); } +sub _get_anonymous_user { + my $c = shift; + + $c->stash(_user => undef); + my $name = $c->session('anonymous_user'); + + my $user= Ravada::Auth::SQL->new( name => $name ); + + confess "user ".$user->name." has no id, may not be in table users" + if !$user->id; + + return $user; +} + +# get or create a new anonymous user sub _anonymous_user { my $c = shift; From 86b8a80a95706bf18e4ee272315519de16283e09 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 16 Nov 2017 16:28:32 +0100 Subject: [PATCH 107/170] [#472] is_public field was removed in security review Fixes #472 --- lib/Ravada/Front.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index ad1308632..60975f9be 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -186,7 +186,7 @@ sub list_domains { my $self = shift; my %args = @_; - my $query = "SELECT name, id, id_base, is_base FROM domains "; + my $query = "SELECT name, id, id_base, is_base, is_public FROM domains "; my $where = ''; for my $field ( sort keys %args ) { From 9a94375ad8dfa86a0a642a56b0657a7ad411a6ce Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 16 Nov 2017 15:59:55 +0100 Subject: [PATCH 108/170] [#392] test for volatile domains --- t/vm/v10_volatile.t | 106 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 t/vm/v10_volatile.t diff --git a/t/vm/v10_volatile.t b/t/vm/v10_volatile.t new file mode 100644 index 000000000..8fe45cf3b --- /dev/null +++ b/t/vm/v10_volatile.t @@ -0,0 +1,106 @@ +#!/usr/bin/perl +# test volatile anonymous domains kiosk mode + +use warnings; +use strict; + +use Carp qw(confess); +use Data::Dumper; +use POSIX qw(WNOHANG); +use Test::More; +use Test::SQL::Data; + +use_ok('Ravada'); +use_ok('Ravada::Network'); + +use lib 't/lib'; +use Test::Ravada; + +my $test = Test::SQL::Data->new(config => 't/etc/sql.conf'); +init($test->connector); + +my $IP = "10.0.0.1"; +my $NETWORK = $IP; +$NETWORK =~ s{(.*\.).*}{$1.0/24}; + +################################################################################ + +sub create_network { + + my $sth = $test->dbh->prepare( + "INSERT INTO networks (name, address) " + ." VALUES (?,?)" + ); + $sth->execute('foo',$NETWORK); + $sth->finish; +} + +sub delete_network { + my $sth = $test->dbh->prepare( + "DELETE FROM networks WHERE address=?" + ); + $sth->execute($NETWORK); + $sth->finish; +} + +sub id_network { + my $address = shift; + + my $sth = $test->dbh->prepare( + "SELECT id FROM networks WHERE address=?" + ); + $sth->execute($address); + my ($id) = $sth->fetchrow; + + return $id; +} + +sub allow_anonymous { + my $base = shift; + + my $id_network = id_network($NETWORK); + my $sth = $test->dbh->prepare( + "INSERT INTO domains_network " + ." (id_domain, id_network, anonymous )" + ." VALUES (?,?,?) " + ); + $sth->execute($base->id, $id_network, 1); + $sth->finish; +} + +sub test_volatile { +} +################################################################################ + +clean(); + + +for my $vm_name ('Void', 'KVM') { + my $vm = rvd_back->search_vm($vm_name); + + SKIP: { + + my $msg = "SKIPPED: No virtual managers found"; + if ($vm && $vm_name =~ /kvm/i && $>) { + $msg = "SKIPPED: Test must run as root"; + $vm = undef; + } + + skip($msg,10) if !$vm; + diag("Testing timeout for $vm_name"); + + create_network(); + + my $base= create_domain($vm_name); + $base->prepare_base(user_admin()); + allow_anonymous($base); + + test_volatile($vm_name); + + delete_network(); + } + +} + +clean(); + From c80061e0ca42ce39b02c412e3b4416f9dbcf2e2c Mon Sep 17 00:00:00 2001 From: fv3rdugo Date: Thu, 16 Nov 2017 19:36:02 +0100 Subject: [PATCH 109/170] [#473] Fix all xml with graphics params --- etc/xml/jessie-i386.xml | 10 +++++++--- etc/xml/trusty-amd64.xml | 4 ++-- etc/xml/trusty-i386.xml | 10 +++++++--- etc/xml/win10.xml | 5 ++--- etc/xml/win7pro.xml | 8 +++++++- etc/xml/win8.1.xml | 8 +++++++- etc/xml/windows_10.xml | 6 +++++- etc/xml/windows_12.xml | 6 +++++- etc/xml/windows_7.xml | 6 +++++- etc/xml/windows_8.xml | 6 +++++- etc/xml/windows_xp.xml | 6 +++++- etc/xml/zesty-amd64.xml | 4 ++-- 12 files changed, 59 insertions(+), 20 deletions(-) diff --git a/etc/xml/jessie-i386.xml b/etc/xml/jessie-i386.xml index 7dc7e278a..5809c643f 100644 --- a/etc/xml/jessie-i386.xml +++ b/etc/xml/jessie-i386.xml @@ -54,8 +54,13 @@ - - + + + + + + +
    @@ -69,4 +74,3 @@ - diff --git a/etc/xml/trusty-amd64.xml b/etc/xml/trusty-amd64.xml index 7dd58d2d1..2adfcf4cb 100644 --- a/etc/xml/trusty-amd64.xml +++ b/etc/xml/trusty-amd64.xml @@ -54,8 +54,8 @@ - - + + diff --git a/etc/xml/trusty-i386.xml b/etc/xml/trusty-i386.xml index 221e14e96..58f49a1b9 100644 --- a/etc/xml/trusty-i386.xml +++ b/etc/xml/trusty-i386.xml @@ -54,8 +54,13 @@ - - + + + + + + +
    @@ -69,4 +74,3 @@ - diff --git a/etc/xml/win10.xml b/etc/xml/win10.xml index fcc38f48e..6d8c1c687 100644 --- a/etc/xml/win10.xml +++ b/etc/xml/win10.xml @@ -87,8 +87,8 @@ - - + + @@ -113,4 +113,3 @@ - diff --git a/etc/xml/win7pro.xml b/etc/xml/win7pro.xml index 3091d5dbc..d1569eb67 100644 --- a/etc/xml/win7pro.xml +++ b/etc/xml/win7pro.xml @@ -104,7 +104,13 @@ or other application using the libvirt API. - + + + + + + +
    diff --git a/etc/xml/win8.1.xml b/etc/xml/win8.1.xml index 39091f85d..49f78995c 100644 --- a/etc/xml/win8.1.xml +++ b/etc/xml/win8.1.xml @@ -104,7 +104,13 @@ or other application using the libvirt API. - + + + + + + +
    diff --git a/etc/xml/windows_10.xml b/etc/xml/windows_10.xml index 4553d0d4d..bffe462e0 100644 --- a/etc/xml/windows_10.xml +++ b/etc/xml/windows_10.xml @@ -82,7 +82,11 @@ - + + + + +
    diff --git a/etc/xml/windows_12.xml b/etc/xml/windows_12.xml index 892e47fa5..1efa0b296 100644 --- a/etc/xml/windows_12.xml +++ b/etc/xml/windows_12.xml @@ -91,7 +91,11 @@ - + + + + +
    diff --git a/etc/xml/windows_7.xml b/etc/xml/windows_7.xml index 51134d14b..137555ac8 100644 --- a/etc/xml/windows_7.xml +++ b/etc/xml/windows_7.xml @@ -91,7 +91,11 @@ - + + + + +
    diff --git a/etc/xml/windows_8.xml b/etc/xml/windows_8.xml index b3e7ff865..1748bed38 100644 --- a/etc/xml/windows_8.xml +++ b/etc/xml/windows_8.xml @@ -118,7 +118,11 @@ - + + + + + diff --git a/etc/xml/windows_xp.xml b/etc/xml/windows_xp.xml index 55003ecd3..44fcb8d49 100644 --- a/etc/xml/windows_xp.xml +++ b/etc/xml/windows_xp.xml @@ -91,7 +91,11 @@ - + + + + +
    diff --git a/etc/xml/zesty-amd64.xml b/etc/xml/zesty-amd64.xml index 1e9128bc6..0e6039f95 100644 --- a/etc/xml/zesty-amd64.xml +++ b/etc/xml/zesty-amd64.xml @@ -54,8 +54,8 @@ - - + + From 49fc44ad67b1badd31e46fed6963e5f543057edb Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 17 Nov 2017 08:44:35 +0100 Subject: [PATCH 110/170] [#320] KVM volatile domains should be removed on shutdown Letting libvirt do the removal automatically --- lib/Ravada.pm | 1 + lib/Ravada/Domain.pm | 23 +++++++++++++++++------ lib/Ravada/VM.pm | 1 + lib/Ravada/VM/KVM.pm | 12 ++++++++++-- t/vm/v10_volatile.t | 28 ++++++++++++++++++++++++++-- 5 files changed, 55 insertions(+), 10 deletions(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index 767c34af5..bc68060a2 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -720,6 +720,7 @@ sub _upgrade_tables { $self->_upgrade_table('domains','spice_password','varchar(20) DEFAULT NULL'); $self->_upgrade_table('domains','description','text DEFAULT NULL'); $self->_upgrade_table('domains','run_timeout','int DEFAULT NULL'); + $self->_upgrade_table('domains','is_volatile','int NOT NULL DEFAULT 0'); } diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index 72e37a78f..752da83a4 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -1031,9 +1031,9 @@ sub _post_shutdown { my %arg = @_; my $timeout = $arg{timeout}; - $self->_remove_temporary_machine(@_); $self->_remove_iptables(@_); $self->clean_swap_volumes(@_) if $self->id_base() && !$self->is_active; + $self->_remove_temporary_machine(@_); if (defined $timeout) { if ($timeout<2 && $self->is_active) { @@ -1127,11 +1127,7 @@ sub _remove_temporary_machine { return if !$self->is_known(); - eval { $user = Ravada::Auth::SQL->search_by_id($self->id_owner) }; - return if !$user; - - if ($user->is_temporary) { - $self->remove($user); + if ($self->is_volatile) { my $req= $args{request}; $req->status( "removing" @@ -1139,6 +1135,11 @@ sub _remove_temporary_machine { ." because user " .$user->name." is temporary") if $req; + + my $domain_copy; + eval { $domain_copy = $self->_vm->search_domain($self->name) }; + warn "going to remove";sleep 1; + $self->remove($user) if $domain_copy ; } } @@ -1369,6 +1370,16 @@ sub is_public { return $self->_data('is_public'); } +=head2 is_volatile + +Returns if the domain is volatile, so it will be removed on shutdown + +=cut + +sub is_volatile($self) { + return $self->_data('is_volatile'); +} + =head2 run_timeout Sets or get the domain run timeout. When it expires it is shut down. diff --git a/lib/Ravada/VM.pm b/lib/Ravada/VM.pm index 28b77737f..00e0448b3 100644 --- a/lib/Ravada/VM.pm +++ b/lib/Ravada/VM.pm @@ -143,6 +143,7 @@ sub _around_create_domain { $domain->run_timeout($base->run_timeout) if defined $base->run_timeout(); } + die "TODO if user->is_temporary domain->is_temporary(1)"; return $domain; } diff --git a/lib/Ravada/VM/KVM.pm b/lib/Ravada/VM/KVM.pm index 38ad2d30b..af954c080 100644 --- a/lib/Ravada/VM/KVM.pm +++ b/lib/Ravada/VM/KVM.pm @@ -622,6 +622,10 @@ sub _domain_create_common { my $xml = shift; my %args = @_; + my $id_owner = delete $args{id_owner} or confess "ERROR: The id_owner is mandatory"; + my $user = Ravada::Auth::SQL->search_by_id($id_owner) + or confess "ERROR: User id $id_owner doesn't exist"; + $self->_xml_modify_memory($xml,$args{memory}) if $args{memory}; $self->_xml_modify_network($xml , $args{network}) if $args{network}; $self->_xml_modify_mac($xml); @@ -632,8 +636,12 @@ sub _domain_create_common { my $dom; eval { - $dom = $self->vm->define_domain($xml->toString()); - $dom->create if $args{active}; + if ($user->is_temporary) { + $dom = $self->vm->create_domain($xml->toString()); + } else { + $dom = $self->vm->define_domain($xml->toString()); + $dom->create if $args{active}; + } }; if ($@) { my $out; diff --git a/t/vm/v10_volatile.t b/t/vm/v10_volatile.t index 8fe45cf3b..2d10b5785 100644 --- a/t/vm/v10_volatile.t +++ b/t/vm/v10_volatile.t @@ -69,6 +69,29 @@ sub allow_anonymous { } sub test_volatile { + my ($vm_name, $base) = @_; + + my $name = new_domain_name(); + + my $user_name = new_domain_name(); + my $user = Ravada::Auth::SQL::add_user(name => $user_name, is_temporary => 1); + + my $clone = $base->clone( + user => $user + , name => $name + ); + is($clone->is_active,1,"[$vm_name] Expecting clone active"); + $clone->start($user) if !$clone->is_active; + + is($clone->is_volatile,1); + + eval { $clone->shutdown_now(user_admin) if $clone->is_active}; + is(''.$@,'',"[$vm_name] Expecting no error after shutdown"); + + my $vm = rvd_back->search_vm($vm_name); + my $domain2 = $vm->search_domain($name); + ok(!$domain2,"[$vm_name] Expecting domain removed after shutdown"); + } ################################################################################ @@ -87,15 +110,16 @@ for my $vm_name ('Void', 'KVM') { } skip($msg,10) if !$vm; - diag("Testing timeout for $vm_name"); + diag("Testing volatile for $vm_name"); create_network(); my $base= create_domain($vm_name); $base->prepare_base(user_admin()); + $base->is_public(1); allow_anonymous($base); - test_volatile($vm_name); + test_volatile($vm_name, $base); delete_network(); } From 11dbd0667259eb858a037f2b61f3550de2da6eba Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 17 Nov 2017 11:24:04 +0100 Subject: [PATCH 111/170] [#320] set domain as volatile if temporary user --- lib/Ravada/Domain.pm | 13 ++++++------- lib/Ravada/VM.pm | 6 +++++- lib/Ravada/VM/Void.pm | 2 ++ t/vm/v10_volatile.t | 4 ++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index 752da83a4..4998450f0 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -239,9 +239,9 @@ sub _allow_manage { } -sub _allow_remove { - my $self = shift; - my ($user) = @_; +sub _allow_remove($self, $user) { + + confess "ERROR: Undefined user" if !defined $user; die "ERROR: remove not allowed for user ".$user->name if !$user->can_remove(); @@ -1123,7 +1123,7 @@ sub _remove_temporary_machine { my $self = shift; my %args = @_; - my $user; + my $user = delete $args{user} or confess "ERROR: Missing user"; return if !$self->is_known(); @@ -1138,7 +1138,6 @@ sub _remove_temporary_machine { my $domain_copy; eval { $domain_copy = $self->_vm->search_domain($self->name) }; - warn "going to remove";sleep 1; $self->remove($user) if $domain_copy ; } } @@ -1376,8 +1375,8 @@ Returns if the domain is volatile, so it will be removed on shutdown =cut -sub is_volatile($self) { - return $self->_data('is_volatile'); +sub is_volatile($self, $value=undef) { + return $self->_set_data('is_volatile', $value); } =head2 run_timeout diff --git a/lib/Ravada/VM.pm b/lib/Ravada/VM.pm index 00e0448b3..f120957c9 100644 --- a/lib/Ravada/VM.pm +++ b/lib/Ravada/VM.pm @@ -132,6 +132,8 @@ sub _around_create_domain { my $self = shift; my %args = @_; + my $id_owner = delete $args{id_owner} or confess "ERROR: Missing id_owner"; + $self->_pre_create_domain(@_); my $domain = $self->$orig(@_); @@ -143,7 +145,9 @@ sub _around_create_domain { $domain->run_timeout($base->run_timeout) if defined $base->run_timeout(); } - die "TODO if user->is_temporary domain->is_temporary(1)"; + my $user = Ravada::Auth::SQL->search_by_id($id_owner); + $domain->is_volatile(1) if $user->is_temporary(); + return $domain; } diff --git a/lib/Ravada/VM/Void.pm b/lib/Ravada/VM/Void.pm index 716c71a23..ff90af537 100644 --- a/lib/Ravada/VM/Void.pm +++ b/lib/Ravada/VM/Void.pm @@ -52,6 +52,7 @@ sub create_domain { , id_base => $args{id_base} ); if ($args{id_base}) { + my $owner = Ravada::Auth::SQL->search_by_id($args{id_owner}); my $domain_base = $self->search_domain_by_id($args{id_base}); confess "I can't find base domain id=$args{id_base}" if !$domain_base; @@ -63,6 +64,7 @@ sub create_domain { , path => "$dir/$new_name" ,type => 'file'); } + $domain->start(user => $owner) if $owner->is_temporary; } else { my ($file_img) = $domain->disk_device(); $domain->add_volume(name => 'void-diska' , size => ( $args{disk} or 1) diff --git a/t/vm/v10_volatile.t b/t/vm/v10_volatile.t index 2d10b5785..9ee2e60b0 100644 --- a/t/vm/v10_volatile.t +++ b/t/vm/v10_volatile.t @@ -73,7 +73,7 @@ sub test_volatile { my $name = new_domain_name(); - my $user_name = new_domain_name(); + my $user_name = "user_".new_domain_name(); my $user = Ravada::Auth::SQL::add_user(name => $user_name, is_temporary => 1); my $clone = $base->clone( @@ -83,7 +83,7 @@ sub test_volatile { is($clone->is_active,1,"[$vm_name] Expecting clone active"); $clone->start($user) if !$clone->is_active; - is($clone->is_volatile,1); + is($clone->is_volatile,1,"[$vm_name] Expecting is_volatile"); eval { $clone->shutdown_now(user_admin) if $clone->is_active}; is(''.$@,'',"[$vm_name] Expecting no error after shutdown"); From e97ab445bc29f7f48c657baa07c60e5b8aa90210 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 17 Nov 2017 12:29:01 +0100 Subject: [PATCH 112/170] [#320] volatile domains could be removed after down --- lib/Ravada/Domain.pm | 12 ++++++++---- lib/Ravada/Domain/KVM.pm | 8 ++++++++ lib/Ravada/Domain/Void.pm | 5 +++++ t/vm/v10_volatile.t | 1 + 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index 4998450f0..382cb124d 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -41,6 +41,8 @@ requires 'display'; requires 'is_active'; requires 'is_hibernated'; requires 'is_paused'; +requires 'is_removed'; + requires 'start'; requires 'shutdown'; requires 'shutdown_now'; @@ -1032,13 +1034,15 @@ sub _post_shutdown { my $timeout = $arg{timeout}; $self->_remove_iptables(@_); - $self->clean_swap_volumes(@_) if $self->id_base() && !$self->is_active; + if ($self->id_base()) { + $self->clean_swap_volumes(@_) if !$self->is_removed && !$self->is_removed; + } $self->_remove_temporary_machine(@_); - if (defined $timeout) { - if ($timeout<2 && $self->is_active) { + if (defined $timeout && !$self->is_removed) { + if ($timeout<2 && !$self->is_removed && $self->is_active) { sleep $timeout; - return $self->_do_force_shutdown() if $self->is_active; + return $self->_do_force_shutdown() if !$self->is_removed && $self->is_active; } my $req = Ravada::Request->force_shutdown_domain( diff --git a/lib/Ravada/Domain/KVM.pm b/lib/Ravada/Domain/KVM.pm index 85895267f..e1f15fc73 100644 --- a/lib/Ravada/Domain/KVM.pm +++ b/lib/Ravada/Domain/KVM.pm @@ -1593,4 +1593,12 @@ sub pre_remove { $self->domain->managed_save_remove if $self->domain->has_managed_save_image; } +sub is_removed($self) { + my $is_removed = 0; + eval { $self->domain->get_xml_description}; + return 1 if $@ && $@ =~ /libvirt error code: 42/; + die $@ if $@; + return 0; +} + 1; diff --git a/lib/Ravada/Domain/Void.pm b/lib/Ravada/Domain/Void.pm index 2d3b9076a..b0c061080 100644 --- a/lib/Ravada/Domain/Void.pm +++ b/lib/Ravada/Domain/Void.pm @@ -470,4 +470,9 @@ sub clean_swap_volumes { sub hybernate { confess "Not supported"; } sub type { 'Void' } + +sub is_removed { + my $self = shift; + return !-e $self->_config_file(); +} 1; diff --git a/t/vm/v10_volatile.t b/t/vm/v10_volatile.t index 9ee2e60b0..a45970ae4 100644 --- a/t/vm/v10_volatile.t +++ b/t/vm/v10_volatile.t @@ -128,3 +128,4 @@ for my $vm_name ('Void', 'KVM') { clean(); +done_testing(); From dfe6c4d88b471a10d7b7011f8726af5b64c01939 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 17 Nov 2017 15:42:08 +0100 Subject: [PATCH 113/170] [#320] make sure volatiles are removed in any case --- lib/Ravada/Domain.pm | 15 +++++++++------ lib/Ravada/Front.pm | 4 +++- t/vm/v10_volatile.t | 18 ++++++++++++++++-- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index 382cb124d..5e8c6620e 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -152,6 +152,7 @@ before 'resume' => \&_allow_manage; before 'shutdown' => \&_pre_shutdown; after 'shutdown' => \&_post_shutdown; +before 'shutdown_now' => \&_pre_shutdown_now; after 'shutdown_now' => \&_post_shutdown_now; before 'force_shutdown' => \&_pre_shutdown_now; @@ -264,7 +265,7 @@ sub _allow_shutdown { my $user = $args{user} || confess "ERROR: Missing user arg"; if ( $self->id_base() && $user->can_shutdown_clone()) { - my $base = $self->open($self->id_base); + my $base = Ravada::Domain->open($self->id_base); return if $base->id_owner == $user->id; } elsif($user->can_shutdown_all) { return; @@ -1126,12 +1127,12 @@ sub _remove_iptables { sub _remove_temporary_machine { my $self = shift; + return if !$self->is_volatile; my %args = @_; my $user = delete $args{user} or confess "ERROR: Missing user"; - return if !$self->is_known(); - if ($self->is_volatile) { +# return $self->_after_remove_domain() if !$self->is_known(); my $req= $args{request}; $req->status( "removing" @@ -1140,9 +1141,11 @@ sub _remove_temporary_machine { .$user->name." is temporary") if $req; - my $domain_copy; - eval { $domain_copy = $self->_vm->search_domain($self->name) }; - $self->remove($user) if $domain_copy ; + if ($self->is_removed) { + $self->_after_remove_domain(); + } else { + $self->remove($user); + } } } diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index d2e777bd4..d67cc7146 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -186,7 +186,7 @@ sub list_domains { my $self = shift; my %args = @_; - my $query = "SELECT name, id, id_base, is_base FROM domains "; + my $query = "SELECT name, id, id_base, is_base, is_public, is_volatile FROM domains "; my $where = ''; for my $field ( sort keys %args ) { @@ -202,6 +202,8 @@ sub list_domains { while ( my $row = $sth->fetchrow_hashref) { my $domain ; eval { $domain = $self->search_domain($row->{name}) }; + $row->{has_clones} = 0 if !exists $row->{has_clones}; + $row->{is_locked} = 0 if !exists $row->{is_locked}; if ( $domain ) { $row->{is_active} = 1 if $domain->is_active; $row->{is_locked} = $domain->is_locked; diff --git a/t/vm/v10_volatile.t b/t/vm/v10_volatile.t index a45970ae4..768d027b1 100644 --- a/t/vm/v10_volatile.t +++ b/t/vm/v10_volatile.t @@ -85,13 +85,27 @@ sub test_volatile { is($clone->is_volatile,1,"[$vm_name] Expecting is_volatile"); + my $clone2 = rvd_back->search_domain($name); + is($clone2->is_volatile,1,"[$vm_name] Expecting is_volatile"); + + my $vm = rvd_back->search_vm($vm_name); + my $clone3 = $vm->search_domain($name); + is($clone3->is_volatile,1,"[$vm_name] Expecting is_volatile"); + eval { $clone->shutdown_now(user_admin) if $clone->is_active}; is(''.$@,'',"[$vm_name] Expecting no error after shutdown"); - my $vm = rvd_back->search_vm($vm_name); my $domain2 = $vm->search_domain($name); - ok(!$domain2,"[$vm_name] Expecting domain removed after shutdown"); + ok(!$domain2,"[$vm_name] Expecting domain $name removed after shutdown") or exit; + + my $domain_f = rvd_front->search_domain($name); + ok(!$domain_f,"[$vm_name] Expecting domain removed after shutdown"); + + my $domain_b = rvd_back->search_domain($name); + ok(!$domain_b,"[$vm_name] Expecting domain removed after shutdown"); + my $domains_f = rvd_front->list_domains(); + ok(!grep({ $_->{name} eq $name } @$domains_f),"[$vm_name] Expecting $name not listed"); } ################################################################################ From 2fa13f6c77459d60f2fbb81a6b50ab705f4d9407 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 17 Nov 2017 17:13:20 +0100 Subject: [PATCH 114/170] [#320] don't show volatile domains that ain't there --- lib/Ravada/Front.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index d67cc7146..c64d22470 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -202,6 +202,7 @@ sub list_domains { while ( my $row = $sth->fetchrow_hashref) { my $domain ; eval { $domain = $self->search_domain($row->{name}) }; + next if $row->{is_volatile} && !$domain; $row->{has_clones} = 0 if !exists $row->{has_clones}; $row->{is_locked} = 0 if !exists $row->{is_locked}; if ( $domain ) { From 7f4c102658f39bc990b25774c65152ec3bc0a3bd Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 17 Nov 2017 17:13:41 +0100 Subject: [PATCH 115/170] [#320] test auto remove --- t/vm/v10_volatile.t | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/t/vm/v10_volatile.t b/t/vm/v10_volatile.t index 768d027b1..68daa80ac 100644 --- a/t/vm/v10_volatile.t +++ b/t/vm/v10_volatile.t @@ -83,6 +83,8 @@ sub test_volatile { is($clone->is_active,1,"[$vm_name] Expecting clone active"); $clone->start($user) if !$clone->is_active; + like($clone->spice_password,qr{..+}); + is($clone->is_volatile,1,"[$vm_name] Expecting is_volatile"); my $clone2 = rvd_back->search_domain($name); @@ -107,6 +109,42 @@ sub test_volatile { my $domains_f = rvd_front->list_domains(); ok(!grep({ $_->{name} eq $name } @$domains_f),"[$vm_name] Expecting $name not listed"); } + +# KVM volatiles get auto-removed +sub test_volatile_auto_kvm { + my ($vm_name, $base) = @_; + + my $name = new_domain_name(); + + my $user_name = "user_".new_domain_name(); + my $user = Ravada::Auth::SQL::add_user(name => $user_name, is_temporary => 1); + + my $clone = $base->clone( + user => $user + , name => $name + ); + is($clone->is_active,1,"[$vm_name] Expecting clone active"); + $clone->start($user) if !$clone->is_active; + + is($clone->is_volatile,1,"[$vm_name] Expecting is_volatile"); + is(''.$@,'',"[$vm_name] Expecting no error after shutdown"); + + $clone->domain->destroy(); + + my $vm = rvd_back->search_vm($vm_name); + my $domain2 = $vm->search_domain($name); + ok(!$domain2,"[$vm_name] Expecting domain $name removed after shutdown") or exit; + + my $domain_f = rvd_front->search_domain($name); + ok(!$domain_f,"[$vm_name] Expecting domain removed after shutdown"); + + my $domain_b = rvd_back->search_domain($name); + ok(!$domain_b,"[$vm_name] Expecting domain removed after shutdown"); + + my $domains_f = rvd_front->list_domains(); + ok(!grep({ $_->{name} eq $name } @$domains_f),"[$vm_name] Expecting $name not listed"); +} + ################################################################################ clean(); @@ -134,6 +172,7 @@ for my $vm_name ('Void', 'KVM') { allow_anonymous($base); test_volatile($vm_name, $base); + test_volatile_auto_kvm($vm_name, $base) if $vm_name eq'KVM'; delete_network(); } From e62753843e403bdb721776c48e6d366113c33855 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 17 Nov 2017 17:13:54 +0100 Subject: [PATCH 116/170] [#320] tell if domain is volatile --- templates/main/admin_machines.html.ep | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/main/admin_machines.html.ep b/templates/main/admin_machines.html.ep index a24b198a8..ed7b2c249 100644 --- a/templates/main/admin_machines.html.ep +++ b/templates/main/admin_machines.html.ep @@ -150,11 +150,13 @@
    From 63ab8cf57bc7b390c3acce409dd040f6acda2788 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 10:59:55 +0100 Subject: [PATCH 133/170] [#478] retries if storage busy Fixes #478 --- lib/Ravada/VM/KVM.pm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/Ravada/VM/KVM.pm b/lib/Ravada/VM/KVM.pm index 51bb1b71e..96b5e630e 100644 --- a/lib/Ravada/VM/KVM.pm +++ b/lib/Ravada/VM/KVM.pm @@ -265,10 +265,12 @@ sub search_volume_re($self,$pattern,$refresh=0) { sub _refresh_storage_pools($self) { for my $pool ($self->vm->list_storage_pools) { - eval { $pool->refresh() }; - last if !$@; - warn $@ if $@ !~ /pool .* has asynchronous jobs running/; - sleep 1; + for (;;) { + eval { $pool->refresh() }; + last if !$@; + warn $@ if $@ !~ /pool .* has asynchronous jobs running/; + sleep 1; + } } } From 602a658284fb6c1b16fefdce6880fa6f1f656c64 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 11:18:13 +0100 Subject: [PATCH 134/170] [#401] remove device data if removed Fixes #401 --- lib/Ravada/Front.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index 60975f9be..37d5e2b1b 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -300,6 +300,7 @@ sub list_iso_images { while (my $row = $sth->fetchrow_hashref) { push @iso,($row); + delete $row->{device} if !-e $row->{device}; next if $row->{device}; my ($file); From 5a52beb6519249eca862f3162fb8e406a2cfeac5 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 13:06:14 +0100 Subject: [PATCH 135/170] If we clone, get the VM from the base --- lib/Ravada.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index bc68060a2..9482a7344 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -721,6 +721,8 @@ sub _upgrade_tables { $self->_upgrade_table('domains','description','text DEFAULT NULL'); $self->_upgrade_table('domains','run_timeout','int DEFAULT NULL'); $self->_upgrade_table('domains','is_volatile','int NOT NULL DEFAULT 0'); + + $self->_upgrade_table('domains_network','allowed','int not null default 1'); } @@ -942,7 +944,10 @@ sub create_domain { $vm = $self->search_vm($vm_name); confess "ERROR: vm $vm_name not found" if !$vm; } - $vm = $self->vm->[0] if !$vm; + if ($args{id_base}) { + my $base = Ravada::Domain->open($args{id_base}); + $vm = Ravada::VM->open($base->_vm->id); + } confess "No vm found" if !$vm; From e40d596c62353124c7dfec163327e3216f8aad6b Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 13:06:35 +0100 Subject: [PATCH 136/170] [#320] test different spice passwords and clones alike --- t/vm/v10_volatile.t | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/t/vm/v10_volatile.t b/t/vm/v10_volatile.t index c2f5a42a4..f9b6fbc0d 100644 --- a/t/vm/v10_volatile.t +++ b/t/vm/v10_volatile.t @@ -129,7 +129,11 @@ sub test_volatile_auto_kvm { is($clone->is_volatile,1,"[$vm_name] Expecting is_volatile"); is(''.$@,'',"[$vm_name] Expecting no error after shutdown"); + my $spice_password = $clone->spice_password(); + like($spice_password,qr(..+)); + $clone->domain->destroy(); + $clone=undef; my $vm = rvd_back->search_vm($vm_name); my $domain2 = $vm->search_domain($name); @@ -143,6 +147,30 @@ sub test_volatile_auto_kvm { my $domains_f = rvd_front->list_domains(); ok(!grep({ $_->{name} eq $name } @$domains_f),"[$vm_name] Expecting $name not listed"); + + my $clone2; + eval { + $clone2 = $base->clone( + user => $user + ,name => $name + ); + }; + is(''.$@,'',"[$vm_name] Expecting clone called $name created"); + isnt($clone2->spice_password, $spice_password + ,"[$vm_name] Expecting spice password different") if $clone2; + + is($clone2->is_active,1,"[$vm_name] Expecting clone active"); + + my $clone3= $vm->search_domain($name); + ok($clone3,"[$vm_name] Expecting clone $name"); + + eval { $clone2->remove(user_admin) if $clone2 }; + is(''.$@,''); + + my $sth = $test->dbh->prepare("SELECT * FROM domains WHERE name=?"); + $sth->execute($name); + my $row = $sth->fetchrow_hashref; + is(keys(%$row),0); } ################################################################################ From f1e6c0ecd2809c59c8993002d87f74c0ec49edb9 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 13:07:13 +0100 Subject: [PATCH 137/170] [#320] the domain may already be removed --- lib/Ravada/Domain/KVM.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/Ravada/Domain/KVM.pm b/lib/Ravada/Domain/KVM.pm index e1f15fc73..f8cdf1047 100644 --- a/lib/Ravada/Domain/KVM.pm +++ b/lib/Ravada/Domain/KVM.pm @@ -186,16 +186,20 @@ sub remove { $self->_do_force_shutdown(); } - $self->remove_disks(); + + eval { $self->remove_disks(); }; + die $@ if $@ && $@ !~ /libvirt error code: 42/; # warn "WARNING: Problem removing disks for ".$self->name." : $@" if $@ && $0 !~ /\.t$/; - $self->_remove_file_image(); + eval { $self->_remove_file_image() }; + die $@ if $@ && $@ !~ /libvirt error code: 42/; # warn "WARNING: Problem removing file image for ".$self->name." : $@" if $@ && $0 !~ /\.t$/; # warn "WARNING: Problem removing ".$self->file_base_img." for ".$self->name # ." , I will try again later : $@" if $@; - $self->domain->undefine(); + eval { $self->domain->undefine() }; + die $@ if $@ && $@ !~ /libvirt error code: 42/; } From 91a32f9f3b6597c5b19f1284f7d4aa4d79cc5b53 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 13:07:31 +0100 Subject: [PATCH 138/170] [#320] remove domain from listing if gone --- lib/Ravada/Front.pm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index c64d22470..76283b72e 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -202,7 +202,10 @@ sub list_domains { while ( my $row = $sth->fetchrow_hashref) { my $domain ; eval { $domain = $self->search_domain($row->{name}) }; - next if $row->{is_volatile} && !$domain; + if ( $row->{is_volatile} && !$domain ) { + $self->_remove_domain_db($row->{id}); + next; + } $row->{has_clones} = 0 if !exists $row->{has_clones}; $row->{is_locked} = 0 if !exists $row->{is_locked}; if ( $domain ) { @@ -224,6 +227,12 @@ sub list_domains { return \@domains; } +sub _remove_domain_db($self, $id) { + my $sth = $CONNECTOR->dbh->prepare("DELETE FROM domains WHERE id=?"); + $sth->execute($id); + $sth->finish; +} + =head2 domain_info Returns information of a domain From 35f311afcafd2c3814790d632c479e77338d92c9 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 13:07:41 +0100 Subject: [PATCH 139/170] [#320] catch wrong VMs --- lib/Ravada/Domain/Void.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/Ravada/Domain/Void.pm b/lib/Ravada/Domain/Void.pm index b0c061080..1e99cc6b0 100644 --- a/lib/Ravada/Domain/Void.pm +++ b/lib/Ravada/Domain/Void.pm @@ -41,6 +41,10 @@ sub BUILD { if ($args->{id_base}) { my $base = Ravada::Domain->open($args->{id_base}); + + confess "ERROR: Wrong base ".ref($base)." ".$base->type + ."for domain in vm ".$self->_vm->type + if $base->type ne $self->_vm->type; my $drivers = $base->_value('drivers'); $self->_store(drivers => $drivers ); } From 244ee566b2ebe2f8835d4ff7dd6236c5dc235b9c Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 15:32:49 +0100 Subject: [PATCH 140/170] Properly test download local --- t/request/20_download_local.t | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/t/request/20_download_local.t b/t/request/20_download_local.t index 136eb02c7..ab20378c9 100644 --- a/t/request/20_download_local.t +++ b/t/request/20_download_local.t @@ -104,9 +104,14 @@ sub search_id_isos { sub httpd_localhost { my $ua = Mojo::UserAgent->new; - eval { return $ua->get('http://localhost/iso')->result->is_success }; - diag($@) if $@ !~ /Connection refused/; - return; + eval { + my $res = $ua->get('http://localhost/iso')->res; + return 1 if $res->code == 200; + diag($res->message); + return 0; + }; + return if !$@; + is($@,qr/Connection refused/); } ################################################################## From d7fb17fc20d6a00dfb89c83b870c8d4d037da484 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 15:32:49 +0100 Subject: [PATCH 141/170] Properly test download local --- t/request/20_download_local.t | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/t/request/20_download_local.t b/t/request/20_download_local.t index 136eb02c7..ab20378c9 100644 --- a/t/request/20_download_local.t +++ b/t/request/20_download_local.t @@ -104,9 +104,14 @@ sub search_id_isos { sub httpd_localhost { my $ua = Mojo::UserAgent->new; - eval { return $ua->get('http://localhost/iso')->result->is_success }; - diag($@) if $@ !~ /Connection refused/; - return; + eval { + my $res = $ua->get('http://localhost/iso')->res; + return 1 if $res->code == 200; + diag($res->message); + return 0; + }; + return if !$@; + is($@,qr/Connection refused/); } ################################################################## From 92552751a34b69bcec7b33309b13a2a5cc2050a1 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 16:05:07 +0100 Subject: [PATCH 142/170] [#320] volatiles can't be set base nor public --- templates/main/admin_machines.html.ep | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/main/admin_machines.html.ep b/templates/main/admin_machines.html.ep index ed7b2c249..ef9101065 100644 --- a/templates/main/admin_machines.html.ep +++ b/templates/main/admin_machines.html.ep @@ -166,14 +166,14 @@ ng-click="action('machine','remove_base',child.id)" title ="Remove base" ng-cloak> +
      + style="color:white">  {{child.name}} - [ <%=l 'Cloned' %> ] + [ <%=l 'Cloned' %> + , <%=l 'Volatile' %> + ] - <%=l 'Paused' %> <%=l 'Running' %> From 65350255900698774d037d69eec1cbb563ec3855 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 16:07:45 +0100 Subject: [PATCH 143/170] Fixed test failed with 2 storages pools in KVM --- t/vm/40_volumes.t | 3 +++ 1 file changed, 3 insertions(+) diff --git a/t/vm/40_volumes.t b/t/vm/40_volumes.t index e7352314d..6443ac320 100644 --- a/t/vm/40_volumes.t +++ b/t/vm/40_volumes.t @@ -379,6 +379,7 @@ sub test_domain_swap { sub test_search($vm_name) { my $vm = rvd_back->search_vm($vm_name); + $vm->set_default_storage_pool_name('default') if $vm eq 'KVM'; my $file_out = $vm->dir_img."/file.iso"; @@ -389,6 +390,8 @@ sub test_search($vm_name) { print $out "foo.bar\n"; close $out; + $vm->refresh_storage(); + my $file = $vm->search_volume_path("file.iso"); is($file_out, $file); From ff4d9a3ee421ccb092de214054818afd47f06bc1 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 16:55:26 +0100 Subject: [PATCH 144/170] [#320] test non volatile domain too --- t/vm/v10_volatile.t | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/t/vm/v10_volatile.t b/t/vm/v10_volatile.t index f9b6fbc0d..d2f80a1e7 100644 --- a/t/vm/v10_volatile.t +++ b/t/vm/v10_volatile.t @@ -71,8 +71,10 @@ sub allow_anonymous { sub test_volatile { my ($vm_name, $base) = @_; + my $vm = rvd_back->search_vm($vm_name); my $name = new_domain_name(); + { my $user_name = "user_".new_domain_name(); my $user = Ravada::Auth::SQL::add_user(name => $user_name, is_temporary => 1); @@ -90,7 +92,6 @@ sub test_volatile { my $clone2 = rvd_back->search_domain($name); is($clone2->is_volatile,1,"[$vm_name] Expecting is_volatile"); - my $vm = rvd_back->search_vm($vm_name); my $clone3 = $vm->search_domain($name); is($clone3->is_volatile,1,"[$vm_name] Expecting is_volatile"); @@ -108,6 +109,34 @@ sub test_volatile { my $domains_f = rvd_front->list_domains(); ok(!grep({ $_->{name} eq $name } @$domains_f),"[$vm_name] Expecting $name not listed"); + + $name = undef; + } + + # now a normal clone + my $name2 = new_domain_name(); + my $clone_normal = $base->clone( + user => user_admin, + name => $name2 + ); + + is($clone_normal->is_volatile,0,"[$vm_name] Expecting not volatile"); + + $clone_normal->shutdown_now(user_admin); + + my $domain_n2 = $vm->search_domain($name2); + ok($domain_n2,"[$vm_name] Expecting domain $name2 there after shutdown") or exit; + + my $domain_nf = rvd_front->search_domain($name2); + ok($domain_nf,"[$vm_name] Expecting domain there after shutdown"); + + my $domain_nb = rvd_back->search_domain($name2); + ok($domain_nb,"[$vm_name] Expecting domain there after shutdown"); + + my $domains_nf = rvd_front->list_domains(); + ok(grep({ $_->{name} eq $name2 } @$domains_nf),"[$vm_name] Expecting $name2 listed"); + + $clone_normal->remove(user_admin); } # KVM volatiles get auto-removed From 87847af9ab5a4c499fc190cd10a8d20574585737 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 17:11:14 +0100 Subject: [PATCH 145/170] [#320] show if clone is volatile --- templates/main/admin_machines.html.ep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/main/admin_machines.html.ep b/templates/main/admin_machines.html.ep index ef9101065..7fa3c4fa2 100644 --- a/templates/main/admin_machines.html.ep +++ b/templates/main/admin_machines.html.ep @@ -155,7 +155,7 @@ title ="Machine settings"> {{child.name}} [ <%=l 'Cloned' %> - , <%=l 'Volatile' %> + , <%=l 'Volatile' %> ] From dc00371fb113c484aa27a274a6b0ae67fbbf21a4 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 17:11:24 +0100 Subject: [PATCH 146/170] [#320] show anon link if anon user --- templates/main/list_bases2.html.ep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/main/list_bases2.html.ep b/templates/main/list_bases2.html.ep index 569ac1fb4..61e3d385a 100644 --- a/templates/main/list_bases2.html.ep +++ b/templates/main/list_bases2.html.ep @@ -53,7 +53,7 @@ % for my $machine (@$machines) { % next if !$machine->{is_public} && (!$user || !$user->is_admin); % my $clone_link = "/machine/clone/".$machine->{id}.".html"; -% $clone_link = "/anonymous/".$machine->{id}.".html"; +% $clone_link = "/anonymous/".$machine->{id}.".html" if $_anonymous;
    From f461a60a500e9982bb2960590385175c3dc0ad98 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 17:29:15 +0100 Subject: [PATCH 147/170] [ --- lib/Ravada.pm | 8 +++++++- t/05_ravada.t | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index 3b9d90147..a08b0f23f 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -770,7 +770,13 @@ sub _init_config { my $connector = shift; confess "Deprecated connector" if $connector; - $CONFIG = YAML::LoadFile($file); + die "ERROR: Missing config file $file\n" + if !-e $file; + + eval { $CONFIG = YAML::LoadFile($file) }; + + die "ERROR: Format error in config file $file\n$@" if $@; + $CONFIG->{vm} = [] if !$CONFIG->{vm}; $LIMIT_PROCESS = $CONFIG->{limit_process} diff --git a/t/05_ravada.t b/t/05_ravada.t index 6c74b848b..4628bafa1 100644 --- a/t/05_ravada.t +++ b/t/05_ravada.t @@ -19,4 +19,16 @@ ok($Ravada::CONNECTOR, "Now we should have a DB connector "); ok($Ravada::CONNECTOR,"No connector defined "); eval { ok($Ravada::CONNECTOR->dbh,"No dbh defined ") }; +eval { + my $config_err = "t/etc/ravada_miss.conf"; + my $rvd_err = Ravada->new( connector => $test->connector, config => $config_err); +}; +like($@,qr/Missing config file/); + +eval { + my $config_err = "t/etc/ravada_err.conf"; + my $rvd_err = Ravada->new( connector => $test->connector, config => $config_err); +}; +like($@,qr/Format error/); + done_testing(); From caf220f75aec7a01bd5f6ad9c0f37fe08750db72 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 17:40:02 +0100 Subject: [PATCH 148/170] Fixed warning undefined field --- lib/Ravada/Front.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index c3f40b414..9bba430b7 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -312,7 +312,7 @@ sub list_iso_images { while (my $row = $sth->fetchrow_hashref) { push @iso,($row); - delete $row->{device} if !-e $row->{device}; + delete $row->{device} if $row->{device} && !-e $row->{device}; next if $row->{device}; my ($file); From 96b09578a118df7df8c7f7717c2894414ed8ef4e Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 17:42:06 +0100 Subject: [PATCH 149/170] [#455] test file --- t/etc/ravada_err.conf | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 t/etc/ravada_err.conf diff --git a/t/etc/ravada_err.conf b/t/etc/ravada_err.conf new file mode 100644 index 000000000..ac6024022 --- /dev/null +++ b/t/etc/ravada_err.conf @@ -0,0 +1,2 @@ +db: + user: pepe From 22df38d1647f142ff273a623cbb737a7636f2a15 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 17:55:43 +0100 Subject: [PATCH 150/170] Test refresh for mock domains --- lib/Ravada/VM/Void.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/Ravada/VM/Void.pm b/lib/Ravada/VM/Void.pm index ff90af537..046469c4b 100644 --- a/lib/Ravada/VM/Void.pm +++ b/lib/Ravada/VM/Void.pm @@ -171,6 +171,8 @@ sub import_domain { confess "Not implemented"; } +sub refresh_storage {} + #########################################################################3 1; From fbae151a467c846286da9a2129226b547dd8f752 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 18:13:27 +0100 Subject: [PATCH 151/170] [#441] test copy --- t/vm/c10_copy.t | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 t/vm/c10_copy.t diff --git a/t/vm/c10_copy.t b/t/vm/c10_copy.t new file mode 100644 index 000000000..7c21fdc0b --- /dev/null +++ b/t/vm/c10_copy.t @@ -0,0 +1,49 @@ +use warnings; +use strict; + +use Data::Dumper; +use Test::More; +use Test::SQL::Data; + +use lib 't/lib'; +use Test::Ravada; + +my $test = Test::SQL::Data->new(config => 't/etc/sql.conf'); +init($test->connector); + +use_ok('Ravada'); + +my $FILE_CONFIG = 't/etc/ravada.conf'; + +##########################################################################3 + +sub test_copy { +} + +##########################################################################3 + +clean(); + + +for my $vm_name ('Void', 'KVM') { + my $vm = rvd_back->search_vm($vm_name); + + SKIP: { + + my $msg = "SKIPPED: No virtual managers found"; + if ($vm && $vm_name =~ /kvm/i && $>) { + $msg = "SKIPPED: Test must run as root"; + $vm = undef; + } + + skip($msg,10) if !$vm; + + test_copy($vm_name); + } + +} + +clean(); + +done_testing(); + From 01fffc4717be1d0f03a8785119b08f1852523a1c Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 20 Nov 2017 18:34:23 +0100 Subject: [PATCH 152/170] [#441] copy a clone raw --- lib/Ravada/Domain.pm | 23 +++++++++++++++++++++++ t/vm/c10_copy.t | 42 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index 5e8c6620e..a5e5b624c 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -11,6 +11,7 @@ Ravada::Domain - Domains ( Virtual Machines ) library for Ravada use Carp qw(carp confess croak cluck); use Data::Dumper; +use File::Copy; use Hash::Util qw(lock_hash); use Image::Magick; use JSON::XS; @@ -992,6 +993,8 @@ sub clone { my $name = $args{name} or confess "ERROR: Missing domain cloned name"; confess "ERROR: Missing request user" if !$args{user}; + return $self->_copy_clone(@_) if $self->id_base(); + my $uid = $args{user}->id; $self->prepare_base($args{user}) if !$self->is_base(); @@ -1008,6 +1011,26 @@ sub clone { return $clone; } +sub _copy_clone($self, %args) { + my $name = delete $args{name} or confess "ERROR: Missing name"; + my $user = delete $args{user} or confess "ERROR: Missing user"; + + my $base = Ravada::Domain->open($self->id_base); + + my $copy = $self->_vm->create_domain( + name => $name + ,id_base => $base->id + ,id_owner => $user->id + ,_vm => $self->_vm + ); + my @volumes = $self->list_volumes; + my @copy_volumes = $copy->list_volumes; + for my $n (0 .. $#volumes) { + copy($volumes[$n],$copy_volumes[$n]) or die "$! $volumes[$n] $copy_volumes[$n]" + } + return $copy; +} + sub _post_pause { my $self = shift; my $user = shift; diff --git a/t/vm/c10_copy.t b/t/vm/c10_copy.t index 7c21fdc0b..e5e209c5d 100644 --- a/t/vm/c10_copy.t +++ b/t/vm/c10_copy.t @@ -17,7 +17,45 @@ my $FILE_CONFIG = 't/etc/ravada.conf'; ##########################################################################3 -sub test_copy { +sub test_copy_clone { + my $vm_name = shift; + + my $base = create_domain($vm_name); + + my $name_clone = new_domain_name(); + + my $clone = $base->clone( + name => $name_clone + ,user => user_admin + ); + + is($clone->is_base,0); + for ( $clone->list_volumes ) { + open my $out,'>',$_ or die $!; + print $out "hola\n"; + close $out; + } + + my $name_copy = new_domain_name(); + my $copy = $clone->clone( + name => $name_copy + ,user => user_admin + ); + is($clone->is_base,0); + is($copy->is_base,0); + + is($copy->id_base, $base->id); + + is(scalar($copy->list_volumes),scalar($clone->list_volumes)); + + my @copy_volumes = $copy->list_volumes(); + my @clone_volumes = $clone->list_volumes(); + + for ( 0 .. $#copy_volumes ) { + isnt($copy_volumes[$_], $clone_volumes[$_]); + is(-s $copy_volumes[$_], -s $clone_volumes[$_],"[$vm_name] size of $copy_volumes[$_]"); + + } } ##########################################################################3 @@ -38,7 +76,7 @@ for my $vm_name ('Void', 'KVM') { skip($msg,10) if !$vm; - test_copy($vm_name); + test_copy_clone($vm_name); } } From 358361ad57aed3b84bafd9e7d0a5ce8f6fe8b532 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Tue, 21 Nov 2017 09:36:41 +0100 Subject: [PATCH 153/170] Going for release 0.3 in master --- CHANGELOG.md | 21 ++------------------- lib/Ravada.pm | 2 +- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed9ca9e4c..6011d2c4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,25 +3,8 @@ **Implemented enhancements:** -- Show information about downloading ISO [\#185] -- Create new machine from ISO [\#138] -- Add graphics options in VM settings [\#260] -- Add a description associated with the machine [\#275] -- Improve show clones in admin [\#279] -- Running development release [\#281] -- Add Windows' definitions for new machines [\#289] -- Give feedback on rename machine [\#291] -- Copy spice password to clipboard [\#300] -- API for opening a Virtual Machine [\#306] -- Disable running Base [\#327] +- Review volatile desktops and Kiosk mode [\#320] +- Manage user permissions [\#222] **Fixed bugs:** -- KVM domains start when creating base [\#271] -- Swap volume should not be mandatory [\#278] -- Allow dot, underscore and dash in the username [\#311] -- Check for duplicate machine name on copy [\#313] -- Wait for prepare base before create vm [\#314] -- rvd services start before mysql [\#321] -- Download Debian stretch iso fails [\#326] -- Xubuntu ISO files conflict [\#335] diff --git a/lib/Ravada.pm b/lib/Ravada.pm index a08b0f23f..494e3c616 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -3,7 +3,7 @@ package Ravada; use warnings; use strict; -our $VERSION = '0.2.10'; +our $VERSION = '0.3.0'; use Carp qw(carp croak); use Data::Dumper; From 4c0de26935e865c41b1a1b80b7db162c41957c8a Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Tue, 21 Nov 2017 15:18:20 +0100 Subject: [PATCH 154/170] [#320] anonymous user called anonsomething --- rvd_front.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rvd_front.pl b/rvd_front.pl index 7e64215ad..d949e5967 100644 --- a/rvd_front.pl +++ b/rvd_front.pl @@ -1785,7 +1785,7 @@ sub _anonymous_user { sub _random_name { my $length = shift; - my $ret = 'O'.substr($$,3); + my $ret = substr($$,3); my $max = ord('z') - ord('a'); for ( 0 .. $length ) { my $n = int rand($max + 1); @@ -1804,7 +1804,7 @@ sub _new_anonymous_user { my $name; for my $n ( 4 .. 32 ) { - $name = substr($name_mojo,0,$n); + $name = "anon".substr($name_mojo,0,$n); my $user; eval { $user = Ravada::Auth::SQL->new( name => $name ); From d7aaf5769d367bfb417ab885325cd766b8704f63 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Tue, 21 Nov 2017 15:28:32 +0100 Subject: [PATCH 155/170] [#459] fixed relative path to image It failed on anonymous domains --- templates/main/list_bases2.html.ep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/main/list_bases2.html.ep b/templates/main/list_bases2.html.ep index c010a1563..34838c2f3 100644 --- a/templates/main/list_bases2.html.ep +++ b/templates/main/list_bases2.html.ep @@ -67,7 +67,7 @@ % if ($machine->{screenshot} ) { % }else{ - + % }
    From fe055fa946895b1702b362797963ff8674dc3100 Mon Sep 17 00:00:00 2001 From: gloriarodriguez Date: Mon, 30 Oct 2017 11:09:16 +0100 Subject: [PATCH 156/170] Update new translations translate to galician the new phrases --- lib/Ravada/I18N/gl.po | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/Ravada/I18N/gl.po b/lib/Ravada/I18N/gl.po index d33f2c810..6b36130e0 100644 --- a/lib/Ravada/I18N/gl.po +++ b/lib/Ravada/I18N/gl.po @@ -15,7 +15,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Ravada broker" -msgstr "" +msgstr "Ravada broker" msgid "Machine Name" msgstr "Nome da máquina" @@ -33,10 +33,10 @@ msgid "Choose a Machine to Start" msgstr "Escolle unha máquina para iniciar" msgid "Start" -msgstr "Inicia" +msgstr "Iniciar" msgid "Stop" -msgstr "Para" +msgstr "Parar" msgid "View" msgstr "Ver" @@ -51,7 +51,7 @@ msgid "Can't Prepare Base, Remove Base nor Delete. Machine has" msgstr "Non se pode preparar ou eliminar a base. A máquina ten" msgid "Clone/s" -msgstr "clon/s" +msgstr "Clon/s" msgid "NEW" msgstr "NOVOS" @@ -81,7 +81,7 @@ msgid "Messages" msgstr "Mensaxes" msgid "Mark all as Read" -msgstr "Marca como lido" +msgstr "Marcar como lido" msgid "Settings" msgstr "Preferencias" @@ -90,43 +90,43 @@ msgid "New Machine" msgstr "Nova máquina" msgid "I want to change my password" -msgstr "" +msgstr "Quero cambiar o meu contrasinal" msgid "I want to change my language" -msgstr "" +msgstr "Quero cambiar a miña lingua" msgid "Language:" -msgstr "" +msgstr "Linguaxe" msgid "English" -msgstr "" +msgstr "Inglés" msgid "Spanish" -msgstr "" +msgstr "Español" msgid "Catalan" -msgstr "" +msgstr "Catalán" msgid "New Password:" -msgstr "" +msgstr "Novo Contrasinal" msgid "Confirm Password:" -msgstr "" +msgstr "Confirmar Contrasinal" msgid "Submit" msgstr "" msgid "Your language has been changed successfully" -msgstr "" +msgstr "A vosa lingua foi cambiada con éxito" msgid "Your password has been changed successfully" -msgstr "" +msgstr "O voso contrasinal foi cambiado con éxito" msgid "Password too small" -msgstr "" +msgstr "O Contrasinal é demasiado pequeno" msgid "Password fields aren't equal" -msgstr "" +msgstr "Os campos do contrasinal non son iguais" msgid "Some of the password's fields are empty" -msgstr "" +msgstr "Algúns dos campos do contrasinal están baleiros" From 121c0db4f691a06ece2ad141ffd30a0e5f3d6b7f Mon Sep 17 00:00:00 2001 From: gloriarodriguez Date: Mon, 30 Oct 2017 11:28:39 +0100 Subject: [PATCH 157/170] Updating submit translation I forgot to translate the "submit" message. --- lib/Ravada/I18N/gl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Ravada/I18N/gl.po b/lib/Ravada/I18N/gl.po index 6b36130e0..28627b98c 100644 --- a/lib/Ravada/I18N/gl.po +++ b/lib/Ravada/I18N/gl.po @@ -114,7 +114,7 @@ msgid "Confirm Password:" msgstr "Confirmar Contrasinal" msgid "Submit" -msgstr "" +msgstr "Enviar" msgid "Your language has been changed successfully" msgstr "A vosa lingua foi cambiada con éxito" From ea357e8c49d17b0fa42f9e56e9793f2880de1736 Mon Sep 17 00:00:00 2001 From: amparorvd Date: Wed, 22 Nov 2017 15:11:03 +0100 Subject: [PATCH 158/170] [#421] Update translation japanese --- lib/Ravada/I18N/jp.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/Ravada/I18N/jp.po b/lib/Ravada/I18N/jp.po index ad4a50092..21b558cf8 100644 --- a/lib/Ravada/I18N/jp.po +++ b/lib/Ravada/I18N/jp.po @@ -1,5 +1,6 @@ # Translators: # Fernando Verdugo , 2017 +# Amparo Gombau , 2017 msgid "" msgstr "" "Project-Id-Version: 0.1.0-alpha\n" @@ -14,7 +15,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" msgid "Ravada broker" -msgstr "ラヴダブローカー" +msgstr "ラバダブローカー" msgid "Machine Name" msgstr "マシン名" @@ -47,10 +48,10 @@ msgid "Clone" msgstr "クローン" msgid "Can't Prepare Base, Remove Base nor Delete. Machine has" -msgstr "" +msgstr "私はベースを準備することはできません。 ベースを消去するか、マシンを消去してください。" msgid "Clone/s" -msgstr "" +msgstr "クローン" msgid "NEW" msgstr "新しい" @@ -65,7 +66,7 @@ msgid "Log Out" msgstr "ログアウト" msgid "Available Machines" -msgstr "" +msgstr "利用可能なマシン" msgid "Help" msgstr "助けて" @@ -80,7 +81,7 @@ msgid "Messages" msgstr "メッセージ" msgid "Mark all as Read" -msgstr "" +msgstr "既読にする] を選択します。" msgid "Settings" msgstr "設定" From 1eb635ad7ec2dd8fc5a20abbcb7c879d8ee258ba Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 23 Nov 2017 15:47:45 +0100 Subject: [PATCH 159/170] [#441] Copy volumes checking target --- lib/Ravada/Domain.pm | 13 +++++++++---- t/vm/c10_copy.t | 24 ++++++++++++++++++++---- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index a5e5b624c..f1374fe1b 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -1023,10 +1023,15 @@ sub _copy_clone($self, %args) { ,id_owner => $user->id ,_vm => $self->_vm ); - my @volumes = $self->list_volumes; - my @copy_volumes = $copy->list_volumes; - for my $n (0 .. $#volumes) { - copy($volumes[$n],$copy_volumes[$n]) or die "$! $volumes[$n] $copy_volumes[$n]" + my @volumes = $self->list_volumes_target; + my @copy_volumes = $copy->list_volumes_target; + + my %volumes = map { $_->[1] => $_->[0] } @volumes; + my %copy_volumes = map { $_->[1] => $_->[0] } @copy_volumes; + for my $target (keys %volumes) { + warn "$target:\n $volumes{$target}\n $copy_volumes{$target}\n"; + copy($volumes{$target}, $copy_volumes{$target}) + or die "$! $volumes{$target}, $copy_volumes{$target}" } return $copy; } diff --git a/t/vm/c10_copy.t b/t/vm/c10_copy.t index e5e209c5d..e26a216c6 100644 --- a/t/vm/c10_copy.t +++ b/t/vm/c10_copy.t @@ -17,11 +17,22 @@ my $FILE_CONFIG = 't/etc/ravada.conf'; ##########################################################################3 +sub add_volumes { + my ($base, $volumes) = @_; + $base->add_volume_swap(name => "vol_swap", size => 512 * 1024); + for my $n ( 1 .. $volumes ) { + $base->add_volume(name => "vol_$n", size => 512 * 1024); + } +} + sub test_copy_clone { my $vm_name = shift; + my $volumes = shift; my $base = create_domain($vm_name); + add_volumes($base, $volumes) if $volumes; + my $name_clone = new_domain_name(); my $clone = $base->clone( @@ -32,7 +43,7 @@ sub test_copy_clone { is($clone->is_base,0); for ( $clone->list_volumes ) { open my $out,'>',$_ or die $!; - print $out "hola\n"; + print $out "hola $_\n"; close $out; } @@ -51,9 +62,11 @@ sub test_copy_clone { my @copy_volumes = $copy->list_volumes(); my @clone_volumes = $clone->list_volumes(); - for ( 0 .. $#copy_volumes ) { - isnt($copy_volumes[$_], $clone_volumes[$_]); - is(-s $copy_volumes[$_], -s $clone_volumes[$_],"[$vm_name] size of $copy_volumes[$_]"); + for my $n ( 0 .. $#copy_volumes ) { + isnt($copy_volumes[$n], $clone_volumes[$n]); + my @stat_copy = stat($copy_volumes[$n]); + my @stat_clone = stat($clone_volumes[$n]); + is($stat_copy[7],$stat_clone[7],"[$vm_name] size of $copy_volumes[$n] ".($stat_copy[7])) or exit; } } @@ -77,6 +90,9 @@ for my $vm_name ('Void', 'KVM') { skip($msg,10) if !$vm; test_copy_clone($vm_name); + test_copy_clone($vm_name,1); + test_copy_clone($vm_name,2); + test_copy_clone($vm_name,10); } } From a98ba410dabe32532739796e3e4ccc955374a9e4 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 23 Nov 2017 16:03:19 +0100 Subject: [PATCH 160/170] [#441] test copied devices identical --- lib/Ravada/Domain.pm | 1 - t/vm/c10_copy.t | 21 +++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index f1374fe1b..b0ab8346a 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -1029,7 +1029,6 @@ sub _copy_clone($self, %args) { my %volumes = map { $_->[1] => $_->[0] } @volumes; my %copy_volumes = map { $_->[1] => $_->[0] } @copy_volumes; for my $target (keys %volumes) { - warn "$target:\n $volumes{$target}\n $copy_volumes{$target}\n"; copy($volumes{$target}, $copy_volumes{$target}) or die "$! $volumes{$target}, $copy_volumes{$target}" } diff --git a/t/vm/c10_copy.t b/t/vm/c10_copy.t index e26a216c6..e3d5d1270 100644 --- a/t/vm/c10_copy.t +++ b/t/vm/c10_copy.t @@ -59,14 +59,19 @@ sub test_copy_clone { is(scalar($copy->list_volumes),scalar($clone->list_volumes)); - my @copy_volumes = $copy->list_volumes(); - my @clone_volumes = $clone->list_volumes(); - - for my $n ( 0 .. $#copy_volumes ) { - isnt($copy_volumes[$n], $clone_volumes[$n]); - my @stat_copy = stat($copy_volumes[$n]); - my @stat_clone = stat($clone_volumes[$n]); - is($stat_copy[7],$stat_clone[7],"[$vm_name] size of $copy_volumes[$n] ".($stat_copy[7])) or exit; + my @copy_volumes = $copy->list_volumes_target(); + my %copy_volumes = map { $_->[1] => $_->[0] } @copy_volumes; + my @clone_volumes = $clone->list_volumes_target(); + my %clone_volumes = map { $_->[1] => $_->[0] } @clone_volumes; + + for my $target ( keys %copy_volumes ) { + isnt($copy_volumes{$target}, $clone_volumes{$target}); + my @stat_copy = stat($copy_volumes{$target}); + my @stat_clone = stat($clone_volumes{$target}); + is($stat_copy[7],$stat_clone[7],"[$vm_name] size different " + ."\n$copy_volumes{$target} ".($stat_copy[7]) + ."\n$clone_volumes{$target} ".($stat_clone[7]) + ) or exit; } } From 966433eea63f44be762bc670e2e762adbb767aac Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 23 Nov 2017 16:29:10 +0100 Subject: [PATCH 161/170] [#441] test copy request --- t/vm/c10_copy.t | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/t/vm/c10_copy.t b/t/vm/c10_copy.t index e3d5d1270..724eca8ef 100644 --- a/t/vm/c10_copy.t +++ b/t/vm/c10_copy.t @@ -74,6 +74,41 @@ sub test_copy_clone { ) or exit; } + $clone->remove(user_admin); + $copy->remove(user_admin); + $base->remove(user_admin); +} + +sub test_copy_request { + my $vm_name = shift; + + my $base = create_domain($vm_name); + + my $name_clone = new_domain_name(); + + my $clone = $base->clone( + name => $name_clone + ,user => user_admin + ); + + my $name_copy = new_domain_name(); + my $req; + eval { $req = Ravada::Request->copy( + id_domain => $clone->id + , name => $name_copy + ); + }; + is($@,'') or return; + is($req->status(),'requested'); + rvd_back->_process_all_requests_dont_fork(); + + ok($req->status(),'done'); + + my $copy = rvd_back->search_domain($name_copy); + ok($copy,"[$vm_name] Expecting domain $name_copy"); + + my $clone2 = rvd_back->search_domain($name_clone); + is($clone2->is_base,0); } ##########################################################################3 @@ -98,6 +133,8 @@ for my $vm_name ('Void', 'KVM') { test_copy_clone($vm_name,1); test_copy_clone($vm_name,2); test_copy_clone($vm_name,10); + + test_copy_request($vm_name); } } From 1c8c2361a7e31acf7157828de7893c8a577bd90d Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 24 Nov 2017 12:47:12 +0100 Subject: [PATCH 162/170] [#441] copy clones --- lib/Ravada.pm | 13 ++++++++++++- lib/Ravada/Domain.pm | 4 +++- lib/Ravada/Request.pm | 28 ++++++++++++++++++++++++++++ rvd_front.pl | 21 +++++---------------- t/vm/c10_copy.t | 8 +++++--- 5 files changed, 53 insertions(+), 21 deletions(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index a08b0f23f..449eb0d6e 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -1713,6 +1713,16 @@ sub _cmd_open_iptables { ); } +sub _cmd_clone($self, $request) { + my $domain = Ravada::Domain->open($request->args('id_domain')); + + $domain->clone( + name => $request->args('name') + ,user => Ravada::Auth::SQL->search_by_id($request->args('uid')) + ); + +} + sub _cmd_start { my $self = shift; my $request = shift; @@ -1925,7 +1935,8 @@ sub _req_method { my %methods = ( - start => \&_cmd_start + clone => \&_cmd_clone + ,start => \&_cmd_start ,pause => \&_cmd_pause ,create => \&_cmd_create ,remove => \&_cmd_remove diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index b0ab8346a..583fd9cd6 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -492,7 +492,9 @@ sub open($class, $id) { my $vm_class = "Ravada::VM::".$row->{vm}; bless $vm0, $vm_class; - my $vm = $vm0->new( readonly => 1); + my @ro = (); + @ro = (readonly => 1 ) if $>; + my $vm = $vm0->new( @ro ); return $vm->search_domain($row->{name}); } diff --git a/lib/Ravada/Request.pm b/lib/Ravada/Request.pm index a129cb5c6..ac69ac92e 100644 --- a/lib/Ravada/Request.pm +++ b/lib/Ravada/Request.pm @@ -61,6 +61,7 @@ our %VALID_ARG = ( ,hybernate=> {uid => 1, id_domain => 1} ,download => {uid => 2, id_iso => 1, id_vm => 2, delay => 2} ,refresh_storage => { id_vm => 2 } + ,clone => { uid => 1, id_domain => 1, name => 1 } ); our %CMD_SEND_MESSAGE = map { $_ => 1 } @@ -246,6 +247,7 @@ sub resume_domain { sub _check_args { my $sub = shift; + confess "Odd number of elements ".Dumper(\@_) if scalar(@_) % 2; my $args = { @_ }; my $valid_args = $VALID_ARG{$sub}; @@ -832,6 +834,32 @@ sub refresh_storage { } +=head2 clone + +Copies a virtual machine + + my $req = Ravada::Request->clone( + ,uid => $user->id + id_domain => $domain->id + ); + +=cut + +sub clone { + my $proto = shift; + my $class = ref($proto) || $proto; + + my $args = _check_args('clone', @_ ); + + my $self = {}; + bless($self,$class); + + return _new_request($self + , command => 'clone' + , args =>$args + ); +} + sub AUTOLOAD { my $self = shift; diff --git a/rvd_front.pl b/rvd_front.pl index 7e64215ad..fa601a89f 100644 --- a/rvd_front.pl +++ b/rvd_front.pl @@ -1621,24 +1621,13 @@ sub copy_machine { my $name = $c->req->param($param_name) if $param_name; $name = $base->name."-".$USER->name if !$name; - if (!$base->is_base || $base->is_locked) { - my $req = Ravada::Request->prepare_base( - id_domain => $id_base - ,uid => $USER->id - ); - return $c->render("Problem preparing base for domain ".$base->name) - if !$req; - - sleep 1; - - } my @create_args =( memory => $ram ) if $ram; push @create_args , ( disk => $disk ) if $disk; - my $req2 = Ravada::Request->create_domain( - name => $name - , id_base => $id_base - , id_owner => $USER->id - ,@create_args + my $req2 = Ravada::Request->clone( + uid => $USER->id + ,name => $name + , id_domain => $base->id + ,@create_args ); $c->redirect_to("/admin/machines");# if !@error; } diff --git a/t/vm/c10_copy.t b/t/vm/c10_copy.t index 724eca8ef..3a91af513 100644 --- a/t/vm/c10_copy.t +++ b/t/vm/c10_copy.t @@ -88,21 +88,23 @@ sub test_copy_request { my $clone = $base->clone( name => $name_clone - ,user => user_admin + ,user => user_admin ); my $name_copy = new_domain_name(); my $req; - eval { $req = Ravada::Request->copy( + eval { $req = Ravada::Request->clone( id_domain => $clone->id , name => $name_copy + , uid => user_admin->id ); }; is($@,'') or return; is($req->status(),'requested'); rvd_back->_process_all_requests_dont_fork(); - ok($req->status(),'done'); + is($req->status(),'done'); + is($req->error,''); my $copy = rvd_back->search_domain($name_copy); ok($copy,"[$vm_name] Expecting domain $name_copy"); From 3b98323112634b9e89860d36cd47de1a63a6cd47 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 24 Nov 2017 15:44:34 +0100 Subject: [PATCH 163/170] [#441] allow change the RAM memory when cloning --- lib/Ravada.pm | 5 +++++ lib/Ravada/Domain.pm | 25 ++++++++++++++++++++++++ lib/Ravada/Request.pm | 2 +- lib/Ravada/VM/Void.pm | 2 +- t/vm/c10_copy.t | 45 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 77 insertions(+), 2 deletions(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index 449eb0d6e..3d9e3a854 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -1716,9 +1716,14 @@ sub _cmd_open_iptables { sub _cmd_clone($self, $request) { my $domain = Ravada::Domain->open($request->args('id_domain')); + my @args = (); + push @args, ( memory => $request->args('memory')) + if $request->defined_arg('memory'); + $domain->clone( name => $request->args('name') ,user => Ravada::Auth::SQL->search_by_id($request->args('uid')) + ,@args ); } diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index 583fd9cd6..899763d7e 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -165,6 +165,8 @@ after 'remove_base' => \&_post_remove_base; before 'rename' => \&_pre_rename; after 'rename' => \&_post_rename; +before 'clone' => \&_pre_clone; + after 'screenshot' => \&_post_screenshot; after '_select_domain_db' => \&_post_select_domain_db; @@ -1003,12 +1005,16 @@ sub clone { my $id_base = $self->id; + my @args_copy = (); + push @args_copy, ( memory => $args{memory} ) if $args{memory}; + my $clone = $self->_vm->create_domain( name => $name ,id_base => $id_base ,id_owner => $uid ,vm => $self->vm ,_vm => $self->_vm + ,@args_copy ); return $clone; } @@ -1016,14 +1022,20 @@ sub clone { sub _copy_clone($self, %args) { my $name = delete $args{name} or confess "ERROR: Missing name"; my $user = delete $args{user} or confess "ERROR: Missing user"; + my $memory = delete $args{memory}; + + confess "ERROR: Unknown arguments ".join(",",sort keys %args) + if keys %args; my $base = Ravada::Domain->open($self->id_base); + my @copy_arg = ( memory => $memory ) if $memory; my $copy = $self->_vm->create_domain( name => $name ,id_base => $base->id ,id_owner => $user->id ,_vm => $self->_vm + ,@copy_arg ); my @volumes = $self->list_volumes_target; my @copy_volumes = $copy->list_volumes_target; @@ -1674,4 +1686,17 @@ sub type { return $type; } +sub _pre_clone($self,%args) { + my $name = delete $args{name}; + my $user = delete $args{user}; + my $memory = delete $args{memory}; + + confess "ERROR: Missing clone name " if !$name; + confess "ERROR: Invalid name '$name'" if $name !~ /^[a-z][a-z0-9_-]+$/; + + confess "ERROR: Missing user owner of new domain" if !$user; + + confess "ERROR: Unknown arguments ".join(",",sort keys %args) if keys %args; +} + 1; diff --git a/lib/Ravada/Request.pm b/lib/Ravada/Request.pm index ac69ac92e..76f7347af 100644 --- a/lib/Ravada/Request.pm +++ b/lib/Ravada/Request.pm @@ -61,7 +61,7 @@ our %VALID_ARG = ( ,hybernate=> {uid => 1, id_domain => 1} ,download => {uid => 2, id_iso => 1, id_vm => 2, delay => 2} ,refresh_storage => { id_vm => 2 } - ,clone => { uid => 1, id_domain => 1, name => 1 } + ,clone => { uid => 1, id_domain => 1, name => 1, memory => 2 } ); our %CMD_SEND_MESSAGE = map { $_ => 1 } diff --git a/lib/Ravada/VM/Void.pm b/lib/Ravada/VM/Void.pm index 046469c4b..a134eec9a 100644 --- a/lib/Ravada/VM/Void.pm +++ b/lib/Ravada/VM/Void.pm @@ -74,9 +74,9 @@ sub create_domain { ); $domain->_set_default_drivers(); $domain->_set_default_info(); - $domain->set_memory($args{memory}) if $args{memory}; } + $domain->set_memory($args{memory}) if $args{memory}; # $domain->start(); return $domain; } diff --git a/t/vm/c10_copy.t b/t/vm/c10_copy.t index 3a91af513..28f9dfadd 100644 --- a/t/vm/c10_copy.t +++ b/t/vm/c10_copy.t @@ -83,18 +83,27 @@ sub test_copy_request { my $vm_name = shift; my $base = create_domain($vm_name); + my $memory = $base->get_info->{memory}; my $name_clone = new_domain_name(); + my $mem_clone = int($memory * 1.5); my $clone = $base->clone( name => $name_clone ,user => user_admin + ,memory => $mem_clone ); + is($clone->get_info->{memory}, $mem_clone,"[$vm_name] memory"); + my $name_copy = new_domain_name(); + my $mem_copy = ($mem_clone * 1.5); my $req; + + my $clone_mem = int ( $memory * 1.5); eval { $req = Ravada::Request->clone( id_domain => $clone->id + ,memory => $mem_copy , name => $name_copy , uid => user_admin->id ); @@ -108,9 +117,43 @@ sub test_copy_request { my $copy = rvd_back->search_domain($name_copy); ok($copy,"[$vm_name] Expecting domain $name_copy"); + is($copy->get_info->{memory}, $mem_copy); my $clone2 = rvd_back->search_domain($name_clone); is($clone2->is_base,0); + + is($clone2->get_info->{memory}, $mem_clone); + + isnt($clone2->get_info->{memory}, $base->get_info->{memory}); + isnt($clone2->get_info->{memory}, $copy->get_info->{memory}); +} + +sub test_copy_change_ram { + my $vm_name = shift; + + my $base = create_domain($vm_name); + + my $name_clone = new_domain_name(); + + my $clone = $base->clone( + name => $name_clone + ,user => user_admin + ); + my $clone_mem = $clone->get_info->{memory}; + + my $name_copy = new_domain_name(); + my $copy = $clone->clone( + name => $name_copy + ,memory => int($clone_mem * 1.5) + ,user => user_admin + ); + is($clone->is_base,0); + is($copy->is_base,0); + + is ($copy->get_info->{memory},int($clone_mem * 1.5),"[$vm_name] Expecting memory"); + $clone->remove(user_admin); + $copy->remove(user_admin); + $base->remove(user_admin); } ##########################################################################3 @@ -137,6 +180,8 @@ for my $vm_name ('Void', 'KVM') { test_copy_clone($vm_name,10); test_copy_request($vm_name); + + test_copy_change_ram($vm_name); } } From a99ca7c0db93cccc8154037cd8922347a21ea71f Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 27 Nov 2017 12:24:39 +0100 Subject: [PATCH 164/170] [#441] allow prepare base if only requuest is the current one --- lib/Ravada/VM.pm | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/lib/Ravada/VM.pm b/lib/Ravada/VM.pm index f120957c9..8c95b1f39 100644 --- a/lib/Ravada/VM.pm +++ b/lib/Ravada/VM.pm @@ -306,15 +306,25 @@ sub _check_require_base { my $self = shift; my %args = @_; - return if !$args{id_base}; - - my $base = Ravada::Domain->open($args{id_base}); - if ($base->list_requests) { - die "ERROR: Domain ".$base->name." has ".$base->list_requests - ." requests.\n"; + + my $id_base = delete $args{id_base} or return; + my $request = delete $args{request}; + my $id_owner = delete $args{id_owner} + or confess "ERROR: id_owner required "; + + delete @args{'_vm','name','vm', 'memory','description'}; + + confess "ERROR: Unknown arguments ".join(",",keys %args) + if keys %args; + + my $base = Ravada::Domain->open($id_base); + if (my @requests = $base->list_requests) { + confess "ERROR: Domain ".$base->name." has ".$base->list_requests + ." requests.\n" + unless scalar @requests == 1 && $request + && $requests[0]->id eq $request->id; } - my $id_owner = $args{id_owner} or confess "ERROR: id_owner required "; die "ERROR: Domain ".$self->name." is not base" if !$base->is_base(); From a177a1d7581b5c5eae07c5c547435535e8ba3dac Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 27 Nov 2017 12:26:44 +0100 Subject: [PATCH 165/170] [#441] test copy non base domain --- t/vm/45_vol_swap.t | 2 +- t/vm/c10_copy.t | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/t/vm/45_vol_swap.t b/t/vm/45_vol_swap.t index 56d63d6ec..e844212a2 100644 --- a/t/vm/45_vol_swap.t +++ b/t/vm/45_vol_swap.t @@ -40,7 +40,7 @@ sub test_domain_with_swap { name => new_domain_name ,user => user_admin ); - is($clone->is_base,1); + is($clone->is_base,0); $clone2->start(user_admin); $clone2->shutdown_now(user_admin); diff --git a/t/vm/c10_copy.t b/t/vm/c10_copy.t index 28f9dfadd..4ae8d396e 100644 --- a/t/vm/c10_copy.t +++ b/t/vm/c10_copy.t @@ -156,6 +156,35 @@ sub test_copy_change_ram { $base->remove(user_admin); } +sub test_copy_req_nonbase { + my $vm_name = shift; + my $domain = create_domain($vm_name); + + my $name_copy = new_domain_name(); + + my $req; + eval { $req = Ravada::Request->clone( + id_domain => $domain->id + , name => $name_copy + , uid => user_admin->id + ); + }; + is($@,'') or return; + is($req->status(),'requested'); + rvd_back->_process_all_requests_dont_fork(); + is($req->status(),'done'); + is($req->error,''); + + my $copy = rvd_back->search_domain($name_copy); + ok($copy,"[$vm_name] Expecting domain $name_copy"); + + is($domain->is_base,1); + + $copy->remove(user_admin); + $domain->remove(user_admin); + +} + ##########################################################################3 clean(); @@ -182,6 +211,8 @@ for my $vm_name ('Void', 'KVM') { test_copy_request($vm_name); test_copy_change_ram($vm_name); + + test_copy_req_nonbase($vm_name); } } From 3d4b111afe57e938cb05843d4835b9a7e8e95b89 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 27 Nov 2017 12:27:03 +0100 Subject: [PATCH 166/170] [#441] pass the request and check args --- lib/Ravada.pm | 2 +- lib/Ravada/Domain.pm | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index 3d9e3a854..8a634155d 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -1716,7 +1716,7 @@ sub _cmd_open_iptables { sub _cmd_clone($self, $request) { my $domain = Ravada::Domain->open($request->args('id_domain')); - my @args = (); + my @args = ( request => $request); push @args, ( memory => $request->args('memory')) if $request->defined_arg('memory'); diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index 899763d7e..8f213e843 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -477,6 +477,8 @@ Returns: Domain object read only =cut sub open($class, $id) { + confess "Missing id" if !defined $id; + my $self = {}; if (ref($class)) { @@ -1007,6 +1009,7 @@ sub clone { my @args_copy = (); push @args_copy, ( memory => $args{memory} ) if $args{memory}; + push @args_copy, ( request => $args{request} ) if $args{request}; my $clone = $self->_vm->create_domain( name => $name @@ -1023,13 +1026,18 @@ sub _copy_clone($self, %args) { my $name = delete $args{name} or confess "ERROR: Missing name"; my $user = delete $args{user} or confess "ERROR: Missing user"; my $memory = delete $args{memory}; + my $request = delete $args{request}; confess "ERROR: Unknown arguments ".join(",",sort keys %args) if keys %args; my $base = Ravada::Domain->open($self->id_base); - my @copy_arg = ( memory => $memory ) if $memory; + my @copy_arg; + push @copy_arg, ( memory => $memory ) if $memory; + + $request->status("working","Copying domain ".$self->name + ." to $name"); my $copy = $self->_vm->create_domain( name => $name ,id_base => $base->id @@ -1690,9 +1698,10 @@ sub _pre_clone($self,%args) { my $name = delete $args{name}; my $user = delete $args{user}; my $memory = delete $args{memory}; + delete $args{request}; confess "ERROR: Missing clone name " if !$name; - confess "ERROR: Invalid name '$name'" if $name !~ /^[a-z][a-z0-9_-]+$/; + confess "ERROR: Invalid name '$name'" if $name !~ /^[a-z0-9_-]+$/i; confess "ERROR: Missing user owner of new domain" if !$user; From 9072cb1a324ef5d777d821372ff5ac7b92484d7c Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 27 Nov 2017 13:10:32 +0100 Subject: [PATCH 167/170] [#441] check args and show info in request --- lib/Ravada/Domain.pm | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index 8f213e843..583d497c9 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -996,20 +996,32 @@ sub clone { my $self = shift; my %args = @_; - my $name = $args{name} or confess "ERROR: Missing domain cloned name"; - confess "ERROR: Missing request user" if !$args{user}; + my $name = delete $args{name} + or confess "ERROR: Missing domain cloned name"; + + my $user = delete $args{user} + or confess "ERROR: Missing request user"; return $self->_copy_clone(@_) if $self->id_base(); - my $uid = $args{user}->id; + my $request = delete $args{request}; + my $memory = delete $args{memory}; + + confess "ERROR: Unknown args ".join(",",sort keys %args) + if keys %args; + + my $uid = $user->id; - $self->prepare_base($args{user}) if !$self->is_base(); + if ( !$self->is_base() ) { + $request->status("working","Preparing base") if $request; + $self->prepare_base($user) + } my $id_base = $self->id; my @args_copy = (); - push @args_copy, ( memory => $args{memory} ) if $args{memory}; - push @args_copy, ( request => $args{request} ) if $args{request}; + push @args_copy, ( memory => $memory ) if $memory; + push @args_copy, ( request => $request ) if $request; my $clone = $self->_vm->create_domain( name => $name @@ -1037,7 +1049,8 @@ sub _copy_clone($self, %args) { push @copy_arg, ( memory => $memory ) if $memory; $request->status("working","Copying domain ".$self->name - ." to $name"); + ." to $name") if $request; + my $copy = $self->_vm->create_domain( name => $name ,id_base => $base->id From 3d75e97ac3cc9ed49dacf86cb4bdfbd356fb980d Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 27 Nov 2017 17:38:48 +0100 Subject: [PATCH 168/170] Start at id 10 to not to conflict with default VM --- t/vm/05_open.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/vm/05_open.t b/t/vm/05_open.t index b13ddd499..fd21c54dc 100644 --- a/t/vm/05_open.t +++ b/t/vm/05_open.t @@ -40,7 +40,7 @@ sub test_create_domain { } } -my $id = 1; +my $id = 10; for my $vm_type( @{rvd_front->list_vm_types}) { diag($vm_type); my $exp_class = "Ravada::VM::$vm_type"; From 293a96559ccdee5f58a1145b2698ad046c9747bf Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 9 Oct 2017 10:26:39 +0200 Subject: [PATCH 169/170] [#389] We use the Debian archive now --- lib/Ravada.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index db4cab621..7e884a8a2 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -269,9 +269,9 @@ sub _update_isos { ,debian_stretch => { name =>'Debian Stretch 64 bits' ,description => 'Debian 9.0 Stretch 64 bits (XFCE desktop)' - ,url => 'https://cdimage.debian.org/debian-cd/9.1.0/amd64/iso-cd/' + ,url => 'http://cdimage.debian.org/cdimage/archive/9.1.0/amd64/iso-cd/' ,file_re => 'debian-9.[\d\.]+-amd64-xfce-CD-1.iso' - ,md5_url => 'https://cdimage.debian.org/debian-cd/9.1.0/amd64/iso-cd/MD5SUMS' + ,md5_url => 'http://cdimage.debian.org/cdimage/archive/9.1.0/amd64/iso-cd/MD5SUMS' ,xml => 'jessie-amd64.xml' ,xml_volume => 'jessie-volume.xml' } From 83d295cb787a70485790ebca99d8cb839a564764 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 27 Nov 2017 19:33:03 +0100 Subject: [PATCH 170/170] Fixed merge BUILD duplicated --- lib/Ravada/Domain.pm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index e405c0961..a108f2661 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -174,14 +174,10 @@ after '_select_domain_db' => \&_post_select_domain_db; ################################################## # -sub BUILD { - my $self = shift; - $self->is_known(); -} - sub BUILD { my $self = shift; $self->_init_connector(); + $self->is_known(); } sub _vm_connect {