From 4b33d1b3381fd3d383f9af276c28d34d368684c7 Mon Sep 17 00:00:00 2001 From: Witold Bedyk Date: Mon, 1 Oct 2018 17:39:48 +0200 Subject: [PATCH] Fix body validation for Python 3 The API should expect timestamp as text, not binary data. Change-Id: I07a26c09a19a96907da7210b3fb1544a409b562a Story: 2003240 Task: 26832 --- monasca_events_api/app/controller/v1/body_validation.py | 3 +-- monasca_events_api/tests/unit/test_body_valodiation.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/monasca_events_api/app/controller/v1/body_validation.py b/monasca_events_api/app/controller/v1/body_validation.py index 0ebe85c..2012109 100644 --- a/monasca_events_api/app/controller/v1/body_validation.py +++ b/monasca_events_api/app/controller/v1/body_validation.py @@ -24,8 +24,7 @@ LOG = log.getLogger(__name__) default_schema = Schema({Required("events"): Any(list, dict), - Required("timestamp"): - Any(str, unicode) if six.PY2 else str}) + Required("timestamp"): six.text_type}) def validate_body(request_body): diff --git a/monasca_events_api/tests/unit/test_body_valodiation.py b/monasca_events_api/tests/unit/test_body_valodiation.py index d5add85..c07e5fb 100644 --- a/monasca_events_api/tests/unit/test_body_valodiation.py +++ b/monasca_events_api/tests/unit/test_body_valodiation.py @@ -41,7 +41,7 @@ class TestBodyValidation(base.BaseTestCase): self.assertRaises(MultipleInvalid, validate_body, body) def test_correct_body(self): - body = [{'events': [], 'timestamp': '2012-10-29T13:42:11Z+0200'}, + body = [{'events': [], 'timestamp': u'2012-10-29T13:42:11Z+0200'}, {'events': {}, 'timestamp': u'2012-10-29T13:42:11Z+0200'}] for b in body: validate_body(b)