From aa61a05ecdf116012f5c6874af946f91f2c8a421 Mon Sep 17 00:00:00 2001 From: Allain Legacy Date: Wed, 17 Oct 2018 09:13:02 -0500 Subject: [PATCH] sysinv: reduce minimum allowed vswitch cpu count The vswitch CPU count semantic check is being modified to reduce the minimum acceptable value from 1 to 0. This is being done to accommodate work being done to allow a vswitch to share the set of platform CPUs and operate in a reduced CPU usage mode rather than require a dedicated set of CPUs to run. Story: 2004357 Task: 27957 Change-Id: Ic6d9d4b7f46a37e294c4bdcbb2948a7310956d65 Signed-off-by: Allain Legacy --- sysinv/sysinv/centos/build_srpm.data | 2 +- sysinv/sysinv/sysinv/sysinv/api/controllers/v1/cpu_utils.py | 2 +- sysinv/sysinv/sysinv/sysinv/puppet/platform.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sysinv/sysinv/centos/build_srpm.data b/sysinv/sysinv/centos/build_srpm.data index b9b3dc2d9b..73abbf7dff 100644 --- a/sysinv/sysinv/centos/build_srpm.data +++ b/sysinv/sysinv/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="sysinv" -TIS_PATCH_VER=291 +TIS_PATCH_VER=292 diff --git a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/cpu_utils.py b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/cpu_utils.py index 93deef47c7..df09a6e857 100644 --- a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/cpu_utils.py +++ b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/cpu_utils.py @@ -19,7 +19,7 @@ CORE_FUNCTIONS = [ constants.NO_FUNCTION ] -VSWITCH_MIN_CORES = 1 +VSWITCH_MIN_CORES = 0 VSWITCH_MAX_CORES = 8 diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/platform.py b/sysinv/sysinv/sysinv/sysinv/puppet/platform.py index b64b12717c..c33117d26a 100644 --- a/sysinv/sysinv/sysinv/sysinv/puppet/platform.py +++ b/sysinv/sysinv/sysinv/sysinv/puppet/platform.py @@ -592,7 +592,7 @@ class PlatformPuppet(base.BasePuppet): # non-vswitch CPUs = all cores - vswitch cores non_vswitch_cpus = host_cpu_list - for i in [int(s) for s in vswitch_cpu_list.split(',')]: + for i in [c.cpu for c in vswitch_cpus]: non_vswitch_cpus.remove(i) # change the CPU list to ranges