openstack
/
tacker
Code Issues Proposed changes

Merge "Fix delete PM threshold API not returning 404"

This commit is contained in:
Zuul 2023-07-04 01:18:06 +00:00 committed by Gerrit Code Review
parent 7eaf841525 94b2532978
commit fe0807231d
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tacker/sol_refactored/controller/vnfpm_v2.py
View File

@ -431,7 +431,7 @@ class VnfPmControllerV2(sol_wsgi.SolAPIController):
pm_threshold = pm_threshold_utils.get_pm_threshold(
context, thresholdId)
if not pm_threshold:
raise sol_ex.PMThresholdNotExist(thresholdId=thresholdId)
raise sol_ex.PMThresholdNotExist(threshold_id=thresholdId)
self.threshold_plugin.delete_threshold(
context=context, pm_threshold=pm_threshold)

32
tacker/tests/unit/sol_refactored/controller/test_vnfpm_v2.py
View File

@ -575,6 +575,13 @@ class TestVnfpmV2(base.BaseTestCase):
result = self.controller.show_threshold(self.request, 'pm_threshold_1')
self.assertEqual(200, result.status)
@mock.patch.object(objects.base.TackerPersistentObject, 'get_by_id')
def test_pm_threshold_show_not_exist(self, mock_pm):
mock_pm.return_value = None
self.assertRaises(
sol_ex.PMThresholdNotExist, self.controller.show_threshold,
request=self.request, thresholdId='pm_threshold_1')
@mock.patch.object(objects.base.TackerPersistentObject, 'update')
@mock.patch.object(objects.base.TackerPersistentObject, 'get_by_id')
@mock.patch.object(common_script_utils, 'test_notification')
@ -611,6 +618,24 @@ class TestVnfpmV2(base.BaseTestCase):
body=body)
self.assertEqual(200, result.status)
@mock.patch.object(objects.base.TackerPersistentObject, 'get_by_id')
def test_pm_threshold_update_not_exist(self, mock_pm):
mock_pm.return_value = None
_SubscriptionAuthentication = {
'authType': ['BASIC'],
'paramsBasic': {
'userName': 'test_name',
'password': 'test_pwd'
}
}
body = {
'callbackUri': 'callbackuri_update',
'authentication': _SubscriptionAuthentication
}
self.assertRaises(
sol_ex.PMThresholdNotExist, self.controller.update_threshold,
request=self.request, thresholdId='id', body=body)
@mock.patch.object(PrometheusPluginThreshold, 'create_threshold')
@mock.patch.object(objects.base.TackerPersistentObject, 'get_by_id')
def test_pm_threshold_delete(
@ -621,3 +646,10 @@ class TestVnfpmV2(base.BaseTestCase):
result = self.controller.delete_threshold(
self.request, 'pm_threshold_1')
self.assertEqual(204, result.status)
@mock.patch.object(objects.base.TackerPersistentObject, 'get_by_id')
def test_pm_threshold_delete_not_exist(self, mock_pm):
mock_pm.return_value = None
self.assertRaises(
sol_ex.PMThresholdNotExist, self.controller.delete_threshold,
request=self.request, thresholdId='pm_threshold_1')