Merge "add validation for trigger update"
This commit is contained in:
commit
b7c0857b0f
|
@ -170,6 +170,7 @@ class TriggersController(wsgi.Controller):
|
||||||
raise exc.HTTPBadRequest(explanation=msg)
|
raise exc.HTTPBadRequest(explanation=msg)
|
||||||
try:
|
try:
|
||||||
trigger.properties = trigger_property
|
trigger.properties = trigger_property
|
||||||
|
self.operationengine_api.verify_trigger(context, trigger)
|
||||||
self.operationengine_api.update_trigger(context, trigger)
|
self.operationengine_api.update_trigger(context, trigger)
|
||||||
except exception.InvalidInput as ex:
|
except exception.InvalidInput as ex:
|
||||||
raise exc.HTTPBadRequest(explanation=ex.msg)
|
raise exc.HTTPBadRequest(explanation=ex.msg)
|
||||||
|
|
|
@ -10,6 +10,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.
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
import mock
|
||||||
from webob import exc
|
from webob import exc
|
||||||
|
|
||||||
from karbor.api.v1 import triggers as trigger_api
|
from karbor.api.v1 import triggers as trigger_api
|
||||||
|
@ -127,6 +128,22 @@ class TriggerApiTest(base.TestCase):
|
||||||
self.assertEqual(10, int(
|
self.assertEqual(10, int(
|
||||||
trigger1['trigger_info']['properties']['window']))
|
trigger1['trigger_info']['properties']['window']))
|
||||||
|
|
||||||
|
@mock.patch('karbor.services.operationengine.engine.triggers.timetrigger.'
|
||||||
|
'time_trigger.utils.check_trigger_definition')
|
||||||
|
def test_update_trigger_invalid_windows(self,
|
||||||
|
mock_check_trigger_definition):
|
||||||
|
trigger = self._create_one_trigger()
|
||||||
|
|
||||||
|
name = 'every minutes'
|
||||||
|
param = self.default_create_trigger_param.copy()
|
||||||
|
param['name'] = name
|
||||||
|
param['properties']['window'] = 'abc'
|
||||||
|
body = self._get_create_trigger_request_body(param)
|
||||||
|
mock_check_trigger_definition.return_value = exception.InvalidInput
|
||||||
|
self.assertRaises(exception.ValidationError,
|
||||||
|
self.controller.update,
|
||||||
|
self.req, trigger['trigger_info']['id'], body=body)
|
||||||
|
|
||||||
def test_show_trigger_not_exist(self):
|
def test_show_trigger_not_exist(self):
|
||||||
self.assertRaises(exc.HTTPNotFound,
|
self.assertRaises(exc.HTTPNotFound,
|
||||||
self.controller.show,
|
self.controller.show,
|
||||||
|
|
Loading…
Reference in New Issue