openstack
/
masakari-monitors
Code Issues Proposed changes

Merge "Remove conditionals for an ancient openstacksdk"

This commit is contained in:
Zuul 2021-08-17 06:41:46 +00:00 committed by Gerrit Code Review
parent 339218d0af fe4e09408c
commit 981cda7e83
2 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
masakarimonitors/ha/masakari.py
View File

@ -68,16 +68,7 @@ class SendNotification(object):
except Exception as e:
if isinstance(e, exceptions.HttpException):
# TODO(samP): Remove attribute check and else case if
# openstacksdk is bumped up from '>=0.9.19' to '>=0.10.0'
# in global-requirements.
if hasattr(e, 'status_code'):
is_status_409 = e.status_code == 409
else:
is_status_409 = e.http_status == 409
if is_status_409:
if e.status_code == 409:
msg = ("Stop retrying to send a notification because "
"same notification have been already sent.")
LOG.info("%s", msg)

20
masakarimonitors/tests/unit/ha/test_masakari.py
View File

@ -97,14 +97,8 @@ class TestSendNotification(testtools.TestCase):
mock_conn.instance_ha.create_notification.return_value = mock.Mock()
mock_connection.return_value = mock_conn
# TODO(samP): Remove attribute check and else case if
# openstacksdk is bumped up from '>=0.9.19' to '>=0.10.0'
# in global-requirements.
if hasattr(exceptions.HttpException(), 'status_code'):
response = FakeResponse(status_code=409)
status_ex = exceptions.HttpException(response=response)
else:
status_ex = exceptions.HttpException(http_status=409)
response = FakeResponse(status_code=409)
status_ex = exceptions.HttpException(response=response)
mock_conn.instance_ha.create_notification.side_effect = status_ex
notifier = masakari.SendNotification()
@ -129,14 +123,8 @@ class TestSendNotification(testtools.TestCase):
mock_conn.instance_ha.create_notification.return_value = mock.Mock()
mock_connection.return_value = mock_conn
# TODO(samP): Remove attribute check and else case if
# openstacksdk is bumped up from '>=0.9.19' to '>=0.10.0'
# in global-requirements.
if hasattr(exceptions.HttpException(), 'status_code'):
response = FakeResponse(status_code=500)
status_ex = exceptions.HttpException(response=response)
else:
status_ex = exceptions.HttpException(http_status=500)
response = FakeResponse(status_code=500)
status_ex = exceptions.HttpException(response=response)
mock_conn.instance_ha.create_notification.side_effect = status_ex
mock_sleep.return_value = None