shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

F one#3969: Add rdp and vv buttons in cloud view (#125)

Browse Source 
(cherry picked from commit 98da0503ab1b4df86ed40db0ed11cb2b1d24335a)
This commit is contained in:
Sergio Betanzos 2020-07-28 16:32:02 +02:00 committed by Tino Vazquez
parent 37822f1bc9
commit 73448eeeb4
No known key found for this signature in database
GPG Key ID: 2FE9C32E94AEABBE
3 changed files with 59 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sunstone/public/app/tabs/provision-tab/vms/info.hbs
View File

@ -39,6 +39,14 @@
<button href"#" title="{{tr "Open a remote console in a new window"}}" class="button radius provision_vnc_button tip-top">
<i class="fas fa-fw fa-lg fa-desktop"/></button>
</li>
<li>
<button href"#" title="{{tr "Download a file with RDP connection"}}" class="button radius provision_rdp_button tip-top">
<i class="fab fa-fw fa-lg fa-windows"/></button>
</li>
<li>
<button href"#" title="{{tr "Download a file with virt-viewer connection"}}" class="button radius provision_wfile_button tip-top">
<i class="fas fa-fw fa-lg fa-external-link-square-alt"/></button>
</li>
<li>
<button title="{{tr "You have to boot the Virtual Machine first"}}" class="button radius white provision_vnc_button_disabled disabled tip-top" disabled>
<i class="fas fa-fw fa-lg fa-desktop"/></button>

43
src/sunstone/public/app/tabs/provision-tab/vms/list.js
View File

@ -329,9 +329,11 @@ define(function(require) {
$(".provision_save_as_template_confirm_button_disabled", context).hide();
}
if (OpenNebula.VM.isVNCSupported(data) ||
OpenNebula.VM.isSPICESupported(data)) {
$(".provision_rdp_button", context).toggle(Boolean(OpenNebulaVM.isRDPSupported(data)));
$(".provision_wfile_button", context).toggle(Boolean(OpenNebulaVM.isWFileSupported(data)));
if (OpenNebulaVM.isVNCSupported(data) ||
OpenNebulaVM.isSPICESupported(data)) {
$(".provision_vnc_button", context).show();
$(".provision_vnc_button_disabled", context).hide();
}else{
@ -755,25 +757,56 @@ define(function(require) {
return false;
});
context.on("click", ".provision_rdp_button", function() {
var vm = $(".provision_info_vm", context).data("vm") || {};
var rdp = OpenNebulaVM.isRDPSupported(vm) || {};
var username, password;
if (vm.TEMPLATE && vm.TEMPLATE.CONTEXT) {
var context = vm.TEMPLATE.CONTEXT;
for (var prop in context) {
var propUpperCase = String(prop).toUpperCase();
(propUpperCase === "USERNAME") && (username = context[prop]);
(propUpperCase === "PASSWORD") && (password = context[prop]);
}
}
Sunstone.runAction("VM.save_rdp", JSON.parse(JSON.stringify({
name: vm.NAME,
ip: rdp.IP,
username: username,
password: password,
})));
});
context.on("click", ".provision_wfile_button", function() {
var vm_id = $(".provision_info_vm", context).attr("vm_id") || '';
var vm = $(".provision_info_vm", context).data("vm") || {};
var wFile = OpenNebulaVM.isWFileSupported(vm) || {};
("VM.save_virt_viewer_action", vm.ID, wFile);
Sunstone.runAction("VM.save_virt_viewer_action", vm_id, wFile);
});
context.on("click", ".provision_vnc_button", function(){
var button = $(this);
button.attr("disabled", "disabled");
var vm_id = $(".provision_info_vm", context).attr("vm_id");
var vm_data = $(".provision_info_vm", context).data("vm");
OpenNebula.VM.vnc({
OpenNebulaVM.vnc({
data : {
id: vm_id
},
success: function(request, response){
if (OpenNebula.VM.isVNCSupported(vm_data)) {
if (OpenNebulaVM.isVNCSupported(vm_data)) {
var dialog = Sunstone.getDialog(VNC_DIALOG_ID);
dialog.setElement(response);
dialog.show();
button.removeAttr("disabled");
} else if (OpenNebula.VM.isSPICESupported(vm_data)) {
} else if (OpenNebulaVM.isSPICESupported(vm_data)) {
var dialog = Sunstone.getDialog(SPICE_DIALOG_ID);
dialog.setElement(response);
dialog.show();

13
src/sunstone/public/scss/_provision.scss
View File

@ -136,4 +136,17 @@
.running-color {
color: $running-color;
}
.menu.provision_action_icons {
display: flex;
flex-wrap: wrap;
li {
margin: 0.5em 0;
}
.provision_rdp_button {
font-weight: normal;
}
}