\
@@ -73,26 +68,49 @@ var vms_tab_content =
';
var create_vm_tmpl ='';
-var vmachine_list_json = {};
+var vm_dashboard = '\
+
\
+
'+tr("This is a list of your current compute resources. Virtual Machines use previously defined images and networks. You can easily create a new compute element by cliking \"new\" and filling-in an easy wizard.")+'
\
+
'+tr("You can also manage compute resources and perform actions such as stop, resume, shutdown or cancel.")+'
\
+
'+tr("Additionally, you can take a \"snapshot\" of the storage attached to these resources. They will be saved as new resources, visible from the Storage view and re-usable.")+'
\
+
'+tr("There are currently")+' '+tr("virtual machines")+'.
\
+
'+colored_log+'
')
- },
- error: function(request,error_json){
- $("#vm_log pre").html('');
- onError(request,error_json);
- }
- },
-
+ /*
"VM.startvnc" : {
type: "single",
- call: OpenNebula.VM.startvnc,
+ call: OCCI.VM.startvnc,
callback: vncCallback,
error: onError,
notify: true
@@ -325,14 +253,14 @@ var vm_actions = {
"VM.stopvnc" : {
type: "single",
- call: OpenNebula.VM.stopvnc,
+ call: OCCI.VM.stopvnc,
error: onError,
notify: true
},
"VM.monitor" : {
type: "monitor",
- call : OpenNebula.VM.monitor,
+ call : OCCI.VM.monitor,
callback: function(req,response) {
var info = req.request.data[0].monitor;
plot_graph(response,'#vm_monitoring_tab',
@@ -342,33 +270,16 @@ var vm_actions = {
},
"VM.monitor_all" : {
type: "monitor_global",
- call: OpenNebula.VM.monitor_all,
+ call: OCCI.VM.monitor_all,
callback: function(req,response) {
var info = req.request.data[0].monitor;
plot_global_graph(response,info);
},
error: onError
},
- "VM.chown" : {
- type: "multiple",
- call: OpenNebula.VM.chown,
- callback: vmShow,
- elements: vmElements,
- error: onError,
- notify: true
- },
- "VM.chgrp" : {
- type: "multiple",
- call: OpenNebula.VM.chgrp,
- callback: vmShow,
- elements: vmElements,
- error: onError,
- notify: true
- }
+ */
}
-
-
var vm_buttons = {
"VM.refresh" : {
type: "image",
@@ -382,22 +293,6 @@ var vm_buttons = {
alwaysActive: true
},
- "VM.chown" : {
- type: "confirm_with_select",
- text: tr("Change owner"),
- select: users_sel,
- tip: tr("Select the new owner")+":",
- condition: mustBeAdmin
- },
-
- "VM.chgrp" : {
- type: "confirm_with_select",
- text: tr("Change group"),
- select: groups_sel,
- tip: tr("Select the new group")+":",
- condition: mustBeAdmin
- },
-
"VM.shutdown" : {
type: "confirm",
text: tr("Shutdown"),
@@ -407,38 +302,6 @@ var vm_buttons = {
"action_list" : {
type: "select",
actions: {
- "VM.deploy" : {
- type: "confirm_with_select",
- text: tr("Deploy"),
- tip: tr("This will deploy the selected VMs on the chosen host"),
- select: hosts_sel,
- condition: mustBeAdmin
- },
- "VM.migrate" : {
- type: "confirm_with_select",
- text: tr("Migrate"),
- tip: tr("This will migrate the selected VMs to the chosen host"),
- select: hosts_sel,
- condition: mustBeAdmin
-
- },
- "VM.livemigrate" : {
- type: "confirm_with_select",
- text: tr("Live migrate"),
- tip: tr("This will live-migrate the selected VMs to the chosen host"),
- select: hosts_sel,
- condition: mustBeAdmin
- },
- "VM.hold" : {
- type: "confirm",
- text: tr("Hold"),
- tip: tr("This will hold selected pending VMs from being deployed")
- },
- "VM.release" : {
- type: "confirm",
- text: tr("Release"),
- tip: tr("This will release held machines")
- },
"VM.suspend" : {
type: "confirm",
text: tr("Suspend"),
@@ -454,29 +317,19 @@ var vm_buttons = {
text: tr("Stop"),
tip: "This will stop selected VMs"
},
- "VM.restart" : {
- type: "confirm",
- text: tr("Restart"),
- tip: tr("This will redeploy selected VMs (in UNKNOWN or BOOT state)")
- },
- "VM.resubmit" : {
- type: "confirm",
- text: tr("Resubmit"),
- tip: tr("This will resubmits VMs to PENDING state")
- },
- "VM.saveasmultiple" : {
- type: "action",
- text: tr("Save as")
- },
"VM.cancel" : {
type: "confirm",
text: tr("Cancel"),
tip: tr("This will cancel selected VMs")
+ },
+ "VM.saveasmultiple" : {
+ type: "action",
+ text: tr("Save as")
}
}
},
- "VM.delete" : {
+ "VM.done" : {
type: "confirm",
text: tr("Delete"),
tip: tr("This will delete the selected VMs from the database")
@@ -485,21 +338,20 @@ var vm_buttons = {
var vm_info_panel = {
"vm_info_tab" : {
- title: tr("Virtual Machine information"),
+ title: tr("Compute resource information"),
content: ""
},
- "vm_template_tab" : {
- title: tr("VM template"),
- content: ""
- },
- "vm_log_tab" : {
- title: tr("VM log"),
- content: ""
- }
}
+var vm_create_panel = {
+ "vm_create_panel" : {
+ title: tr("Create Virtual Machine"),
+ content: create_vm_tmpl
+ },
+};
+
var vms_tab = {
- title: tr("Virtual Machines"),
+ title: tr("Compute"),
content: vms_tab_content,
buttons: vm_buttons
}
@@ -507,6 +359,7 @@ var vms_tab = {
Sunstone.addActions(vm_actions);
Sunstone.addMainTab('vms_tab',vms_tab);
Sunstone.addInfoPanel('vm_info_panel',vm_info_panel);
+Sunstone.addInfoPanel('vm_create_panel',vm_create_panel);
function vmElements() {
@@ -514,7 +367,7 @@ function vmElements() {
}
function vmShow(req) {
- Sunstone.runAction("VM.show",req.request.data[0]);
+// Sunstone.runAction("VM.show",req.request.data[0]);
}
// Returns a human readable running time for a VM
@@ -525,34 +378,23 @@ function str_start_time(vm){
// Returns an array formed by the information contained in the vm_json
// and ready to be introduced in a dataTable
function vMachineElementArray(vm_json){
- var vm = vm_json.VM;
- var state = OpenNebula.Helper.resource_state("vm",vm.STATE);
- var hostname = "--";
+ var vm = vm_json.COMPUTE;
+ var id,name;
- if (state == "ACTIVE" || state == "SUSPENDED"){
- if (vm.HISTORY_RECORDS.HISTORY.constructor == Array){
- hostname = vm.HISTORY_RECORDS.HISTORY[vm.HISTORY_RECORDS.HISTORY.length-1].HOSTNAME;
- } else {
- hostname = vm.HISTORY_RECORDS.HISTORY.HOSTNAME;
- };
- };
-
- if (state == "ACTIVE") {
- state = OpenNebula.Helper.resource_state("vm_lcm",vm.LCM_STATE);
+ if (vm.name){
+ id = vm.href.split("/");
+ id = id[id.length-1];
+ name = vm.name;
+ }
+ else {
+ id = vm.ID;
+ name = vm.NAME;
};
return [
- '',
- vm.ID,
- vm.UNAME,
- vm.GNAME,
- vm.NAME,
- state,
- vm.CPU,
- humanize_size(vm.MEMORY),
- hostname,
- str_start_time(vm),
- vncIcon(vm)
+ '',
+ id,
+ name,
];
}
@@ -572,7 +414,7 @@ function vMachineInfoListener(){
// Callback to refresh a single element from the list
function updateVMachineElement(request, vm_json){
- var id = vm_json.VM.ID;
+ var id = vm_json.COMPUTE.ID;
var element = vMachineElementArray(vm_json);
updateSingleElement(element,dataTable_vMachines,'#vm_'+id)
}
@@ -584,7 +426,7 @@ function deleteVMachineElement(request){
// Callback to add an element to the list
function addVMachineElement(request,vm_json){
- var id = vm_json.VM.ID;
+ var id = vm_json.COMPUTE.ID;
var element = vMachineElementArray(vm_json);
addElement(element,dataTable_vMachines);
}
@@ -599,22 +441,14 @@ function updateVMachinesView(request, vmachine_list){
});
updateView(vmachine_list_array,dataTable_vMachines);
- updateDashboard("vms",vmachine_list);
+ //updateDashboard("vms",vmachine_list);
}
// Refreshes the information panel for a VM
function updateVMInfo(request,vm){
- var vm_info = vm.VM;
- var vm_state = OpenNebula.Helper.resource_state("vm",vm_info.STATE);
- var hostname = "--"
- if (vm_state == "ACTIVE" || vm_state == "SUSPENDED") {
- if (vm_info.HISTORY_RECORDS.HISTORY.constructor == Array){
- hostname = vm_info.HISTORY_RECORDS.HISTORY[vm_info.HISTORY_RECORDS.HISTORY.length-1].HOSTNAME
- } else {
- hostname = vm_info.HISTORY_RECORDS.HISTORY.HOSTNAME;
- };
- };
+ var vm_info = vm.COMPUTE;
+ var vm_state = OCCI.Helper.resource_state("vm",vm_info.STATE);
var info_tab = {
title : tr("VM information"),
@@ -632,125 +466,148 @@ function updateVMInfo(request,vm){
'+tr("Name")+' | \
'+vm_info.NAME+' | \
\
- \
- | '+tr("Owner")+' | \
- '+vm_info.UNAME+' | \
-
\
- \
- | '+tr("Group")+' | \
- '+vm_info.GNAME+' | \
-
\
\
| '+tr("State")+' | \
'+tr(vm_state)+' | \
\
\
- | '+tr("LCM State")+' | \
- '+tr(OpenNebula.Helper.resource_state("vm_lcm",vm_info.LCM_STATE))+' | \
+ '+tr("CPU")+' | \
+ '+vm_info.CPU+' | \
\
\
- | '+tr("Hostname")+' | \
- '+ hostname +' | \
+ '+tr("Memory")+' | \
+ '+vm_info.MEMORY+' | \
\
- \
- | '+tr("Start time")+' | \
- '+pretty_time(vm_info.STIME)+' | \
-
\
- \
- | '+tr("Deploy ID")+' | \
- '+(typeof(vm_info.DEPLOY_ID) == "object" ? "-" : vm_info.DEPLOY_ID)+' | \
-
\
- \
-