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

SelfService: remove usage of resource_str Helper. Disallow creation of VMs with empty name.

Browse Source 
(cherry picked from commit 33dd4ac3139e9a250d14b13c94222df5fb7d045f)
This commit is contained in:
Hector Sanjuan 2012-01-16 11:42:08 +01:00 committed by Ruben S. Montero
parent 0c1121a8d3
commit 4dbc572e3f
3 changed files with 4 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/cloud/occi/lib/ui/public/js/occi.js
View File

@ -64,71 +64,6 @@ var OCCI = {
},
"Helper": {
"resource_state": function(type, value)
{
switch(type)
{
case "HOST","host":
return ["INIT",
"MONITORING",
"MONITORED",
"ERROR",
"DISABLED"][value];
break;
case "HOST_SIMPLE","host_simple":
return ["ON",
"ON",
"ON",
"ERROR",
"OFF"][value];
break;
case "VM","vm":
return ["INIT",
"PENDING",
"HOLD",
"ACTIVE",
"STOPPED",
"SUSPENDED",
"DONE",
"FAILED"][value];
break;
case "VM_LCM","vm_lcm":
return ["LCM_INIT",
"PROLOG",
"BOOT",
"RUNNING",
"MIGRATE",
"SAVE_STOP",
"SAVE_SUSPEND",
"SAVE_MIGRATE",
"PROLOG_MIGRATE",
"PROLOG_RESUME",
"EPILOG_STOP",
"EPILOG",
"SHUTDOWN",
"CANCEL",
"FAILURE",
"CLEANUP",
"UNKNOWN"][value];
break;
case "IMAGE","image":
return ["INIT",
"READY",
"USED",
"DISABLED",
"LOCKED",
"ERROR"][value];
break;
default:
return;
}
},
"image_type": function(value)
{
return ["OS", "CDROM", "DATABLOCK"][value];
},
"action": function(action, params)
{
obj = {

5
src/cloud/occi/lib/ui/public/js/plugins/compute.js
View File

@ -523,7 +523,7 @@ function updateVMInfo(request,vm){
</tr>\
<tr>\
<td class="key_td">'+tr("Instance type")+'</td>\
<td class="value_td">'+vm_info.INSTANCE_TYPE+'</td>\
<td class="value_td">'+(vm_info.INSTANCE_TYPE ? vm_info.INSTANCE_TYPE : "--")+'</td>\
</tr>\
<tr>\
<td class="key_td">'+tr("State")+'</td>\
@ -739,6 +739,7 @@ function popUpCreateVMDialog(){
if (!vm_name.length){
notifyError("Please specify a name for the virtual machine");
return false;
};
var vm = {
@ -1043,7 +1044,7 @@ function vncCallback(request,response){
function vncIcon(vm){
var graphics = vm.TEMPLATE.GRAPHICS;
var state = OCCI.Helper.resource_state("vm_lcm",vm.LCM_STATE);
var state = vm.STATE;
var gr_icon;
if (graphics && graphics.TYPE == "vnc" && state == "RUNNING"){
gr_icon = '<a class="vnc" href="#" vm_id="'+vm.ID+'">';

2
src/cloud/occi/lib/ui/public/js/plugins/storage.js
View File

@ -373,7 +373,7 @@ function updateImageInfo(request,img){
</tr>\
<tr>\
<td class="key_td">'+tr("Type")+'</td>\
<td class="value_td">'+OCCI.Helper.image_type(img_info.TYPE)+'</td>\
<td class="value_td">'+img_info.TYPE+'</td>\
</tr>\
<tr>\
<td class="key_td">'+tr("Persistent")+'</td>\