From a4990608b0daa60a0e396564bea2a1110ec005d8 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Wed, 27 Jan 2021 15:41:21 +0100 Subject: [PATCH 1/2] Add ReportFormatType to 21.04 The type for built-in report-formats and the function get_report_format_id_from_string have been added to GMP 21.04 and the "next" protocols. --- gvm/protocols/gmpv214/types.py | 4 ++++ gvm/protocols/next.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/gvm/protocols/gmpv214/types.py b/gvm/protocols/gmpv214/types.py index 10c5747ad..c60887486 100644 --- a/gvm/protocols/gmpv214/types.py +++ b/gvm/protocols/gmpv214/types.py @@ -38,6 +38,7 @@ InfoType, PermissionSubjectType, PortRangeType, + ReportFormatType, SnmpAuthAlgorithm, SnmpPrivacyAlgorithm, SortOrder, @@ -59,6 +60,7 @@ get_info_type_from_string, get_permission_subject_type_from_string, get_port_range_type_from_string, + get_report_format_id_from_string, get_snmp_auth_algorithm_from_string, get_snmp_privacy_algorithm_from_string, get_sort_order_from_string, @@ -89,6 +91,7 @@ "SnmpAuthAlgorithm", "SnmpPrivacyAlgorithm", "SortOrder", + "ReportFormatType", "TicketStatus", "TimeUnit", "UserAuthType", @@ -107,6 +110,7 @@ "get_info_type_from_string", "get_permission_subject_type_from_string", "get_port_range_type_from_string", + "get_report_format_id_from_string", "get_scanner_type_from_string", "get_severity_level_from_string", "get_snmp_auth_algorithm_from_string", diff --git a/gvm/protocols/next.py b/gvm/protocols/next.py index 5b4e6039c..d092da155 100644 --- a/gvm/protocols/next.py +++ b/gvm/protocols/next.py @@ -52,6 +52,7 @@ InfoType, PermissionSubjectType, PortRangeType, + ReportFormatType, ScannerType, SeverityLevel, SnmpAuthAlgorithm, @@ -75,6 +76,7 @@ get_info_type_from_string, get_permission_subject_type_from_string, get_port_range_type_from_string, + get_report_format_id_from_string, get_scanner_type_from_string, get_severity_level_from_string, get_snmp_auth_algorithm_from_string, @@ -104,6 +106,7 @@ "InfoType", "PermissionSubjectType", "PortRangeType", + "ReportFormatType", "ScannerType", "SeverityLevel", "SnmpAuthAlgorithm", @@ -127,6 +130,7 @@ "get_info_type_from_string", "get_permission_subject_type_from_string", "get_port_range_type_from_string", + "get_report_format_id_from_string", "get_scanner_type_from_string", "get_severity_level_from_string", "get_snmp_auth_algorithm_from_string", From c8551a429509ec04a6bf4b24e7afc8da245c5fcb Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Wed, 27 Jan 2021 15:56:11 +0100 Subject: [PATCH 2/2] Add ReportFormatType fix to CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4c76a66c..3c57b9952 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed ### Deprecated ### Removed + ### Fixed +* Add missing ReportFormatType to GMP 21.04 [#385](https://github.com/greenbone/python-gvm/pull/385) [Unreleased]: https://github.com/greenbone/python-gvm/compare/v21.1.2...HEAD