starlingx/config
Code Issues Proposed changes

Fix controllerfs-modify related bugs

Browse Source 
A bug in the get_alarms_degrade was causing the API to return a list of
degrade affecting alarms when there was none. This could be observed by
raising NTP alarms by configuring the NTP servers with invalid
addresses. This bug would cause the controllerfs-modify to fail
increasing the size a filesystem.

Also fix a bug with the return value of the controllerfs-modify API. On
success "None" would be returned on the CLI.

Closes-Bug: 1828097
Change-Id: Id09652a8f88915ea4e5ec90c96f195fe0350a550
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
This commit is contained in:
Kristine Bujold 2019-06-10 11:15:09 -04:00
parent 258463eb51
commit 92b4517165
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysinv/sysinv/centos/build_srpm.data
View File

@ -1,2 +1,2 @@
SRC_DIR="sysinv" SRC_DIR="sysinv"
TIS_PATCH_VER=321 TIS_PATCH_VER=322

4
sysinv/sysinv/sysinv/sysinv/api/controllers/v1/controller_fs.py
View File

@ -16,7 +16,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# #
# Copyright (c) 2013-2018 Wind River Systems, Inc. # Copyright (c) 2013-2019 Wind River Systems, Inc.
# #
@ -635,7 +635,7 @@ class ControllerFsController(rest.RestController):
@cutils.synchronized(LOCK_NAME) @cutils.synchronized(LOCK_NAME)
@wsme.validate(types.uuid, [ControllerFsPatchType]) @wsme.validate(types.uuid, [ControllerFsPatchType])
@wsme_pecan.wsexpose(ControllerFs, types.uuid, body=[[ControllerFsPatchType]]) @wsme_pecan.wsexpose(None, types.uuid, body=[[ControllerFsPatchType]])
def update_many(self, isystem_uuid, patch): def update_many(self, isystem_uuid, patch):
"""Update the current controller_fs configuration.""" """Update the current controller_fs configuration."""

4
sysinv/sysinv/sysinv/sysinv/common/health.py
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2018 Wind River Systems, Inc. # Copyright (c) 2018-2019 Wind River Systems, Inc.
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -138,7 +138,7 @@ class Health(object):
# and also filter the alarms bases on entity instance id. # and also filter the alarms bases on entity instance id.
# If multiple alarms with the same ID exist, we only return the ID # If multiple alarms with the same ID exist, we only return the ID
# one time. # one time.
if not fm_api.FaultAPIs.alarm_allowed(alarm.severity, degrade_affecting): if degrade_affecting == 'True':
if (entity_instance_id_filter in alarm.entity_instance_id and if (entity_instance_id_filter in alarm.entity_instance_id and
alarm.alarm_id not in alarm_ignore_list and alarm.alarm_id not in alarm_ignore_list and
alarm.alarm_id not in degrade_alarms): alarm.alarm_id not in degrade_alarms):