From fefbe1e5c8ff4ef844bcd18b1f6e4cb189f8712e Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Thu, 14 Sep 2023 11:03:40 +0200 Subject: [PATCH] F #6275: Rename EXTERNAL_VM_ATTR to VM_ATTRIBUTE The change also updates JSON VM document to match this name --- src/scheduler/etc/sched.conf | 8 ++++---- src/scheduler/src/pool/VirtualMachineXML.cc | 2 +- src/scheduler/src/sched/Scheduler.cc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/scheduler/etc/sched.conf b/src/scheduler/etc/sched.conf index 4ff9456a36..387d5d5e5b 100644 --- a/src/scheduler/etc/sched.conf +++ b/src/scheduler/etc/sched.conf @@ -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" # #******************************************************************************* diff --git a/src/scheduler/src/pool/VirtualMachineXML.cc b/src/scheduler/src/pool/VirtualMachineXML.cc index 41b8858815..4b1067b75c 100644 --- a/src/scheduler/src/pool/VirtualMachineXML.cc +++ b/src/scheduler/src/pool/VirtualMachineXML.cc @@ -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; } //****************************************************************************** diff --git a/src/scheduler/src/sched/Scheduler.cc b/src/scheduler/src/sched/Scheduler.cc index 0304cf4281..212e15fa35 100644 --- a/src/scheduler/src/sched/Scheduler.cc +++ b/src/scheduler/src/sched/Scheduler.cc @@ -225,7 +225,7 @@ void Scheduler::start() // Load attributes serialized to External Scheduler vector 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); }