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

B #2820: Fix CPU_MODEL can't be changed. (#2822)

Browse Source
This commit is contained in:
Alejandro Huertas Herrero 2019-01-21 12:46:31 +01:00 committed by Ruben S. Montero
parent 65883dab98
commit ffdbf0bab1
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cli/onevm
View File

@ -1128,11 +1128,12 @@ CommandParser::CmdParser.new(ARGV) do
This command accepts a template file or opens an editor, the full list of
configuration attributes are:
OS = ["ARCH", "MACHINE", "KERNEL", "INITRD", "BOOTLOADER", "BOOT"]
FEATURES = ["ACPI", "PAE", "APIC", "LOCALTIME", "HYPERV", "GUEST_AGENT"]
INPUT = ["TYPE", "BUS"]
GRAPHICS = ["TYPE", "LISTEN", "PASSWD", "KEYMAP" ]
RAW = ["DATA", "DATA_VMX", "TYPE"]
OS = ["ARCH", "MACHINE", "KERNEL", "INITRD", "BOOTLOADER", "BOOT"]
FEATURES = ["ACPI", "PAE", "APIC", "LOCALTIME", "HYPERV", "GUEST_AGENT"]
INPUT = ["TYPE", "BUS"]
GRAPHICS = ["TYPE", "LISTEN", "PASSWD", "KEYMAP" ]
RAW = ["DATA", "DATA_VMX", "TYPE"]
CPU_MODEL = ["MODEL"]
CONTEXT (any value, **variable substitution will be made**)
EOT
@ -1153,7 +1154,7 @@ CommandParser::CmdParser.new(ARGV) do
template = vm.template_like_str('TEMPLATE', true,
'OS | FEATURES | INPUT | '\
'GRAPHICS | RAW | CONTEXT')
'GRAPHICS | RAW | CONTEXT | CPU_MODEL')
template = OpenNebulaHelper.editor_input(template)
end

2
src/sunstone/public/app/tabs/vms-tab/panels/conf.js
View File

@ -56,7 +56,7 @@ define(function(require) {
var conf = {};
var template = this.element.TEMPLATE;
$.each(["OS", "FEATURES", "INPUT", "GRAPHICS", "RAW", "CONTEXT"], function(){
$.each(["OS", "FEATURES", "INPUT", "GRAPHICS", "RAW", "CONTEXT", "CPU_MODEL"], function(){
if(template[this] != undefined){
conf[this] = template[this];
}

7
src/vm/VirtualMachine.cc
View File

@ -2744,7 +2744,8 @@ static std::map<std::string,std::vector<std::string>> UPDATECONF_ATTRS = {
"GUEST_AGENT"} },
{"INPUT", {"TYPE", "BUS"} },
{"GRAPHICS", {"TYPE", "LISTEN", "PASSWD", "KEYMAP"} },
{"RAW", {"TYPE", "DATA", "DATA_VMX"} }
{"RAW", {"TYPE", "DATA", "DATA_VMX"} },
{"CPU_MODEL", {"MODEL"} }
};
/**
@ -2884,7 +2885,7 @@ int VirtualMachine::updateconf(VirtualMachineTemplate& tmpl, string &err)
}
// -------------------------------------------------------------------------
// Update OS, FEATURES, INPUT, GRAPHICS, RAW
// Update OS, FEATURES, INPUT, GRAPHICS, RAW, CPU_MODEL
// -------------------------------------------------------------------------
replace_vector_values(obj_template, &tmpl, "OS");
@ -2901,6 +2902,8 @@ int VirtualMachine::updateconf(VirtualMachineTemplate& tmpl, string &err)
replace_vector_values(obj_template, &tmpl, "RAW");
replace_vector_values(obj_template, &tmpl, "CPU_MODEL");
// -------------------------------------------------------------------------
// Update CONTEXT: any value
// -------------------------------------------------------------------------