feat(config): add specific-to-handler config options to override config entries

Author: Matej Cotman

src/oxygen/gatling.py

@@ -35,8 +35,8 @@ def run_gatling(self, result_file, command, check_return_code=False, **env):
         logger.info('Result file: {}'.format(result_file))
         return result_file
 
-    def parse_results(self, result_file):
-        return self._transform_tests(validate_path(result_file).resolve())
+    def parse_results(self, resultfile):
+        return self._transform_tests(validate_path(resultfile).resolve())
 
     def _transform_tests(self, result_file):
         '''Given the result_file path, open the test results and get a suite

src/oxygen/junit.py

@@ -23,10 +23,10 @@ def run_junit(self, result_file, command, check_return_code=False, **env):
         logger.info('Result file: {}'.format(result_file))
         return result_file
 
-    def parse_results(self, result_file):
-        result_file = self._validate_path(result_file)
+    def parse_results(self, resultfile):
+        resultfile = self._validate_path(resultfile)
         try:
-            xml = JUnitXml.fromfile(result_file)
+            xml = JUnitXml.fromfile(resultfile)
         except TypeError as e:
             raise JUnitHandlerException(e)
         return self._transform_tests(xml)

src/oxygen/oxygen.py

@@ -231,7 +231,8 @@ def run(self):
         if not vars(args):
             parser.error('No arguments given')
         output_filename = self.get_output_filename(args.resultfile)
-        parsed_results = args.func(args.resultfile)
+        parsed_results = args.func(
+            **{k: v for (k, v) in vars(args).items() if not callable(v)})
         robot_suite = RobotInterface().running.build_suite(parsed_results)
         robot_suite.run(output=output_filename,
                         log=None,

src/oxygen/zap.py

@@ -25,9 +25,25 @@ def run_zap(self, result_file, command, check_return_code=False, **env):
         logger.info('Result file: {}'.format(result_file))
         return result_file
 
-
-    def parse_results(self, result_file):
-        zap_dict = self._read_results(validate_path(result_file).resolve())
+    def cli(self):
+        cli_interface = self.DEFAULT_CLI.copy()
+        cli_interface[('--accepted-risk-level',)] = {
+            'help': 'Set accepted risk level',
+            'default': 2,
+            'type': int
+        }
+        cli_interface[('--required-confidence-level',)] = {
+            'help': 'Set required confidence level',
+            'default': 1,
+            'type': int
+        }
+        return cli_interface
+
+    def parse_results(self, resultfile, accepted_risk_level,
+                      required_confidence_level):
+        self._accepted_risk_level = accepted_risk_level
+        self._required_confidence_level = required_confidence_level
+        zap_dict = self._read_results(validate_path(resultfile).resolve())
         return self._parse_zap_dict(zap_dict)
 
     def _read_results(self, file_name):
@@ -190,7 +206,11 @@ def _get_parameter(self, zap_dict, name, default_text):
 
 
     def _get_treshold_risk_level(self):
-        risk_level = self._config.get('accepted_risk_level', None)
+        risk_level = getattr(
+            self,
+            '_accepted_risk_level',
+            self._config.get('accepted_risk_level', None)
+        )
 
         if risk_level is None:
             print('No acceptable risk level configured, defaulting to 0')
@@ -206,7 +226,11 @@ def _get_treshold_risk_level(self):
 
 
     def _get_required_confidence_level(self):
-        confidence_level = self._config.get('required_confidence_level', None)
+        confidence_level = getattr(
+            self,
+            '_required_confidence_level',
+            self._config.get('required_confidence_level', None)
+        )
 
         if confidence_level is None:
             print('No required confidence level configured, defaulting to 0')