diff --git a/gvm/protocols/gmp/_gmp224.py b/gvm/protocols/gmp/_gmp224.py index abbce5e92..b897c304c 100644 --- a/gvm/protocols/gmp/_gmp224.py +++ b/gvm/protocols/gmp/_gmp224.py @@ -11,7 +11,7 @@ from gvm.utils import SupportsStr, to_dotted_types_dict from .._protocol import GvmProtocol, T -from .requests import ( +from .requests.v224 import ( Aggregates, AggregateStatistic, AlertCondition, diff --git a/gvm/protocols/gmp/_gmp225.py b/gvm/protocols/gmp/_gmp225.py index afe6553f2..1c90a6896 100644 --- a/gvm/protocols/gmp/_gmp225.py +++ b/gvm/protocols/gmp/_gmp225.py @@ -10,7 +10,7 @@ from .._protocol import T from ._gmp224 import GMPv224 -from .requests import ( +from .requests.v225 import ( ResourceNames, ResourceType, ) diff --git a/gvm/protocols/gmp/requests/__init__.py b/gvm/protocols/gmp/requests/__init__.py index b4d742481..118d97821 100644 --- a/gvm/protocols/gmp/requests/__init__.py +++ b/gvm/protocols/gmp/requests/__init__.py @@ -2,122 +2,10 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -from ._aggregates import Aggregates, AggregateStatistic, SortOrder -from ._alerts import AlertCondition, AlertEvent, AlertMethod, Alerts -from ._audits import Audits -from ._auth import Authentication -from ._cert_bund_advisories import CertBundAdvisories -from ._cpes import Cpes -from ._credentials import ( - CredentialFormat, - Credentials, - CredentialType, - SnmpAuthAlgorithm, - SnmpPrivacyAlgorithm, -) -from ._cves import Cves -from ._dfn_cert_advisories import DfnCertAdvisories from ._entity_id import EntityID -from ._entity_type import EntityType -from ._feed import Feed, FeedType -from ._filters import Filters, FilterType -from ._groups import Groups -from ._help import Help, HelpFormat -from ._hosts import Hosts, HostsOrdering -from ._notes import Notes -from ._nvts import Nvts -from ._operating_systems import OperatingSystems -from ._overrides import Overrides -from ._permissions import Permissions, PermissionSubjectType -from ._policies import Policies -from ._port_lists import PortLists, PortRangeType -from ._report_formats import ReportFormats, ReportFormatType -from ._reports import Reports -from ._resource_names import ResourceNames, ResourceType -from ._results import Results -from ._roles import Roles -from ._scan_configs import ScanConfigs -from ._scanners import Scanners, ScannerType -from ._schedules import Schedules -from ._secinfo import InfoType, SecInfo -from ._severity import Severity -from ._system_reports import SystemReports -from ._tags import Tags -from ._targets import AliveTest, Targets -from ._tasks import Tasks -from ._tickets import Tickets, TicketStatus -from ._tls_certificates import TLSCertificates -from ._trashcan import TrashCan -from ._user_settings import UserSettings -from ._users import UserAuthType, Users from ._version import Version -from ._vulnerabilities import Vulnerabilities __all__ = ( - "Aggregates", - "AggregateStatistic", - "Alerts", - "AlertCondition", - "AlertEvent", - "AlertMethod", - "AliveTest", - "Audits", - "Authentication", - "CertBundAdvisories", - "Cpes", - "Credentials", - "CredentialFormat", - "CredentialType", - "Cves", - "DfnCertAdvisories", "EntityID", - "EntityType", - "Feed", - "FeedType", - "Filters", - "FilterType", - "Groups", - "Help", - "HelpFormat", - "Hosts", - "HostsOrdering", - "InfoType", - "Notes", - "Nvts", - "OperatingSystems", - "Overrides", - "Permissions", - "PermissionSubjectType", - "Policies", - "PortLists", - "PortRangeType", - "ReportFormatType", - "ReportFormats", - "Reports", - "ResourceNames", - "ResourceType", - "Results", - "Roles", - "ScanConfigs", - "Scanners", - "ScannerType", - "Schedules", - "SecInfo", - "Severity", - "SortOrder", - "SnmpAuthAlgorithm", - "SnmpPrivacyAlgorithm", - "SystemReports", - "Tags", - "Targets", - "Tasks", - "Tickets", - "TicketStatus", - "TLSCertificates", - "TrashCan", - "UserAuthType", - "UserSettings", - "Users", "Version", - "Vulnerabilities", ) diff --git a/gvm/protocols/gmp/requests/v224/__init__.py b/gvm/protocols/gmp/requests/v224/__init__.py new file mode 100644 index 000000000..920cd63c4 --- /dev/null +++ b/gvm/protocols/gmp/requests/v224/__init__.py @@ -0,0 +1,125 @@ +# SPDX-FileCopyrightText: 2018-2024 Greenbone AG +# +# SPDX-License-Identifier: GPL-3.0-or-later +# +""" +GMP Request implementations for GMP version 22.4. +""" + +from .._entity_id import EntityID +from .._version import Version +from ._aggregates import Aggregates, AggregateStatistic, SortOrder +from ._alerts import AlertCondition, AlertEvent, AlertMethod, Alerts +from ._audits import Audits +from ._auth import Authentication +from ._cert_bund_advisories import CertBundAdvisories +from ._cpes import Cpes +from ._credentials import ( + CredentialFormat, + Credentials, + CredentialType, + SnmpAuthAlgorithm, + SnmpPrivacyAlgorithm, +) +from ._cves import Cves +from ._dfn_cert_advisories import DfnCertAdvisories +from ._entity_type import EntityType +from ._feed import Feed, FeedType +from ._filters import Filters, FilterType +from ._groups import Groups +from ._help import Help, HelpFormat +from ._hosts import Hosts, HostsOrdering +from ._notes import Notes +from ._nvts import Nvts +from ._operating_systems import OperatingSystems +from ._overrides import Overrides +from ._permissions import Permissions, PermissionSubjectType +from ._policies import Policies +from ._port_lists import PortLists, PortRangeType +from ._report_formats import ReportFormats, ReportFormatType +from ._reports import Reports +from ._results import Results +from ._roles import Roles +from ._scan_configs import ScanConfigs +from ._scanners import Scanners, ScannerType +from ._schedules import Schedules +from ._secinfo import InfoType, SecInfo +from ._severity import Severity +from ._system_reports import SystemReports +from ._tags import Tags +from ._targets import AliveTest, Targets +from ._tasks import Tasks +from ._tickets import Tickets, TicketStatus +from ._tls_certificates import TLSCertificates +from ._trashcan import TrashCan +from ._user_settings import UserSettings +from ._users import UserAuthType, Users +from ._vulnerabilities import Vulnerabilities + +__all__ = ( + "Aggregates", + "AggregateStatistic", + "Alerts", + "AlertCondition", + "AlertEvent", + "AlertMethod", + "AliveTest", + "Audits", + "Authentication", + "CertBundAdvisories", + "Cpes", + "Credentials", + "CredentialFormat", + "CredentialType", + "Cves", + "DfnCertAdvisories", + "EntityID", + "EntityType", + "Feed", + "FeedType", + "Filters", + "FilterType", + "Groups", + "Help", + "HelpFormat", + "Hosts", + "HostsOrdering", + "InfoType", + "Notes", + "Nvts", + "OperatingSystems", + "Overrides", + "Permissions", + "PermissionSubjectType", + "Policies", + "PortLists", + "PortRangeType", + "ReportFormatType", + "ReportFormats", + "Reports", + "ResourceType", + "Results", + "Roles", + "ScanConfigs", + "Scanners", + "ScannerType", + "Schedules", + "SecInfo", + "Severity", + "SortOrder", + "SnmpAuthAlgorithm", + "SnmpPrivacyAlgorithm", + "SystemReports", + "Tags", + "Targets", + "Tasks", + "Tickets", + "TicketStatus", + "TLSCertificates", + "TrashCan", + "UserAuthType", + "UserSettings", + "Users", + "Version", + "Vulnerabilities", +) diff --git a/gvm/protocols/gmp/requests/_aggregates.py b/gvm/protocols/gmp/requests/v224/_aggregates.py similarity index 99% rename from gvm/protocols/gmp/requests/_aggregates.py rename to gvm/protocols/gmp/requests/v224/_aggregates.py index 13cd9fdac..ca70e4410 100644 --- a/gvm/protocols/gmp/requests/_aggregates.py +++ b/gvm/protocols/gmp/requests/v224/_aggregates.py @@ -9,7 +9,7 @@ from gvm.protocols.core import Request from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID from ._entity_type import EntityType diff --git a/gvm/protocols/gmp/requests/_alerts.py b/gvm/protocols/gmp/requests/v224/_alerts.py similarity index 99% rename from gvm/protocols/gmp/requests/_alerts.py rename to gvm/protocols/gmp/requests/v224/_alerts.py index 5a120c2b2..31e436bb7 100644 --- a/gvm/protocols/gmp/requests/_alerts.py +++ b/gvm/protocols/gmp/requests/v224/_alerts.py @@ -10,7 +10,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID from ._report_formats import ReportFormatType diff --git a/gvm/protocols/gmp/requests/_audits.py b/gvm/protocols/gmp/requests/v224/_audits.py similarity index 99% rename from gvm/protocols/gmp/requests/_audits.py rename to gvm/protocols/gmp/requests/v224/_audits.py index fa4e33421..a6e685100 100644 --- a/gvm/protocols/gmp/requests/_audits.py +++ b/gvm/protocols/gmp/requests/v224/_audits.py @@ -10,7 +10,7 @@ from gvm.utils import to_bool, to_comma_list from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID from ._hosts import HostsOrdering diff --git a/gvm/protocols/gmp/requests/_auth.py b/gvm/protocols/gmp/requests/v224/_auth.py similarity index 100% rename from gvm/protocols/gmp/requests/_auth.py rename to gvm/protocols/gmp/requests/v224/_auth.py diff --git a/gvm/protocols/gmp/requests/_cert_bund_advisories.py b/gvm/protocols/gmp/requests/v224/_cert_bund_advisories.py similarity index 98% rename from gvm/protocols/gmp/requests/_cert_bund_advisories.py rename to gvm/protocols/gmp/requests/v224/_cert_bund_advisories.py index 9b7aa57c4..c19880587 100644 --- a/gvm/protocols/gmp/requests/_cert_bund_advisories.py +++ b/gvm/protocols/gmp/requests/v224/_cert_bund_advisories.py @@ -9,7 +9,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class CertBundAdvisories: diff --git a/gvm/protocols/gmp/requests/_cpes.py b/gvm/protocols/gmp/requests/v224/_cpes.py similarity index 98% rename from gvm/protocols/gmp/requests/_cpes.py rename to gvm/protocols/gmp/requests/v224/_cpes.py index dd88b649b..ae57a84f7 100644 --- a/gvm/protocols/gmp/requests/_cpes.py +++ b/gvm/protocols/gmp/requests/v224/_cpes.py @@ -9,7 +9,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class Cpes: diff --git a/gvm/protocols/gmp/requests/_credentials.py b/gvm/protocols/gmp/requests/v224/_credentials.py similarity index 99% rename from gvm/protocols/gmp/requests/_credentials.py rename to gvm/protocols/gmp/requests/v224/_credentials.py index 10516f40a..ccf011057 100644 --- a/gvm/protocols/gmp/requests/_credentials.py +++ b/gvm/protocols/gmp/requests/v224/_credentials.py @@ -10,7 +10,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class CredentialFormat(Enum): diff --git a/gvm/protocols/gmp/requests/_cves.py b/gvm/protocols/gmp/requests/v224/_cves.py similarity index 98% rename from gvm/protocols/gmp/requests/_cves.py rename to gvm/protocols/gmp/requests/v224/_cves.py index d805404f2..85059bcb7 100644 --- a/gvm/protocols/gmp/requests/_cves.py +++ b/gvm/protocols/gmp/requests/v224/_cves.py @@ -9,7 +9,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class Cves: diff --git a/gvm/protocols/gmp/requests/_dfn_cert_advisories.py b/gvm/protocols/gmp/requests/v224/_dfn_cert_advisories.py similarity index 98% rename from gvm/protocols/gmp/requests/_dfn_cert_advisories.py rename to gvm/protocols/gmp/requests/v224/_dfn_cert_advisories.py index 6f9e37522..3f156ad0e 100644 --- a/gvm/protocols/gmp/requests/_dfn_cert_advisories.py +++ b/gvm/protocols/gmp/requests/v224/_dfn_cert_advisories.py @@ -9,7 +9,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class DfnCertAdvisories: diff --git a/gvm/protocols/gmp/requests/_entity_type.py b/gvm/protocols/gmp/requests/v224/_entity_type.py similarity index 100% rename from gvm/protocols/gmp/requests/_entity_type.py rename to gvm/protocols/gmp/requests/v224/_entity_type.py diff --git a/gvm/protocols/gmp/requests/_feed.py b/gvm/protocols/gmp/requests/v224/_feed.py similarity index 100% rename from gvm/protocols/gmp/requests/_feed.py rename to gvm/protocols/gmp/requests/v224/_feed.py diff --git a/gvm/protocols/gmp/requests/_filters.py b/gvm/protocols/gmp/requests/v224/_filters.py similarity index 99% rename from gvm/protocols/gmp/requests/_filters.py rename to gvm/protocols/gmp/requests/v224/_filters.py index d101d2e7c..8b3049daf 100644 --- a/gvm/protocols/gmp/requests/_filters.py +++ b/gvm/protocols/gmp/requests/v224/_filters.py @@ -10,7 +10,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class FilterType(Enum): diff --git a/gvm/protocols/gmp/requests/_groups.py b/gvm/protocols/gmp/requests/v224/_groups.py similarity index 99% rename from gvm/protocols/gmp/requests/_groups.py rename to gvm/protocols/gmp/requests/v224/_groups.py index 8591ae1c1..3e0a23afd 100644 --- a/gvm/protocols/gmp/requests/_groups.py +++ b/gvm/protocols/gmp/requests/v224/_groups.py @@ -9,7 +9,7 @@ from gvm.utils import to_bool, to_comma_list from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class Groups: diff --git a/gvm/protocols/gmp/requests/_help.py b/gvm/protocols/gmp/requests/v224/_help.py similarity index 100% rename from gvm/protocols/gmp/requests/_help.py rename to gvm/protocols/gmp/requests/v224/_help.py diff --git a/gvm/protocols/gmp/requests/_hosts.py b/gvm/protocols/gmp/requests/v224/_hosts.py similarity index 99% rename from gvm/protocols/gmp/requests/_hosts.py rename to gvm/protocols/gmp/requests/v224/_hosts.py index d4e7974ba..2e971bd87 100644 --- a/gvm/protocols/gmp/requests/_hosts.py +++ b/gvm/protocols/gmp/requests/v224/_hosts.py @@ -10,7 +10,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class HostsOrdering(Enum): diff --git a/gvm/protocols/gmp/requests/_notes.py b/gvm/protocols/gmp/requests/v224/_notes.py similarity index 99% rename from gvm/protocols/gmp/requests/_notes.py rename to gvm/protocols/gmp/requests/v224/_notes.py index 0cb49c163..846daaa67 100644 --- a/gvm/protocols/gmp/requests/_notes.py +++ b/gvm/protocols/gmp/requests/v224/_notes.py @@ -9,7 +9,7 @@ from gvm.utils import check_port, to_bool, to_comma_list from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID from ._severity import Severity diff --git a/gvm/protocols/gmp/requests/_nvts.py b/gvm/protocols/gmp/requests/v224/_nvts.py similarity index 99% rename from gvm/protocols/gmp/requests/_nvts.py rename to gvm/protocols/gmp/requests/v224/_nvts.py index 35421c2b7..8337271a8 100644 --- a/gvm/protocols/gmp/requests/_nvts.py +++ b/gvm/protocols/gmp/requests/v224/_nvts.py @@ -9,7 +9,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class Nvts: diff --git a/gvm/protocols/gmp/requests/_operating_systems.py b/gvm/protocols/gmp/requests/v224/_operating_systems.py similarity index 98% rename from gvm/protocols/gmp/requests/_operating_systems.py rename to gvm/protocols/gmp/requests/v224/_operating_systems.py index c141fc5b2..5ac3d69d0 100644 --- a/gvm/protocols/gmp/requests/_operating_systems.py +++ b/gvm/protocols/gmp/requests/v224/_operating_systems.py @@ -9,7 +9,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class OperatingSystems: diff --git a/gvm/protocols/gmp/requests/_overrides.py b/gvm/protocols/gmp/requests/v224/_overrides.py similarity index 99% rename from gvm/protocols/gmp/requests/_overrides.py rename to gvm/protocols/gmp/requests/v224/_overrides.py index 9beb9ce2e..9be5ee25d 100644 --- a/gvm/protocols/gmp/requests/_overrides.py +++ b/gvm/protocols/gmp/requests/v224/_overrides.py @@ -9,7 +9,7 @@ from gvm.utils import check_port, to_bool, to_comma_list from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID from ._severity import Severity diff --git a/gvm/protocols/gmp/requests/_permissions.py b/gvm/protocols/gmp/requests/v224/_permissions.py similarity index 99% rename from gvm/protocols/gmp/requests/_permissions.py rename to gvm/protocols/gmp/requests/v224/_permissions.py index 0258184ba..b1a31fd5b 100644 --- a/gvm/protocols/gmp/requests/_permissions.py +++ b/gvm/protocols/gmp/requests/v224/_permissions.py @@ -10,7 +10,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID from ._entity_type import EntityType diff --git a/gvm/protocols/gmp/requests/_policies.py b/gvm/protocols/gmp/requests/v224/_policies.py similarity index 99% rename from gvm/protocols/gmp/requests/_policies.py rename to gvm/protocols/gmp/requests/v224/_policies.py index d4f55beae..c07569d8a 100644 --- a/gvm/protocols/gmp/requests/_policies.py +++ b/gvm/protocols/gmp/requests/v224/_policies.py @@ -9,7 +9,7 @@ from gvm.utils import to_base64, to_bool from gvm.xml import XmlCommand, XmlError -from ._entity_id import EntityID +from .._entity_id import EntityID _EMPTY_POLICY_ID = "085569ce-73ed-11df-83c3-002264764cea" diff --git a/gvm/protocols/gmp/requests/_port_lists.py b/gvm/protocols/gmp/requests/v224/_port_lists.py similarity index 99% rename from gvm/protocols/gmp/requests/_port_lists.py rename to gvm/protocols/gmp/requests/v224/_port_lists.py index 5550a4cab..7dc2608c3 100644 --- a/gvm/protocols/gmp/requests/_port_lists.py +++ b/gvm/protocols/gmp/requests/v224/_port_lists.py @@ -10,7 +10,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class PortRangeType(Enum): diff --git a/gvm/protocols/gmp/requests/_report_formats.py b/gvm/protocols/gmp/requests/v224/_report_formats.py similarity index 99% rename from gvm/protocols/gmp/requests/_report_formats.py rename to gvm/protocols/gmp/requests/v224/_report_formats.py index 1fc8dbad2..fbf2e5d30 100644 --- a/gvm/protocols/gmp/requests/_report_formats.py +++ b/gvm/protocols/gmp/requests/v224/_report_formats.py @@ -11,7 +11,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand, XmlError -from ._entity_id import EntityID +from .._entity_id import EntityID class ReportFormatType(Enum): diff --git a/gvm/protocols/gmp/requests/_reports.py b/gvm/protocols/gmp/requests/v224/_reports.py similarity index 99% rename from gvm/protocols/gmp/requests/_reports.py rename to gvm/protocols/gmp/requests/v224/_reports.py index 6312ac571..16af26457 100644 --- a/gvm/protocols/gmp/requests/_reports.py +++ b/gvm/protocols/gmp/requests/v224/_reports.py @@ -9,7 +9,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand, XmlError -from ._entity_id import EntityID +from .._entity_id import EntityID from ._report_formats import ReportFormatType diff --git a/gvm/protocols/gmp/requests/_results.py b/gvm/protocols/gmp/requests/v224/_results.py similarity index 98% rename from gvm/protocols/gmp/requests/_results.py rename to gvm/protocols/gmp/requests/v224/_results.py index 1e6ecb34b..d4e651983 100644 --- a/gvm/protocols/gmp/requests/_results.py +++ b/gvm/protocols/gmp/requests/v224/_results.py @@ -9,7 +9,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class Results: diff --git a/gvm/protocols/gmp/requests/_roles.py b/gvm/protocols/gmp/requests/v224/_roles.py similarity index 99% rename from gvm/protocols/gmp/requests/_roles.py rename to gvm/protocols/gmp/requests/v224/_roles.py index 0ce40498b..fffcbee09 100644 --- a/gvm/protocols/gmp/requests/_roles.py +++ b/gvm/protocols/gmp/requests/v224/_roles.py @@ -9,7 +9,7 @@ from gvm.utils import to_bool, to_comma_list from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class Roles: diff --git a/gvm/protocols/gmp/requests/_scan_configs.py b/gvm/protocols/gmp/requests/v224/_scan_configs.py similarity index 99% rename from gvm/protocols/gmp/requests/_scan_configs.py rename to gvm/protocols/gmp/requests/v224/_scan_configs.py index c74dd736e..f5070cb3a 100644 --- a/gvm/protocols/gmp/requests/_scan_configs.py +++ b/gvm/protocols/gmp/requests/v224/_scan_configs.py @@ -9,7 +9,7 @@ from gvm.utils import is_list_like, to_base64, to_bool from gvm.xml import XmlCommand, XmlError -from ._entity_id import EntityID +from .._entity_id import EntityID class ScanConfigs: diff --git a/gvm/protocols/gmp/requests/_scanners.py b/gvm/protocols/gmp/requests/v224/_scanners.py similarity index 99% rename from gvm/protocols/gmp/requests/_scanners.py rename to gvm/protocols/gmp/requests/v224/_scanners.py index 4aea056aa..57c7ecc0d 100644 --- a/gvm/protocols/gmp/requests/_scanners.py +++ b/gvm/protocols/gmp/requests/v224/_scanners.py @@ -10,7 +10,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class ScannerType(Enum): diff --git a/gvm/protocols/gmp/requests/_schedules.py b/gvm/protocols/gmp/requests/v224/_schedules.py similarity index 99% rename from gvm/protocols/gmp/requests/_schedules.py rename to gvm/protocols/gmp/requests/v224/_schedules.py index 82ca087fb..6dbb6b8e3 100644 --- a/gvm/protocols/gmp/requests/_schedules.py +++ b/gvm/protocols/gmp/requests/v224/_schedules.py @@ -9,7 +9,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class Schedules: diff --git a/gvm/protocols/gmp/requests/_secinfo.py b/gvm/protocols/gmp/requests/v224/_secinfo.py similarity index 98% rename from gvm/protocols/gmp/requests/_secinfo.py rename to gvm/protocols/gmp/requests/v224/_secinfo.py index 696750dd3..83566862e 100644 --- a/gvm/protocols/gmp/requests/_secinfo.py +++ b/gvm/protocols/gmp/requests/v224/_secinfo.py @@ -10,7 +10,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class InfoType(Enum): diff --git a/gvm/protocols/gmp/requests/_severity.py b/gvm/protocols/gmp/requests/v224/_severity.py similarity index 100% rename from gvm/protocols/gmp/requests/_severity.py rename to gvm/protocols/gmp/requests/v224/_severity.py diff --git a/gvm/protocols/gmp/requests/_system_reports.py b/gvm/protocols/gmp/requests/v224/_system_reports.py similarity index 98% rename from gvm/protocols/gmp/requests/_system_reports.py rename to gvm/protocols/gmp/requests/v224/_system_reports.py index 01d2857b1..415d1e39c 100644 --- a/gvm/protocols/gmp/requests/_system_reports.py +++ b/gvm/protocols/gmp/requests/v224/_system_reports.py @@ -11,7 +11,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class SystemReports: diff --git a/gvm/protocols/gmp/requests/_tags.py b/gvm/protocols/gmp/requests/v224/_tags.py similarity index 99% rename from gvm/protocols/gmp/requests/_tags.py rename to gvm/protocols/gmp/requests/v224/_tags.py index 1dcd135b4..ddb600779 100644 --- a/gvm/protocols/gmp/requests/_tags.py +++ b/gvm/protocols/gmp/requests/v224/_tags.py @@ -9,7 +9,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID from ._entity_type import EntityType diff --git a/gvm/protocols/gmp/requests/_targets.py b/gvm/protocols/gmp/requests/v224/_targets.py similarity index 99% rename from gvm/protocols/gmp/requests/_targets.py rename to gvm/protocols/gmp/requests/v224/_targets.py index 6bed3d302..4c745fb2a 100644 --- a/gvm/protocols/gmp/requests/_targets.py +++ b/gvm/protocols/gmp/requests/v224/_targets.py @@ -10,7 +10,7 @@ from gvm.utils import to_bool, to_comma_list from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class AliveTest(Enum): diff --git a/gvm/protocols/gmp/requests/_tasks.py b/gvm/protocols/gmp/requests/v224/_tasks.py similarity index 99% rename from gvm/protocols/gmp/requests/_tasks.py rename to gvm/protocols/gmp/requests/v224/_tasks.py index ea2ec51f3..9adeb8dbc 100644 --- a/gvm/protocols/gmp/requests/_tasks.py +++ b/gvm/protocols/gmp/requests/v224/_tasks.py @@ -10,7 +10,7 @@ from gvm.utils import SupportsStr, to_bool, to_comma_list from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID from ._hosts import HostsOrdering diff --git a/gvm/protocols/gmp/requests/_tickets.py b/gvm/protocols/gmp/requests/v224/_tickets.py similarity index 99% rename from gvm/protocols/gmp/requests/_tickets.py rename to gvm/protocols/gmp/requests/v224/_tickets.py index b72018108..8c1dbd82c 100644 --- a/gvm/protocols/gmp/requests/_tickets.py +++ b/gvm/protocols/gmp/requests/v224/_tickets.py @@ -10,7 +10,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class TicketStatus(Enum): diff --git a/gvm/protocols/gmp/requests/_tls_certificates.py b/gvm/protocols/gmp/requests/v224/_tls_certificates.py similarity index 99% rename from gvm/protocols/gmp/requests/_tls_certificates.py rename to gvm/protocols/gmp/requests/v224/_tls_certificates.py index 0d6a4edc9..18f74c93b 100644 --- a/gvm/protocols/gmp/requests/_tls_certificates.py +++ b/gvm/protocols/gmp/requests/v224/_tls_certificates.py @@ -9,7 +9,7 @@ from gvm.utils import to_bool from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class TLSCertificates: diff --git a/gvm/protocols/gmp/requests/_trashcan.py b/gvm/protocols/gmp/requests/v224/_trashcan.py similarity index 96% rename from gvm/protocols/gmp/requests/_trashcan.py rename to gvm/protocols/gmp/requests/v224/_trashcan.py index 45512b58a..c35518a07 100644 --- a/gvm/protocols/gmp/requests/_trashcan.py +++ b/gvm/protocols/gmp/requests/v224/_trashcan.py @@ -6,7 +6,7 @@ from gvm.protocols.core import Request from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class TrashCan: diff --git a/gvm/protocols/gmp/requests/_user_settings.py b/gvm/protocols/gmp/requests/v224/_user_settings.py similarity index 98% rename from gvm/protocols/gmp/requests/_user_settings.py rename to gvm/protocols/gmp/requests/v224/_user_settings.py index 7a23c1ae1..45e2b145f 100644 --- a/gvm/protocols/gmp/requests/_user_settings.py +++ b/gvm/protocols/gmp/requests/v224/_user_settings.py @@ -10,7 +10,7 @@ from gvm.utils import to_base64 from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class UserSettings: diff --git a/gvm/protocols/gmp/requests/_users.py b/gvm/protocols/gmp/requests/v224/_users.py similarity index 99% rename from gvm/protocols/gmp/requests/_users.py rename to gvm/protocols/gmp/requests/v224/_users.py index 29bcad1e9..d84097d7f 100644 --- a/gvm/protocols/gmp/requests/_users.py +++ b/gvm/protocols/gmp/requests/v224/_users.py @@ -10,7 +10,7 @@ from gvm.utils import to_bool, to_comma_list from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class UserAuthType(Enum): diff --git a/gvm/protocols/gmp/requests/_vulnerabilities.py b/gvm/protocols/gmp/requests/v224/_vulnerabilities.py similarity index 97% rename from gvm/protocols/gmp/requests/_vulnerabilities.py rename to gvm/protocols/gmp/requests/v224/_vulnerabilities.py index 84fe88b29..b09b9abb3 100644 --- a/gvm/protocols/gmp/requests/_vulnerabilities.py +++ b/gvm/protocols/gmp/requests/v224/_vulnerabilities.py @@ -8,7 +8,7 @@ from gvm.protocols.core import Request from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class Vulnerabilities: diff --git a/gvm/protocols/gmp/requests/v225/__init__.py b/gvm/protocols/gmp/requests/v225/__init__.py new file mode 100644 index 000000000..23feca7f1 --- /dev/null +++ b/gvm/protocols/gmp/requests/v225/__init__.py @@ -0,0 +1,143 @@ +# SPDX-FileCopyrightText: 2018-2024 Greenbone AG +# +# SPDX-License-Identifier: GPL-3.0-or-later +# +""" +GMP Request implementations for GMP version 22.5. +""" + +from .._entity_id import EntityID +from .._version import Version +from ..v224 import ( + Aggregates, + AggregateStatistic, + AlertCondition, + AlertEvent, + AlertMethod, + Alerts, + AliveTest, + Audits, + Authentication, + CertBundAdvisories, + Cpes, + CredentialFormat, + Credentials, + CredentialType, + Cves, + DfnCertAdvisories, + Feed, + FeedType, + Filters, + FilterType, + Groups, + Help, + HelpFormat, + Hosts, + HostsOrdering, + InfoType, + Notes, + Nvts, + OperatingSystems, + Overrides, + Permissions, + PermissionSubjectType, + Policies, + PortLists, + PortRangeType, + ReportFormats, + ReportFormatType, + Reports, + Results, + Roles, + ScanConfigs, + Scanners, + ScannerType, + Schedules, + SecInfo, + Severity, + SnmpAuthAlgorithm, + SnmpPrivacyAlgorithm, + SortOrder, + SystemReports, + Tags, + Targets, + Tasks, + Tickets, + TicketStatus, + TLSCertificates, + TrashCan, + UserAuthType, + Users, + UserSettings, + Vulnerabilities, +) +from ._resource_names import ResourceNames, ResourceType + +__all__ = ( + "Aggregates", + "AggregateStatistic", + "Alerts", + "AlertCondition", + "AlertEvent", + "AlertMethod", + "AliveTest", + "Audits", + "Authentication", + "CertBundAdvisories", + "Cpes", + "Credentials", + "CredentialFormat", + "CredentialType", + "Cves", + "DfnCertAdvisories", + "EntityID", + "EntityType", + "Feed", + "FeedType", + "Filters", + "FilterType", + "Groups", + "Help", + "HelpFormat", + "Hosts", + "HostsOrdering", + "InfoType", + "Notes", + "Nvts", + "OperatingSystems", + "Overrides", + "Permissions", + "PermissionSubjectType", + "Policies", + "PortLists", + "PortRangeType", + "ReportFormatType", + "ReportFormats", + "Reports", + "ResourceNames", + "ResourceType", + "Results", + "Roles", + "ScanConfigs", + "Scanners", + "ScannerType", + "Schedules", + "SecInfo", + "Severity", + "SortOrder", + "SnmpAuthAlgorithm", + "SnmpPrivacyAlgorithm", + "SystemReports", + "Tags", + "Targets", + "Tasks", + "Tickets", + "TicketStatus", + "TLSCertificates", + "TrashCan", + "UserAuthType", + "UserSettings", + "Users", + "Version", + "Vulnerabilities", +) diff --git a/gvm/protocols/gmp/requests/_resource_names.py b/gvm/protocols/gmp/requests/v225/_resource_names.py similarity index 98% rename from gvm/protocols/gmp/requests/_resource_names.py rename to gvm/protocols/gmp/requests/v225/_resource_names.py index 6caf832d9..2521a0b81 100644 --- a/gvm/protocols/gmp/requests/_resource_names.py +++ b/gvm/protocols/gmp/requests/v225/_resource_names.py @@ -9,7 +9,7 @@ from gvm.protocols.core import Request from gvm.xml import XmlCommand -from ._entity_id import EntityID +from .._entity_id import EntityID class ResourceType(Enum): diff --git a/tests/protocols/gmp/requests/v224/__init__.py b/tests/protocols/gmp/requests/v224/__init__.py new file mode 100644 index 000000000..5197e3be9 --- /dev/null +++ b/tests/protocols/gmp/requests/v224/__init__.py @@ -0,0 +1,3 @@ +# SPDX-FileCopyrightText: 2024 Greenbone AG +# +# SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/protocols/gmp/requests/test_aggregates.py b/tests/protocols/gmp/requests/v224/test_aggregates.py similarity index 99% rename from tests/protocols/gmp/requests/test_aggregates.py rename to tests/protocols/gmp/requests/v224/test_aggregates.py index ba20e09d2..77bc7dace 100644 --- a/tests/protocols/gmp/requests/test_aggregates.py +++ b/tests/protocols/gmp/requests/v224/test_aggregates.py @@ -6,7 +6,7 @@ from gvm.errors import InvalidArgument, InvalidArgumentType, RequiredArgument from gvm.protocols.core import Request -from gvm.protocols.gmp.requests import ( +from gvm.protocols.gmp.requests.v224 import ( Aggregates, AggregateStatistic, EntityType, diff --git a/tests/protocols/gmp/requests/test_alerts.py b/tests/protocols/gmp/requests/v224/test_alerts.py similarity index 99% rename from tests/protocols/gmp/requests/test_alerts.py rename to tests/protocols/gmp/requests/v224/test_alerts.py index 58b326651..5e78afbae 100644 --- a/tests/protocols/gmp/requests/test_alerts.py +++ b/tests/protocols/gmp/requests/v224/test_alerts.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import InvalidArgument, RequiredArgument -from gvm.protocols.gmp.requests import ( +from gvm.protocols.gmp.requests.v224 import ( AlertCondition, AlertEvent, AlertMethod, diff --git a/tests/protocols/gmp/requests/test_audits.py b/tests/protocols/gmp/requests/v224/test_audits.py similarity index 99% rename from tests/protocols/gmp/requests/test_audits.py rename to tests/protocols/gmp/requests/v224/test_audits.py index 29dc6542a..20af2c373 100644 --- a/tests/protocols/gmp/requests/test_audits.py +++ b/tests/protocols/gmp/requests/v224/test_audits.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import InvalidArgument, RequiredArgument -from gvm.protocols.gmp.requests import Audits, HostsOrdering +from gvm.protocols.gmp.requests.v224 import Audits, HostsOrdering class AuditsTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_auth.py b/tests/protocols/gmp/requests/v224/test_auth.py similarity index 98% rename from tests/protocols/gmp/requests/test_auth.py rename to tests/protocols/gmp/requests/v224/test_auth.py index f28e38b5d..e4c660a0d 100644 --- a/tests/protocols/gmp/requests/test_auth.py +++ b/tests/protocols/gmp/requests/v224/test_auth.py @@ -6,7 +6,7 @@ from gvm.errors import RequiredArgument from gvm.protocols.core import Request -from gvm.protocols.gmp.requests import Authentication +from gvm.protocols.gmp.requests.v224 import Authentication class AuthenticationTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_cert_bund_advisories.py b/tests/protocols/gmp/requests/v224/test_cert_bund_advisories.py similarity index 97% rename from tests/protocols/gmp/requests/test_cert_bund_advisories.py rename to tests/protocols/gmp/requests/v224/test_cert_bund_advisories.py index ebd1caa6b..053123df4 100644 --- a/tests/protocols/gmp/requests/test_cert_bund_advisories.py +++ b/tests/protocols/gmp/requests/v224/test_cert_bund_advisories.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import RequiredArgument -from gvm.protocols.gmp.requests import CertBundAdvisories +from gvm.protocols.gmp.requests.v224 import CertBundAdvisories class CertBundAdvisoriesTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_cpes.py b/tests/protocols/gmp/requests/v224/test_cpes.py similarity index 97% rename from tests/protocols/gmp/requests/test_cpes.py rename to tests/protocols/gmp/requests/v224/test_cpes.py index ec5a38383..7228a3fcd 100644 --- a/tests/protocols/gmp/requests/test_cpes.py +++ b/tests/protocols/gmp/requests/v224/test_cpes.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import RequiredArgument -from gvm.protocols.gmp.requests import Cpes +from gvm.protocols.gmp.requests.v224 import Cpes class CpesTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_credentials.py b/tests/protocols/gmp/requests/v224/test_credentials.py similarity index 99% rename from tests/protocols/gmp/requests/test_credentials.py rename to tests/protocols/gmp/requests/v224/test_credentials.py index 63cf85461..b5903a87c 100644 --- a/tests/protocols/gmp/requests/test_credentials.py +++ b/tests/protocols/gmp/requests/v224/test_credentials.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import InvalidArgument, RequiredArgument -from gvm.protocols.gmp.requests import ( +from gvm.protocols.gmp.requests.v224 import ( CredentialFormat, Credentials, CredentialType, diff --git a/tests/protocols/gmp/requests/test_cves.py b/tests/protocols/gmp/requests/v224/test_cves.py similarity index 97% rename from tests/protocols/gmp/requests/test_cves.py rename to tests/protocols/gmp/requests/v224/test_cves.py index f9a8d03cb..6e57eed73 100644 --- a/tests/protocols/gmp/requests/test_cves.py +++ b/tests/protocols/gmp/requests/v224/test_cves.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import RequiredArgument -from gvm.protocols.gmp.requests import Cves +from gvm.protocols.gmp.requests.v224 import Cves class CvesTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_dfn_cert_advisories.py b/tests/protocols/gmp/requests/v224/test_dfn_cert_advisories.py similarity index 97% rename from tests/protocols/gmp/requests/test_dfn_cert_advisories.py rename to tests/protocols/gmp/requests/v224/test_dfn_cert_advisories.py index 6416a87cb..a36d82649 100644 --- a/tests/protocols/gmp/requests/test_dfn_cert_advisories.py +++ b/tests/protocols/gmp/requests/v224/test_dfn_cert_advisories.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import RequiredArgument -from gvm.protocols.gmp.requests import DfnCertAdvisories +from gvm.protocols.gmp.requests.v224 import DfnCertAdvisories class DfnCertAdvisoriesTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_feed.py b/tests/protocols/gmp/requests/v224/test_feed.py similarity index 96% rename from tests/protocols/gmp/requests/test_feed.py rename to tests/protocols/gmp/requests/v224/test_feed.py index 7fec6be39..77cdb5bad 100644 --- a/tests/protocols/gmp/requests/test_feed.py +++ b/tests/protocols/gmp/requests/v224/test_feed.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import InvalidArgument, RequiredArgument -from gvm.protocols.gmp.requests import Feed, FeedType +from gvm.protocols.gmp.requests.v224 import Feed, FeedType class FeedTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_filters.py b/tests/protocols/gmp/requests/v224/test_filters.py similarity index 99% rename from tests/protocols/gmp/requests/test_filters.py rename to tests/protocols/gmp/requests/v224/test_filters.py index 60b1c172d..f2203372e 100644 --- a/tests/protocols/gmp/requests/test_filters.py +++ b/tests/protocols/gmp/requests/v224/test_filters.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import InvalidArgument, RequiredArgument -from gvm.protocols.gmp.requests import Filters, FilterType +from gvm.protocols.gmp.requests.v224 import Filters, FilterType class FilterTestsCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_groups.py b/tests/protocols/gmp/requests/v224/test_groups.py similarity index 99% rename from tests/protocols/gmp/requests/test_groups.py rename to tests/protocols/gmp/requests/v224/test_groups.py index af0bce3e0..e5f5fc9be 100644 --- a/tests/protocols/gmp/requests/test_groups.py +++ b/tests/protocols/gmp/requests/v224/test_groups.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import RequiredArgument -from gvm.protocols.gmp.requests import Groups +from gvm.protocols.gmp.requests.v224 import Groups class GroupsTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_help.py b/tests/protocols/gmp/requests/v224/test_help.py similarity index 92% rename from tests/protocols/gmp/requests/test_help.py rename to tests/protocols/gmp/requests/v224/test_help.py index bb38108bc..6d42dacdb 100644 --- a/tests/protocols/gmp/requests/test_help.py +++ b/tests/protocols/gmp/requests/v224/test_help.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import InvalidArgument -from gvm.protocols.gmp.requests import Help, HelpFormat +from gvm.protocols.gmp.requests.v224 import Help, HelpFormat class HelpTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_hosts.py b/tests/protocols/gmp/requests/v224/test_hosts.py similarity index 98% rename from tests/protocols/gmp/requests/test_hosts.py rename to tests/protocols/gmp/requests/v224/test_hosts.py index 4ab30effb..9aee78914 100644 --- a/tests/protocols/gmp/requests/test_hosts.py +++ b/tests/protocols/gmp/requests/v224/test_hosts.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import RequiredArgument -from gvm.protocols.gmp.requests import Hosts +from gvm.protocols.gmp.requests.v224 import Hosts class HostsTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_notes.py b/tests/protocols/gmp/requests/v224/test_notes.py similarity index 99% rename from tests/protocols/gmp/requests/test_notes.py rename to tests/protocols/gmp/requests/v224/test_notes.py index 55151fb58..7cba03b66 100644 --- a/tests/protocols/gmp/requests/test_notes.py +++ b/tests/protocols/gmp/requests/v224/test_notes.py @@ -6,7 +6,7 @@ from decimal import Decimal from gvm.errors import InvalidArgument, RequiredArgument -from gvm.protocols.gmp.requests import Notes +from gvm.protocols.gmp.requests.v224 import Notes class NotesTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_nvts.py b/tests/protocols/gmp/requests/v224/test_nvts.py similarity index 99% rename from tests/protocols/gmp/requests/test_nvts.py rename to tests/protocols/gmp/requests/v224/test_nvts.py index ca8024a1e..48045a5bc 100644 --- a/tests/protocols/gmp/requests/test_nvts.py +++ b/tests/protocols/gmp/requests/v224/test_nvts.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import RequiredArgument -from gvm.protocols.gmp.requests import Nvts +from gvm.protocols.gmp.requests.v224 import Nvts class NvtsTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_operating_systems.py b/tests/protocols/gmp/requests/v224/test_operating_systems.py similarity index 98% rename from tests/protocols/gmp/requests/test_operating_systems.py rename to tests/protocols/gmp/requests/v224/test_operating_systems.py index fba199615..3db469b06 100644 --- a/tests/protocols/gmp/requests/test_operating_systems.py +++ b/tests/protocols/gmp/requests/v224/test_operating_systems.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import RequiredArgument -from gvm.protocols.gmp.requests import OperatingSystems +from gvm.protocols.gmp.requests.v224 import OperatingSystems class OperatingSystemsTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_overrides.py b/tests/protocols/gmp/requests/v224/test_overrides.py similarity index 99% rename from tests/protocols/gmp/requests/test_overrides.py rename to tests/protocols/gmp/requests/v224/test_overrides.py index 8d7bb44be..6ea77aed3 100644 --- a/tests/protocols/gmp/requests/test_overrides.py +++ b/tests/protocols/gmp/requests/v224/test_overrides.py @@ -6,7 +6,7 @@ from decimal import Decimal from gvm.errors import InvalidArgument, RequiredArgument -from gvm.protocols.gmp.requests import Overrides +from gvm.protocols.gmp.requests.v224 import Overrides class OverridesTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_permissions.py b/tests/protocols/gmp/requests/v224/test_permissions.py similarity index 99% rename from tests/protocols/gmp/requests/test_permissions.py rename to tests/protocols/gmp/requests/v224/test_permissions.py index ddd3e95ca..b44cb2b52 100644 --- a/tests/protocols/gmp/requests/test_permissions.py +++ b/tests/protocols/gmp/requests/v224/test_permissions.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import InvalidArgument, RequiredArgument -from gvm.protocols.gmp.requests import Permissions, PermissionSubjectType +from gvm.protocols.gmp.requests.v224 import Permissions, PermissionSubjectType class PermissionsTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_policies.py b/tests/protocols/gmp/requests/v224/test_policies.py similarity index 99% rename from tests/protocols/gmp/requests/test_policies.py rename to tests/protocols/gmp/requests/v224/test_policies.py index 70c289359..4f64bf196 100644 --- a/tests/protocols/gmp/requests/test_policies.py +++ b/tests/protocols/gmp/requests/v224/test_policies.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import InvalidArgument, RequiredArgument -from gvm.protocols.gmp.requests import Policies +from gvm.protocols.gmp.requests.v224 import Policies POLICY_XML_STRING = ( '' diff --git a/tests/protocols/gmp/requests/test_port_lists.py b/tests/protocols/gmp/requests/v224/test_port_lists.py similarity index 99% rename from tests/protocols/gmp/requests/test_port_lists.py rename to tests/protocols/gmp/requests/v224/test_port_lists.py index 7f2dfa1bf..f2b624d3b 100644 --- a/tests/protocols/gmp/requests/test_port_lists.py +++ b/tests/protocols/gmp/requests/v224/test_port_lists.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import InvalidArgument, RequiredArgument -from gvm.protocols.gmp.requests import PortLists, PortRangeType +from gvm.protocols.gmp.requests.v224 import PortLists, PortRangeType class PortListsTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_report_formats.py b/tests/protocols/gmp/requests/v224/test_report_formats.py similarity index 99% rename from tests/protocols/gmp/requests/test_report_formats.py rename to tests/protocols/gmp/requests/v224/test_report_formats.py index f11d7013b..83711821d 100644 --- a/tests/protocols/gmp/requests/test_report_formats.py +++ b/tests/protocols/gmp/requests/v224/test_report_formats.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import InvalidArgument, RequiredArgument -from gvm.protocols.gmp.requests import ReportFormats, ReportFormatType +from gvm.protocols.gmp.requests.v224 import ReportFormats, ReportFormatType class ReportFormatsTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_reports.py b/tests/protocols/gmp/requests/v224/test_reports.py similarity index 99% rename from tests/protocols/gmp/requests/test_reports.py rename to tests/protocols/gmp/requests/v224/test_reports.py index 79c1ea884..f165ecf38 100644 --- a/tests/protocols/gmp/requests/test_reports.py +++ b/tests/protocols/gmp/requests/v224/test_reports.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import RequiredArgument -from gvm.protocols.gmp.requests import Reports +from gvm.protocols.gmp.requests.v224 import Reports REPORT_XML_STRING = ( '' diff --git a/tests/protocols/gmp/requests/test_results.py b/tests/protocols/gmp/requests/v224/test_results.py similarity index 98% rename from tests/protocols/gmp/requests/test_results.py rename to tests/protocols/gmp/requests/v224/test_results.py index 79f0ece0d..93e19a5c7 100644 --- a/tests/protocols/gmp/requests/test_results.py +++ b/tests/protocols/gmp/requests/v224/test_results.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import RequiredArgument -from gvm.protocols.gmp.requests import Results +from gvm.protocols.gmp.requests.v224 import Results class ResultsTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_roles.py b/tests/protocols/gmp/requests/v224/test_roles.py similarity index 98% rename from tests/protocols/gmp/requests/test_roles.py rename to tests/protocols/gmp/requests/v224/test_roles.py index e6952a721..38d3a5fb6 100644 --- a/tests/protocols/gmp/requests/test_roles.py +++ b/tests/protocols/gmp/requests/v224/test_roles.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import RequiredArgument -from gvm.protocols.gmp.requests import Roles +from gvm.protocols.gmp.requests.v224 import Roles class RolesTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_scan_configs.py b/tests/protocols/gmp/requests/v224/test_scan_configs.py similarity index 99% rename from tests/protocols/gmp/requests/test_scan_configs.py rename to tests/protocols/gmp/requests/v224/test_scan_configs.py index 64908b04e..bae26edd3 100644 --- a/tests/protocols/gmp/requests/test_scan_configs.py +++ b/tests/protocols/gmp/requests/v224/test_scan_configs.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import InvalidArgument, InvalidArgumentType, RequiredArgument -from gvm.protocols.gmp.requests import ScanConfigs +from gvm.protocols.gmp.requests.v224 import ScanConfigs class ScanConfigsTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_scanners.py b/tests/protocols/gmp/requests/v224/test_scanners.py similarity index 99% rename from tests/protocols/gmp/requests/test_scanners.py rename to tests/protocols/gmp/requests/v224/test_scanners.py index bde496f4a..dc481a88e 100644 --- a/tests/protocols/gmp/requests/test_scanners.py +++ b/tests/protocols/gmp/requests/v224/test_scanners.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import InvalidArgument, RequiredArgument -from gvm.protocols.gmp.requests import Scanners, ScannerType +from gvm.protocols.gmp.requests.v224 import Scanners, ScannerType class ScannersTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_schedules.py b/tests/protocols/gmp/requests/v224/test_schedules.py similarity index 99% rename from tests/protocols/gmp/requests/test_schedules.py rename to tests/protocols/gmp/requests/v224/test_schedules.py index 499804e57..684be1b9d 100644 --- a/tests/protocols/gmp/requests/test_schedules.py +++ b/tests/protocols/gmp/requests/v224/test_schedules.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import RequiredArgument -from gvm.protocols.gmp.requests import Schedules +from gvm.protocols.gmp.requests.v224 import Schedules class SchedulesTestUnit(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_secinfo.py b/tests/protocols/gmp/requests/v224/test_secinfo.py similarity index 98% rename from tests/protocols/gmp/requests/test_secinfo.py rename to tests/protocols/gmp/requests/v224/test_secinfo.py index 7c72db8f3..f281d2556 100644 --- a/tests/protocols/gmp/requests/test_secinfo.py +++ b/tests/protocols/gmp/requests/v224/test_secinfo.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import InvalidArgument, RequiredArgument -from gvm.protocols.gmp.requests import SecInfo +from gvm.protocols.gmp.requests.v224 import SecInfo class SecInfoTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_system_report.py b/tests/protocols/gmp/requests/v224/test_system_report.py similarity index 97% rename from tests/protocols/gmp/requests/test_system_report.py rename to tests/protocols/gmp/requests/v224/test_system_report.py index d0906b37f..fe51ff177 100644 --- a/tests/protocols/gmp/requests/test_system_report.py +++ b/tests/protocols/gmp/requests/v224/test_system_report.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import InvalidArgument -from gvm.protocols.gmp.requests import SystemReports +from gvm.protocols.gmp.requests.v224 import SystemReports class SystemReportsTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_tags.py b/tests/protocols/gmp/requests/v224/test_tags.py similarity index 99% rename from tests/protocols/gmp/requests/test_tags.py rename to tests/protocols/gmp/requests/v224/test_tags.py index 30ecba23c..f21dd74d3 100644 --- a/tests/protocols/gmp/requests/test_tags.py +++ b/tests/protocols/gmp/requests/v224/test_tags.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import InvalidArgument, RequiredArgument -from gvm.protocols.gmp.requests import Tags +from gvm.protocols.gmp.requests.v224 import Tags class TagsTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_targets.py b/tests/protocols/gmp/requests/v224/test_targets.py similarity index 99% rename from tests/protocols/gmp/requests/test_targets.py rename to tests/protocols/gmp/requests/v224/test_targets.py index b976dff89..cbd193c24 100644 --- a/tests/protocols/gmp/requests/test_targets.py +++ b/tests/protocols/gmp/requests/v224/test_targets.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import InvalidArgument, RequiredArgument -from gvm.protocols.gmp.requests import AliveTest, Targets +from gvm.protocols.gmp.requests.v224 import AliveTest, Targets class TargetsTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_tasks.py b/tests/protocols/gmp/requests/v224/test_tasks.py similarity index 99% rename from tests/protocols/gmp/requests/test_tasks.py rename to tests/protocols/gmp/requests/v224/test_tasks.py index e381b2994..2e6194e18 100644 --- a/tests/protocols/gmp/requests/test_tasks.py +++ b/tests/protocols/gmp/requests/v224/test_tasks.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import InvalidArgument, RequiredArgument -from gvm.protocols.gmp.requests import HostsOrdering, Tasks +from gvm.protocols.gmp.requests.v224 import HostsOrdering, Tasks class TasksTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_tickets.py b/tests/protocols/gmp/requests/v224/test_tickets.py similarity index 99% rename from tests/protocols/gmp/requests/test_tickets.py rename to tests/protocols/gmp/requests/v224/test_tickets.py index 54c60900d..45bce5e99 100644 --- a/tests/protocols/gmp/requests/test_tickets.py +++ b/tests/protocols/gmp/requests/v224/test_tickets.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import InvalidArgument, RequiredArgument -from gvm.protocols.gmp.requests import Tickets, TicketStatus +from gvm.protocols.gmp.requests.v224 import Tickets, TicketStatus class TicketsTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_tls_certificates.py b/tests/protocols/gmp/requests/v224/test_tls_certificates.py similarity index 99% rename from tests/protocols/gmp/requests/test_tls_certificates.py rename to tests/protocols/gmp/requests/v224/test_tls_certificates.py index 7b5669c9a..33968fbdd 100644 --- a/tests/protocols/gmp/requests/test_tls_certificates.py +++ b/tests/protocols/gmp/requests/v224/test_tls_certificates.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import RequiredArgument -from gvm.protocols.gmp.requests import TLSCertificates +from gvm.protocols.gmp.requests.v224 import TLSCertificates class TLSCertificatesTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_trashcan.py b/tests/protocols/gmp/requests/v224/test_trashcan.py similarity index 92% rename from tests/protocols/gmp/requests/test_trashcan.py rename to tests/protocols/gmp/requests/v224/test_trashcan.py index ac1e3fbdf..90325f4f4 100644 --- a/tests/protocols/gmp/requests/test_trashcan.py +++ b/tests/protocols/gmp/requests/v224/test_trashcan.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import RequiredArgument -from gvm.protocols.gmp.requests import TrashCan +from gvm.protocols.gmp.requests.v224 import TrashCan class TrashCanTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_user_settings.py b/tests/protocols/gmp/requests/v224/test_user_settings.py similarity index 97% rename from tests/protocols/gmp/requests/test_user_settings.py rename to tests/protocols/gmp/requests/v224/test_user_settings.py index 849cfb4c9..77c41ac54 100644 --- a/tests/protocols/gmp/requests/test_user_settings.py +++ b/tests/protocols/gmp/requests/v224/test_user_settings.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import RequiredArgument -from gvm.protocols.gmp.requests import UserSettings +from gvm.protocols.gmp.requests.v224 import UserSettings class UserSettingsTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_users.py b/tests/protocols/gmp/requests/v224/test_users.py similarity index 99% rename from tests/protocols/gmp/requests/test_users.py rename to tests/protocols/gmp/requests/v224/test_users.py index 8ef69c53a..3182680fb 100644 --- a/tests/protocols/gmp/requests/test_users.py +++ b/tests/protocols/gmp/requests/v224/test_users.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import InvalidArgument, RequiredArgument -from gvm.protocols.gmp.requests import UserAuthType, Users +from gvm.protocols.gmp.requests.v224 import UserAuthType, Users class UsersTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/test_vulnerabilities.py b/tests/protocols/gmp/requests/v224/test_vulnerabilities.py similarity index 95% rename from tests/protocols/gmp/requests/test_vulnerabilities.py rename to tests/protocols/gmp/requests/v224/test_vulnerabilities.py index 029d05c25..de6dac9da 100644 --- a/tests/protocols/gmp/requests/test_vulnerabilities.py +++ b/tests/protocols/gmp/requests/v224/test_vulnerabilities.py @@ -5,7 +5,7 @@ import unittest from gvm.errors import RequiredArgument -from gvm.protocols.gmp.requests import Vulnerabilities +from gvm.protocols.gmp.requests.v224 import Vulnerabilities class VulnerabilitiesTestCase(unittest.TestCase): diff --git a/tests/protocols/gmp/requests/v225/__init__.py b/tests/protocols/gmp/requests/v225/__init__.py new file mode 100644 index 000000000..5197e3be9 --- /dev/null +++ b/tests/protocols/gmp/requests/v225/__init__.py @@ -0,0 +1,3 @@ +# SPDX-FileCopyrightText: 2024 Greenbone AG +# +# SPDX-License-Identifier: GPL-3.0-or-later diff --git a/tests/protocols/gmp/requests/test_resource_names.py b/tests/protocols/gmp/requests/v225/test_resource_names.py similarity index 99% rename from tests/protocols/gmp/requests/test_resource_names.py rename to tests/protocols/gmp/requests/v225/test_resource_names.py index 346151b47..0b325ea03 100644 --- a/tests/protocols/gmp/requests/test_resource_names.py +++ b/tests/protocols/gmp/requests/v225/test_resource_names.py @@ -6,7 +6,7 @@ from gvm.errors import InvalidArgument, RequiredArgument from gvm.protocols.core import Request -from gvm.protocols.gmp.requests import ResourceNames, ResourceType +from gvm.protocols.gmp.requests.v225 import ResourceNames, ResourceType class ResourceNamesTestCase(unittest.TestCase):