shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-14 01:57:24 +03:00
Code Releases Wiki Activity

F #6275: Rename EXTERNAL_VM_ATTR to VM_ATTRIBUTE

Browse Source 
The change also updates JSON VM document to match this name
This commit is contained in:
Ruben S. Montero 2023-09-14 11:03:40 +02:00
parent dfb4e80006
commit fefbe1e5c8
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/scheduler/etc/sched.conf
View File

@ -101,16 +101,16 @@
# - PROXY: if needed to contact the external scheduler
# - TIMEOUT: how long to wait for a response
#
# EXTERNAL_VM_ATTR: Attributes serialized to External Scheduler, the format is:
# VM_ATTRIBUTE: Attributes serialized to External Scheduler, the format is:
# "xpath<:target_name>" where:
# - xpath is the xpath of the attribute
# - target_name (OPTIONAL) is the name of the attribute used in the JSON doc
# sent to the external scheduler, if not set the original name will be used.
#
# Examples:
# EXTERNAL_VM_ATTR = "/VM/TEMPLATE/CPU"
# EXTERNAL_VM_ATTR = "//CPU"
# EXTERNAL_VM_ATTR = "/VM/TEMPLATE/VMGROUP/ROLE:GROUP_ROLE"
# VM_ATTRIBUTE = "/VM/TEMPLATE/CPU"
# VM_ATTRIBUTE = "//CPU"
# VM_ATTRIBUTE = "/VM/TEMPLATE/VMGROUP/ROLE:GROUP_ROLE"
#
#*******************************************************************************

2
src/scheduler/src/pool/VirtualMachineXML.cc
View File

@ -800,7 +800,7 @@ void VirtualMachineXML::to_json(json &vm_json)
custom_attributes.insert(make_pair(attr.second, value));
}
vm_json["ATTRIBUTES"] = custom_attributes;
vm_json["VM_ATTRIBUTES"] = custom_attributes;
}
//******************************************************************************

2
src/scheduler/src/sched/Scheduler.cc
View File

@ -225,7 +225,7 @@ void Scheduler::start()
// Load attributes serialized to External Scheduler
vector<const SingleAttribute *> external_vm_attrs;
conf.get("EXTERNAL_VM_ATTR", external_vm_attrs);
conf.get("VM_ATTRIBUTE", external_vm_attrs);
VirtualMachineXML::init_external_attrs(external_vm_attrs);
}