Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-24 22:06:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-384191: Fix missing values for min VM restrictions

Browse Source 
- Min and max should also include the defaults when looking across all templates
- Ensure exception isn't hit unnecessarily when parsing restriction value for VMs
- Allow use of `GetRestrictionValueFromMatchingTemplate` with template objects
- Parallelize `GetRestrictionValueAcrossTemplates` call

Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
This commit is contained in:
Danilo Del Busso 2023-10-24 11:44:49 +01:00 committed by Konstantina Chremmou
parent afb419af04
commit 14a3539f28
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
XenModel/XenAPI-Extensions/VM.cs
View File

@ -260,7 +260,10 @@ namespace XenAPI
/// <returns>The value if found. If not found, null is returned instead</returns> /// <returns>The value if found. If not found, null is returned instead</returns>
private static T? GetRestrictionValueFromMatchingTemplate<T>(VM vm, string field, string attribute) where T : struct private static T? GetRestrictionValueFromMatchingTemplate<T>(VM vm, string field, string attribute) where T : struct
{ {
if (!vm.is_a_template && !string.IsNullOrEmpty(vm.reference_label)) if(vm.is_a_template)
return GetRestrictionValue<T>(vm, field, attribute);
if (!string.IsNullOrEmpty(vm.reference_label))
{ {
var matchingTemplate = vm.Connection.Cache.VMs var matchingTemplate = vm.Connection.Cache.VMs
.FirstOrDefault(v => v.is_a_template && v.reference_label == vm.reference_label); .FirstOrDefault(v => v.is_a_template && v.reference_label == vm.reference_label);
@ -288,6 +291,13 @@ namespace XenAPI
var xn = xd?.SelectSingleNode($@"restrictions/restriction[@field='{field}']"); var xn = xd?.SelectSingleNode($@"restrictions/restriction[@field='{field}']");
var resultString = xn?.Attributes?[attribute]?.Value; var resultString = xn?.Attributes?[attribute]?.Value;
T? result = null; T? result = null;
// avoid the expensive operation of throwing an exception
if (string.IsNullOrEmpty(resultString))
{
return null;
}
try try
{ {
var converter = TypeDescriptor.GetConverter(typeof(T)); var converter = TypeDescriptor.GetConverter(typeof(T));
@ -320,6 +330,7 @@ namespace XenAPI
private static List<T> GetRestrictionValueAcrossTemplates<T>(IXenObject vm, string field, string attribute) where T : struct private static List<T> GetRestrictionValueAcrossTemplates<T>(IXenObject vm, string field, string attribute) where T : struct
{ {
return vm.Connection.Cache.VMs return vm.Connection.Cache.VMs
.AsParallel()
.Where(v => v.is_a_template) .Where(v => v.is_a_template)
.Select(v => GetRestrictionValue<T>(v, field, attribute)) .Select(v => GetRestrictionValue<T>(v, field, attribute))
.Where(value => value != null) .Where(value => value != null)
@ -343,7 +354,8 @@ namespace XenAPI
return (T) value; return (T) value;
var templateValues = GetRestrictionValueAcrossTemplates<T>(vm, field, "max"); var templateValues = GetRestrictionValueAcrossTemplates<T>(vm, field, "max");
return templateValues.Count == 0 ? defaultValue : templateValues.Max(); templateValues.Add(defaultValue);
return templateValues.Max();
} }
/// <summary> /// <summary>
@ -362,7 +374,8 @@ namespace XenAPI
return (T)value; return (T)value;
var templateValues = GetRestrictionValueAcrossTemplates<T>(vm, field, "min"); var templateValues = GetRestrictionValueAcrossTemplates<T>(vm, field, "min");
return templateValues.Count == 0 ? defaultValue : templateValues.Min(); templateValues.Add(defaultValue);
return templateValues.Min();
} }
/// <summary> /// <summary>