From 5c6eb170878cefa12f717a62c31f7228d440e61e Mon Sep 17 00:00:00 2001 From: Koren Lev Date: Tue, 10 Oct 2017 18:08:39 +0300 Subject: release 1.1 for euphrates Change-Id: Iddc0e0148db7c72458b7fcdfcb7664e4aa609be0 Signed-off-by: Koren Lev --- app/api/responders/resource/scheduled_scans.py | 32 ++++++++++++++------------ 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'app/api/responders/resource/scheduled_scans.py') diff --git a/app/api/responders/resource/scheduled_scans.py b/app/api/responders/resource/scheduled_scans.py index 0588cd0..f8cf92c 100644 --- a/app/api/responders/resource/scheduled_scans.py +++ b/app/api/responders/resource/scheduled_scans.py @@ -38,11 +38,12 @@ class ScheduledScans(ResponderBase): filters_requirements = { "environment": self.require(str, mandatory=True), - "id": self.require(ObjectId, True), - "freq": self.require(str, False, - DataValidate.LIST, self.SCAN_FREQ), - "page": self.require(int, True), - "page_size": self.require(int, True) + "id": self.require(ObjectId, convert_to_type=True), + "freq": self.require(str, + validate=DataValidate.LIST, + requirement=self.SCAN_FREQ), + "page": self.require(int, convert_to_type=True), + "page_size": self.require(int, convert_to_type=True) } self.validate_query_data(filters, filters_requirements) @@ -71,16 +72,17 @@ class ScheduledScans(ResponderBase): log_levels = self.get_constants_by_name("log_levels") scheduled_scan_requirements = { "environment": self.require(str, mandatory=True), - "scan_only_links": self.require(bool, True), - "scan_only_cliques": self.require(bool, True), - "scan_only_inventory": self.require(bool, True), - "freq": self.require(str, validate=DataValidate.LIST, - requirement=self.SCAN_FREQ, - mandatory=True), + "scan_only_links": self.require(bool, convert_to_type=True), + "scan_only_cliques": self.require(bool, convert_to_type=True), + "scan_only_inventory": self.require(bool, convert_to_type=True), + "freq": self.require(str, + mandatory=True, + validate=DataValidate.LIST, + requirement=self.SCAN_FREQ), "log_level": self.require(str, validate=DataValidate.LIST, requirement=log_levels), - "clear": self.require(bool, True), + "clear": self.require(bool, convert_to_type=True), "submit_timestamp": self.require(str, mandatory=True) } self.validate_query_data(scheduled_scan, scheduled_scan_requirements) @@ -93,12 +95,12 @@ class ScheduledScans(ResponderBase): env_name = scheduled_scan["environment"] if not self.check_environment_name(env_name): - self.bad_request("unkown environment: " + env_name) + self.bad_request("unknown environment: " + env_name) self.write(scheduled_scan, self.COLLECTION) self.set_successful_response(resp, - {"message": "created a new scheduled scan for " - "environment {0}" + {"message": "created a new scheduled scan " + "for environment {0}" .format(env_name)}, "201") -- cgit 1.2.3-korg