Skip to content

Commit f5ef767

Browse files
authored
Change: Rename GMP 21.10 to GMP 22.04 [#691]
Rename GMP 21.10 to GMP 22.04
2 parents 5839aaf + 3621bfc commit f5ef767

89 files changed

Lines changed: 382 additions & 408 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

gvm/protocols/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
Package for supported Greenbone Protocol versions.
2020
2121
Currently `GMP version 20.08`_, `GMP version 21.04`_
22-
and `OSP version 1`_ are supported.
22+
`GMP version 22.04` and `OSP version 1`_ are supported.
2323
2424
.. _GMP version 20.08:
2525
https://docs.greenbone.net/API/GMP/gmp-20.08.html
2626
.. _GMP version 21.04:
2727
https://docs.greenbone.net/API/GMP/gmp-21.04.html
28-
.. _GMP version 21.10:
29-
https://docs.greenbone.net/API/GMP/gmp-21.10.html
28+
.. _GMP version 22.04:
29+
https://docs.greenbone.net/API/GMP/gmp-22.04.html
3030
.. _OSP version 1:
3131
https://docs.greenbone.net/API/OSP/osp-1.2.html
3232
"""

gvm/protocols/gmp.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,15 @@
2828

2929
from gvm.protocols.gmpv208 import Gmp as Gmpv208
3030
from gvm.protocols.gmpv214 import Gmp as Gmpv214
31-
from gvm.protocols.gmpv2110 import Gmp as Gmpv2110
31+
from gvm.protocols.gmpv224 import Gmp as Gmpv224
3232

3333
from gvm.transforms import EtreeCheckCommandTransform
3434

3535
from gvm.xml import XmlCommand
3636

37-
SUPPORTED_GMP_VERSIONS = Union[Gmpv208, Gmpv214] # pylint: disable=invalid-name
37+
SUPPORTED_GMP_VERSIONS = Union[ # pylint: disable=invalid-name
38+
Gmpv208, Gmpv214, Gmpv224
39+
]
3840

3941

4042
class Gmp(GvmProtocol):
@@ -104,8 +106,8 @@ def determine_supported_gmp(self) -> SUPPORTED_GMP_VERSIONS:
104106
gmp_class = Gmpv208
105107
elif major_version == 21 and minor_version == 4:
106108
gmp_class = Gmpv214
107-
elif major_version == 21 and minor_version == 10:
108-
gmp_class = Gmpv2110
109+
elif major_version == 22 and minor_version == 4:
110+
gmp_class = Gmpv224
109111
else:
110112
raise GvmError(
111113
'Remote manager daemon uses an unsupported version of GMP. '
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
"""
2222
Module for communication with gvmd in
23-
`Greenbone Management Protocol version 21.10`_
23+
`Greenbone Management Protocol version 22.04`_
2424
25-
.. _Greenbone Management Protocol version 21.10:
26-
https://docs.greenbone.net/API/GMP/gmp-21.10.html
25+
.. _Greenbone Management Protocol version 22.04:
26+
https://docs.greenbone.net/API/GMP/gmp-22.04.html
2727
"""
2828

2929
import logging
@@ -128,10 +128,10 @@
128128
TargetsMixin,
129129
)
130130

131-
# NEW IN 2110
132-
from gvm.protocols.gmpv2110.entities.users import UsersMixin
131+
# NEW IN 224
132+
from gvm.protocols.gmpv224.entities.users import UsersMixin
133133

134-
from gvm.protocols.gmpv2110.system.version import VersionMixin
134+
from gvm.protocols.gmpv224.system.version import VersionMixin
135135

136136
from gvm.connections import GvmConnection
137137

@@ -204,7 +204,7 @@ class Gmp(
204204
):
205205
"""Python interface for Greenbone Management Protocol
206206
207-
This class implements the `Greenbone Management Protocol version 21.10`_
207+
This class implements the `Greenbone Management Protocol version 22.04`_
208208
209209
Arguments:
210210
connection: Connection to use to talk with the gvmd daemon. See
@@ -216,8 +216,8 @@ class Gmp(
216216
217217
See :mod:`gvm.transforms` for existing transforms.
218218
219-
.. _Greenbone Management Protocol version 21.10:
220-
https://docs.greenbone.net/API/GMP/gmp-21.10.html
219+
.. _Greenbone Management Protocol version 22.04:
220+
https://docs.greenbone.net/API/GMP/gmp-22.04.html
221221
.. _callable:
222222
https://docs.python.org/3/library/functions.html#callable
223223
"""
File renamed without changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
VersionMixin as Gmp208VersionMixin,
2222
)
2323

24-
PROTOCOL_VERSION = (21, 10)
24+
PROTOCOL_VERSION = (22, 4)
2525

2626

2727
class VersionMixin(Gmp208VersionMixin):

gvm/protocols/next.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
:py:mod:`gvm.protocols`.
2828
2929
Exports:
30-
- :py:class:`gvm.protocols.gmpv2110.Gmp`
30+
- :py:class:`gvm.protocols.gmpv224.Gmp`
3131
- :py:class:`gvm.protocols.ospv1.Osp`
3232
3333
.. _Greenbone Management Protocol:
3434
https://docs.greenbone.net/API/GMP/gmp.html
3535
"""
3636

37-
from .gmpv2110 import (
37+
from .gmpv224 import (
3838
Gmp,
3939
AggregateStatistic,
4040
AlertCondition,
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818

1919

20-
from gvm.protocols.gmpv2110 import Gmp
20+
from gvm.protocols.gmpv224 import Gmp
2121

2222
from .. import GmpTestCase
2323

2424

25-
class Gmpv2110TestCase(GmpTestCase):
25+
class Gmpv224TestCase(GmpTestCase):
2626

2727
gmp_class = Gmp
File renamed without changes.

0 commit comments

Comments
 (0)