Extend InvalidArgument and RequiredArgument error classes

CHANGELOG.md

@@ -65,6 +65,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   methods in Gmpv8 [PR 133](https://github.com/greenbone/python-gvm/pull/133)
 * Introduced Enum classes for authentication and privacy algorithms of SNMP
   credentials [PR 133](https://github.com/greenbone/python-gvm/pull/133)
+* Extended `InvalidArgument` and `RequiredArgument` errors to allow passing
+  argument and function name as keyword parameter [PR 134](https://github.com/greenbone/python-gvm/pull/134)
 
 ### Removed
 * Removed hosts_ordering argument from `modify_target` [PR 88](https://github.com/greenbone/python-gvm/pull/88)

gvm/errors.py

@@ -31,11 +31,58 @@ class InvalidArgument(GvmError):
     """Raised if an invalid argument/parameter is passed
 
     Derives from :py:class:`GvmError`
+
+    Attributes:
+        message (str, optional): Error message to be displayed. Takes precedence
+            over argument and function
+        argument (str, optional): Optional name of the invalid argument
+        function (str, optional): Optional name of the called function
     """
 
+    def __init__(self, message=None, *, argument=None, function=None):
+        # pylint: disable=super-init-not-called
+        self.message = message
+        self.argument = argument
+        self.function = function
+
+    def __str__(self):
+        if self.message:
+            return self.message
+
+        if not self.function:
+            return "Invalid argument {}".format(self.argument)
+
+        if not self.argument:
+            return "Invalid argument for {}".format(self.function)
+
+        return "Invalid argument {} for {}".format(self.argument, self.function)
+
 
 class RequiredArgument(GvmError):
     """Raised if a required argument/parameter is missing
 
     Derives from :py:class:`GvmError`
+
+    Attributes:
+        message (str): Error message to be displayed
+        argument (str, optional): Optional name of the required argument
+        function (str, optional): Optional name of the called function
     """
+
+    def __init__(self, message=None, argument=None, function=None):
+        # pylint: disable=super-init-not-called
+        self.message = message
+        self.argument = argument
+        self.function = function
+
+    def __str__(self):
+        if self.message:
+            return self.message
+
+        if not self.function:
+            return "Required argument {}".format(self.argument)
+
+        if not self.argument:
+            return "Required argument missing for {}".format(self.function)
+
+        return "{} requires a {} argument".format(self.function, self.argument)

gvm/protocols/gmpv7.py

@@ -537,7 +537,7 @@ def import_config(self, config):
             cmd.append_xml_str(config)
         except etree.XMLSyntaxError as e:
             raise InvalidArgument(
-                "Invalid xml passed as config to import_config", e
+                "Invalid xml passed as config to import_config {}".format(e)
             )
 
         return self._send_xml_command(cmd)
@@ -1291,7 +1291,7 @@ def import_report(
             cmd.append_xml_str(report)
         except etree.XMLSyntaxError as e:
             raise InvalidArgument(
-                "Invalid xml passed as report to import_report", e
+                "Invalid xml passed as report to import_report {}".format(e)
             )
 
         return self._send_xml_command(cmd)