mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-18 02:50:09 +03:00
feature #4273: Better display names for drivers
This commit is contained in:
Ruben S. Montero
parent
5e2771d60d
commit
b78ccaad25
@ -291,9 +291,10 @@ IM_MAD = [
|
||||
# -t number of threads, i.e. number of hosts monitored at the same time
|
||||
#-------------------------------------------------------------------------------
|
||||
IM_MAD = [
|
||||
NAME = "kvm",
|
||||
EXECUTABLE = "one_im_ssh",
|
||||
ARGUMENTS = "-r 3 -t 15 kvm" ]
|
||||
NAME = "kvm",
|
||||
SUNSTONE_NAME = "KVM",
|
||||
EXECUTABLE = "one_im_ssh",
|
||||
ARGUMENTS = "-r 3 -t 15 kvm" ]
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
@ -302,9 +303,10 @@ IM_MAD = [
|
||||
# -t number of threads, i.e. number of hosts monitored at the same time
|
||||
#-------------------------------------------------------------------------------
|
||||
# IM_MAD = [
|
||||
# NAME = "kvm",
|
||||
# EXECUTABLE = "one_im_ssh",
|
||||
# ARGUMENTS = "-r 3 -t 15 kvm-probes" ]
|
||||
# NAME = "kvm",
|
||||
# SUNSTONE_NAME = "kvm-ssh",
|
||||
# EXECUTABLE = "one_im_ssh",
|
||||
# ARGUMENTS = "-r 3 -t 15 kvm-probes" ]
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
@ -313,9 +315,10 @@ IM_MAD = [
|
||||
# -t number of threads, i.e. number of hosts monitored at the same time
|
||||
#-------------------------------------------------------------------------------
|
||||
#IM_MAD = [
|
||||
# NAME = "vcenter",
|
||||
# EXECUTABLE = "one_im_sh",
|
||||
# ARGUMENTS = "-c -t 15 -r 0 vcenter" ]
|
||||
# NAME = "vcenter",
|
||||
# SUNSTONE_NAME = "VMWare vCenter",
|
||||
# EXECUTABLE = "one_im_sh",
|
||||
# ARGUMENTS = "-c -t 15 -r 0 vcenter" ]
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
@ -324,9 +327,10 @@ IM_MAD = [
|
||||
# -t number of threads, i.e. number of hosts monitored at the same time
|
||||
#-------------------------------------------------------------------------------
|
||||
#IM_MAD = [
|
||||
# NAME = "ec2",
|
||||
# EXECUTABLE = "one_im_sh",
|
||||
# ARGUMENTS = "-c -t 1 -r 0 ec2" ]
|
||||
# NAME = "ec2",
|
||||
# SUNSTONE_NAME = "Amazon EC2",
|
||||
# EXECUTABLE = "one_im_sh",
|
||||
# ARGUMENTS = "-c -t 1 -r 0 ec2" ]
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
@ -335,15 +339,16 @@ IM_MAD = [
|
||||
# -t number of threads, i.e. number of hosts monitored at the same time
|
||||
#-------------------------------------------------------------------------------
|
||||
#IM_MAD = [
|
||||
# NAME = "az",
|
||||
# EXECUTABLE = "one_im_sh",
|
||||
# ARGUMENTS = "-c -t 1 -r 0 az" ]
|
||||
# NAME = "az",
|
||||
# SUNSTONE_NAME = "Microsoft Azure",
|
||||
# EXECUTABLE = "one_im_sh",
|
||||
# ARGUMENTS = "-c -t 1 -r 0 az" ]
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Dummy Information Driver Manager Configuration
|
||||
#-------------------------------------------------------------------------------
|
||||
#IM_MAD = [ NAME="dummy", EXECUTABLE="one_im_dummy"]
|
||||
#IM_MAD = [ NAME="dummy", SUNSTONE_NAME="Testing", EXECUTABLE="one_im_dummy"]
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
#*******************************************************************************
|
||||
@ -410,11 +415,12 @@ IM_MAD = [
|
||||
# CPU does not have virtualization extensions or use nested Qemu-KVM hosts
|
||||
#-------------------------------------------------------------------------------
|
||||
VM_MAD = [
|
||||
NAME = "kvm",
|
||||
EXECUTABLE = "one_vmm_exec",
|
||||
ARGUMENTS = "-t 15 -r 0 kvm",
|
||||
DEFAULT = "vmm_exec/vmm_exec_kvm.conf",
|
||||
TYPE = "kvm",
|
||||
NAME = "kvm",
|
||||
SUNSTONE_NAME = "KVM",
|
||||
EXECUTABLE = "one_vmm_exec",
|
||||
ARGUMENTS = "-t 15 -r 0 kvm",
|
||||
DEFAULT = "vmm_exec/vmm_exec_kvm.conf",
|
||||
TYPE = "kvm",
|
||||
IMPORTED_VMS_ACTIONS = "shutdown, shutdown-hard, hold, release, suspend,
|
||||
resume, delete, reboot, reboot-hard, resched, unresched, disk-attach,
|
||||
disk-detach, nic-attach, nic-detach, snap-create, snap-delete"
|
||||
@ -432,11 +438,12 @@ VM_MAD = [
|
||||
# defaults to 'suspend'.
|
||||
#-------------------------------------------------------------------------------
|
||||
#VM_MAD = [
|
||||
# NAME = "vcenter",
|
||||
# EXECUTABLE = "one_vmm_sh",
|
||||
# ARGUMENTS = "-p -t 15 -r 0 vcenter -s sh",
|
||||
# DEFAULT = "vmm_exec/vmm_exec_vcenter.conf",
|
||||
# TYPE = "xml",
|
||||
# NAME = "vcenter",
|
||||
# SUNSTONE_NAME = "VMWare vCenter",
|
||||
# EXECUTABLE = "one_vmm_sh",
|
||||
# ARGUMENTS = "-p -t 15 -r 0 vcenter -s sh",
|
||||
# DEFAULT = "vmm_exec/vmm_exec_vcenter.conf",
|
||||
# TYPE = "xml",
|
||||
# IMPORTED_VMS_ACTIONS = "shutdown, shutdown-hard, hold, release, suspend,
|
||||
# resume, delete, reboot, reboot-hard, resched, unresched, poweroff,
|
||||
# poweroff-hard, disk-attach, disk-detach, nic-attach, nic-detach,
|
||||
@ -450,10 +457,11 @@ VM_MAD = [
|
||||
# -t number of threads, i.e. number of actions performed at the same time
|
||||
#-------------------------------------------------------------------------------
|
||||
#VM_MAD = [
|
||||
# NAME = "ec2",
|
||||
# EXECUTABLE = "one_vmm_sh",
|
||||
# ARGUMENTS = "-t 15 -r 0 ec2",
|
||||
# TYPE = "xml",
|
||||
# NAME = "ec2",
|
||||
# SUNSTONE_NAME = "Amazon EC2",
|
||||
# EXECUTABLE = "one_vmm_sh",
|
||||
# ARGUMENTS = "-t 15 -r 0 ec2",
|
||||
# TYPE = "xml",
|
||||
# IMPORTED_VMS_ACTIONS = "shutdown, shutdown-hard, hold, release, suspend,
|
||||
# resume, delete, reboot, reboot-hard, resched, unresched, poweroff,
|
||||
# poweroff-hard, disk-attach, disk-detach, nic-attach, nic-detach,
|
||||
@ -467,10 +475,11 @@ VM_MAD = [
|
||||
# -t number of threads, i.e. number of actions performed at the same time
|
||||
#-------------------------------------------------------------------------------
|
||||
#VM_MAD = [
|
||||
# NAME = "az",
|
||||
# EXECUTABLE = "one_vmm_sh",
|
||||
# ARGUMENTS = "-t 15 -r 0 az",
|
||||
# TYPE = "xml",
|
||||
# NAME = "az",
|
||||
# SUNSTONE_NAME = "Microsoft Azure",
|
||||
# EXECUTABLE = "one_vmm_sh",
|
||||
# ARGUMENTS = "-t 15 -r 0 az",
|
||||
# TYPE = "xml",
|
||||
# IMPORTED_VMS_ACTIONS = "shutdown, shutdown-hard, hold, release, suspend,
|
||||
# resume, delete, reboot, reboot-hard, resched, unresched, poweroff,
|
||||
# poweroff-hard, disk-attach, disk-detach, nic-attach, nic-detach,
|
||||
@ -481,7 +490,8 @@ VM_MAD = [
|
||||
#-------------------------------------------------------------------------------
|
||||
# Dummy Virtualization Driver Configuration
|
||||
#-------------------------------------------------------------------------------
|
||||
#VM_MAD = [ NAME="dummy", EXECUTABLE="one_vmm_dummy", TYPE="xml" ]
|
||||
#VM_MAD = [ NAME="dummy", SUNSTONE_NAME="Testing", EXECUTABLE="one_vmm_dummy",
|
||||
# TYPE="xml" ]
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
#*******************************************************************************
|
||||
|
||||
@ -63,14 +63,24 @@ define(function(require) {
|
||||
that.vmMadNameList = [];
|
||||
if (Config.onedConf.VM_MAD !== undefined) {
|
||||
$.each(Config.onedConf.VM_MAD, function(index, vmMad) {
|
||||
that.vmMadNameList.push(vmMad["NAME"]);
|
||||
if (vmMad.SUNSTONE_NAME !== undefined) {
|
||||
that.vmMadNameList.push({
|
||||
'displayName': vmMad["SUNSTONE_NAME"],
|
||||
'driverName' : vmMad["NAME"]
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
that.imMadNameList = [];
|
||||
if (Config.onedConf.IM_MAD !== undefined) {
|
||||
$.each(Config.onedConf.IM_MAD, function(index, imMad) {
|
||||
that.imMadNameList.push(imMad["NAME"]);
|
||||
if (imMad.SUNSTONE_NAME !== undefined) {
|
||||
that.imMadNameList.push({
|
||||
'displayNme': imMad["SUNSTONE_NAME"],
|
||||
'driverName': imMad["NAME"]
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<label for="host_type">{{tr "Type"}}</label>
|
||||
<select id="host_type_mad" name="host_type">
|
||||
{{#each vmMadNameList}}
|
||||
<option value="{{this}}">{{this}}</option>
|
||||
<option value="{{this.driverName}}">{{this.displayName}}</option>
|
||||
{{/each}}
|
||||
<option value="custom">{{tr "Custom"}}</option>
|
||||
</select>
|
||||
@ -48,7 +48,7 @@
|
||||
<label for="vmm">{{tr "Virtualization"}}</label>
|
||||
<select id="vmm_mad" name="vmm">
|
||||
{{#each vmMadNameList}}
|
||||
<option value="{{this}}">{{this}}</option>
|
||||
<option value="{{this.driverName}}">{{this.displayName}}</option>
|
||||
{{/each}}
|
||||
<option value="custom">{{tr "Custom"}}</option>
|
||||
</select>
|
||||
@ -65,7 +65,7 @@
|
||||
<label for="im">{{tr "Information"}}</label>
|
||||
<select id="im_mad" name="im">
|
||||
{{#each imMadNameList}}
|
||||
<option value="{{this}}">{{this}}</option>
|
||||
<option value="{{this.driverName}}">{{this.displayName}}</option>
|
||||
{{/each}}
|
||||
<option value="custom">{{tr "Custom"}}</option>
|
||||
</select>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user