Even though deriving these from the HA resource sid is convenient, this is needed to get the proper static service stats for all HA resources at once.
Signed-off-by: Daniel Kral <[email protected]> --- Could also be passed through get_static_service_stats_from_config() with an additional $id / $sid parameter... src/PVE/HA/Sim/Resources.pm | 10 +--- .../static_service_stats | 52 ++++++++++++++++++- .../static_service_stats | 9 +++- 3 files changed, 60 insertions(+), 11 deletions(-) diff --git a/src/PVE/HA/Sim/Resources.pm b/src/PVE/HA/Sim/Resources.pm index 1b2bfaaf..2bde9aa3 100644 --- a/src/PVE/HA/Sim/Resources.pm +++ b/src/PVE/HA/Sim/Resources.pm @@ -143,15 +143,7 @@ sub get_static_stats { my $sid = $class->type() . ":$id"; my $hardware = $haenv->hardware(); - if (my $service_stats = $hardware->get_static_service_stats($sid)) { - return $service_stats; - } elsif ($id =~ /^(\d)(\d\d)/) { - # auto assign usage calculated from ID for convenience - my ($maxcpu, $maxmeory) = (int($1) + 1, (int($2) + 1) * 1 << 29); - return { maxcpu => $maxcpu, maxmem => $maxmeory }; - } else { - return {}; - } + return $hardware->get_static_service_stats($sid); } 1; diff --git a/src/test/test-crs-static-rebalance1/static_service_stats b/src/test/test-crs-static-rebalance1/static_service_stats index 7fb992dd..666af861 100644 --- a/src/test/test-crs-static-rebalance1/static_service_stats +++ b/src/test/test-crs-static-rebalance1/static_service_stats @@ -1,3 +1,53 @@ { - "vm:102": { "maxcpu": 2, "maxmem": 4000000000 } + "vm:101": { "maxcpu": 2, "maxmem": 1073741824 }, + "vm:102": { "maxcpu": 2, "maxmem": 4000000000 }, + "vm:103": { "maxcpu": 2, "maxmem": 2147483648 }, + "vm:104": { "maxcpu": 2, "maxmem": 2684354560 }, + "vm:105": { "maxcpu": 2, "maxmem": 3221225472 }, + "vm:106": { "maxcpu": 2, "maxmem": 3758096384 }, + "vm:107": { "maxcpu": 2, "maxmem": 4294967296 }, + "vm:108": { "maxcpu": 2, "maxmem": 4831838208 }, + "vm:109": { "maxcpu": 2, "maxmem": 5368709120 }, + "vm:110": { "maxcpu": 2, "maxmem": 5905580032 }, + "vm:111": { "maxcpu": 2, "maxmem": 6442450944 }, + "vm:112": { "maxcpu": 2, "maxmem": 6979321856 }, + "vm:113": { "maxcpu": 2, "maxmem": 7516192768 }, + "vm:114": { "maxcpu": 2, "maxmem": 8053063680 }, + "vm:115": { "maxcpu": 2, "maxmem": 8589934592 }, + "vm:116": { "maxcpu": 2, "maxmem": 9126805504 }, + "vm:117": { "maxcpu": 2, "maxmem": 9663676416 }, + "vm:118": { "maxcpu": 2, "maxmem": 10200547328 }, + "vm:119": { "maxcpu": 2, "maxmem": 10737418240 }, + "vm:120": { "maxcpu": 2, "maxmem": 11274289152 }, + "vm:121": { "maxcpu": 2, "maxmem": 11811160064 }, + "vm:122": { "maxcpu": 2, "maxmem": 12348030976 }, + "vm:123": { "maxcpu": 2, "maxmem": 12884901888 }, + "vm:124": { "maxcpu": 2, "maxmem": 13421772800 }, + "vm:125": { "maxcpu": 2, "maxmem": 13958643712 }, + "vm:126": { "maxcpu": 2, "maxmem": 14495514624 }, + "vm:127": { "maxcpu": 2, "maxmem": 15032385536 }, + "vm:128": { "maxcpu": 2, "maxmem": 15569256448 }, + "vm:129": { "maxcpu": 2, "maxmem": 16106127360 }, + "vm:130": { "maxcpu": 2, "maxmem": 16642998272 }, + "vm:131": { "maxcpu": 2, "maxmem": 17179869184 }, + "vm:132": { "maxcpu": 2, "maxmem": 17716740096 }, + "vm:133": { "maxcpu": 2, "maxmem": 18253611008 }, + "vm:134": { "maxcpu": 2, "maxmem": 18790481920 }, + "vm:135": { "maxcpu": 2, "maxmem": 19327352832 }, + "vm:136": { "maxcpu": 2, "maxmem": 19864223744 }, + "vm:137": { "maxcpu": 2, "maxmem": 20401094656 }, + "vm:138": { "maxcpu": 2, "maxmem": 20937965568 }, + "vm:139": { "maxcpu": 2, "maxmem": 21474836480 }, + "vm:140": { "maxcpu": 2, "maxmem": 22011707392 }, + "vm:141": { "maxcpu": 2, "maxmem": 22548578304 }, + "vm:142": { "maxcpu": 2, "maxmem": 23085449216 }, + "vm:143": { "maxcpu": 2, "maxmem": 23622320128 }, + "vm:144": { "maxcpu": 2, "maxmem": 24159191040 }, + "vm:145": { "maxcpu": 2, "maxmem": 24696061952 }, + "vm:146": { "maxcpu": 2, "maxmem": 25232932864 }, + "vm:147": { "maxcpu": 2, "maxmem": 25769803776 }, + "vm:148": { "maxcpu": 2, "maxmem": 26306674688 }, + "vm:149": { "maxcpu": 2, "maxmem": 26843545600 }, + "vm:150": { "maxcpu": 2, "maxmem": 27380416512 }, + "vm:151": { "maxcpu": 2, "maxmem": 27917287424 } } diff --git a/src/test/test-crs-static-rebalance2/static_service_stats b/src/test/test-crs-static-rebalance2/static_service_stats index 0967ef42..a4049f80 100644 --- a/src/test/test-crs-static-rebalance2/static_service_stats +++ b/src/test/test-crs-static-rebalance2/static_service_stats @@ -1 +1,8 @@ -{} +{ + "vm:100": { "maxcpu": 2, "maxmem": 536870912 }, + "vm:101": { "maxcpu": 2, "maxmem": 1073741824 }, + "vm:102": { "maxcpu": 2, "maxmem": 1610612736 }, + "vm:103": { "maxcpu": 2, "maxmem": 2147483648 }, + "vm:104": { "maxcpu": 2, "maxmem": 2684354560 }, + "vm:105": { "maxcpu": 2, "maxmem": 3221225472 } +} -- 2.47.3
