diff options
author | SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-06-06 11:01:13 +0800 |
---|---|---|
committer | SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-06-06 11:01:13 +0800 |
commit | 5eb8d87e563503b0cf67746e34f6f6038c567a72 (patch) | |
tree | 3884b944546bd50ed542fa60c2c07c1d99c3c636 /result_collection_api/opnfv_testapi/resources/result_handlers.py | |
parent | c50f95a4e05af030f183af132ad4a5f46121e03f (diff) |
refactor int query parameter process in testAPI
add method GenericResultHandler.get_int()
refactor GenericResultHandler.set_query() & ResultsCLHandler.get()
JIRA: FUNCTEST-294
Change-Id: I44636983af7784a5b2863427abc0895e89cfa83c
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'result_collection_api/opnfv_testapi/resources/result_handlers.py')
-rw-r--r-- | result_collection_api/opnfv_testapi/resources/result_handlers.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/result_collection_api/opnfv_testapi/resources/result_handlers.py b/result_collection_api/opnfv_testapi/resources/result_handlers.py index 0a4c0db..44834fd 100644 --- a/result_collection_api/opnfv_testapi/resources/result_handlers.py +++ b/result_collection_api/opnfv_testapi/resources/result_handlers.py @@ -25,6 +25,13 @@ class GenericResultHandler(GenericApiHandler): self.table = self.db_results self.table_cls = TestResult + def get_int(self, key, value): + try: + value = int(value) + except: + raise HTTPError(HTTP_BAD_REQUEST, '{} must be int', key) + return value + def set_query(self): query = dict() for k in self.request.query_arguments.keys(): @@ -32,10 +39,7 @@ class GenericResultHandler(GenericApiHandler): if k == 'project' or k == 'pod' or k == 'case': query[k + '_name'] = v elif k == 'period': - try: - v = int(v) - except: - raise HTTPError(HTTP_BAD_REQUEST, 'period must be int') + v = self.get_int(k, v) if v > 0: period = datetime.now() - timedelta(days=v) obj = {"$gte": str(period)} @@ -119,10 +123,7 @@ class ResultsCLHandler(GenericResultHandler): """ last = self.get_query_argument('last', 0) if last is not None: - try: - last = int(last) - except: - raise HTTPError(HTTP_BAD_REQUEST, 'last must be int') + last = self.get_int('last', last) self._list(self.set_query(), sort=[{'start_date', -1}], last=last) |