Skip to content

Commit 7a47d4e

Browse files
committed
change: rename vuns to vulnerabilities for clarity
1 parent 18cc96b commit 7a47d4e

5 files changed

Lines changed: 25 additions & 18 deletions

File tree

gvm/protocols/gmp/_gmpnext.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
ReportOperatingSystems,
2828
ReportPorts,
2929
ReportTlsCertificates,
30-
ReportVulns,
30+
ReportVulnerabilities,
3131
Tasks,
3232
)
3333
from .requests.v224 import HostsOrdering
@@ -1236,7 +1236,7 @@ def get_report_errors(
12361236
)
12371237
)
12381238

1239-
def get_report_vulns(
1239+
def get_report_vulnerabilities(
12401240
self,
12411241
report_id: EntityID,
12421242
*,
@@ -1257,7 +1257,7 @@ def get_report_vulns(
12571257
Defaults to True.
12581258
"""
12591259
return self._send_request_and_transform_response(
1260-
ReportVulns.get_report_vulns(
1260+
ReportVulnerabilities.get_report_vulnerabilities(
12611261
report_id=report_id,
12621262
filter_string=filter_string,
12631263
filter_id=filter_id,

gvm/protocols/gmp/requests/next/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
from gvm.protocols.gmp.requests.next._report_tls_certificates import (
3939
ReportTlsCertificates,
4040
)
41-
from gvm.protocols.gmp.requests.next._report_vulns import (
42-
ReportVulns,
41+
from gvm.protocols.gmp.requests.next._report_vulnerabilities import (
42+
ReportVulnerabilities,
4343
)
4444
from gvm.protocols.gmp.requests.next._tasks import Tasks
4545

@@ -171,7 +171,7 @@
171171
"ReportOperatingSystems",
172172
"ReportPorts",
173173
"ReportTlsCertificates",
174-
"ReportVulns",
174+
"ReportVulnerabilities",
175175
"Reports",
176176
"ResourceNames",
177177
"ResourceType",

gvm/protocols/gmp/requests/next/_report_vulns.py renamed to gvm/protocols/gmp/requests/next/_report_vulnerabilities.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
from gvm.xml import XmlCommand
66

77

8-
class ReportVulns:
8+
class ReportVulnerabilities:
99
@classmethod
10-
def get_report_vulns(
10+
def get_report_vulnerabilities(
1111
cls,
1212
report_id: EntityID,
1313
*,
@@ -31,7 +31,8 @@ def get_report_vulns(
3131

3232
if not report_id:
3333
raise RequiredArgument(
34-
function=cls.get_report_vulns.__name__, argument="report_id"
34+
function=cls.get_report_vulnerabilities.__name__,
35+
argument="report_id",
3536
)
3637

3738
cmd.set_attribute("report_id", str(report_id))

tests/protocols/gmpnext/entities/report_vulns/test_get_report_vulns.py renamed to tests/protocols/gmpnext/entities/report_vulnerabilities/test_get_report_vulnerabilities.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,46 +9,52 @@
99
class GmpGetReportVulnsTestMixin:
1010
def test_get_report_vulns_without_id(self):
1111
with self.assertRaises(RequiredArgument):
12-
self.gmp.get_report_vulns(None)
12+
self.gmp.get_report_vulnerabilities(None)
1313

1414
with self.assertRaises(RequiredArgument):
15-
self.gmp.get_report_vulns("")
15+
self.gmp.get_report_vulnerabilities("")
1616

1717
def test_get_report_vulns_with_filter_string(self):
18-
self.gmp.get_report_vulns(report_id="r1", filter_string="name=foo")
18+
self.gmp.get_report_vulnerabilities(
19+
report_id="r1", filter_string="name=foo"
20+
)
1921

2022
self.connection.send.has_been_called_with(
2123
b'<get_report_vulns report_id="r1" filter="name=foo" details="1"/>'
2224
)
2325

2426
def test_get_report_vulns_with_filter_id(self):
25-
self.gmp.get_report_vulns(report_id="r1", filter_id="f1")
27+
self.gmp.get_report_vulnerabilities(report_id="r1", filter_id="f1")
2628

2729
self.connection.send.has_been_called_with(
2830
b'<get_report_vulns report_id="r1" filt_id="f1" details="1"/>'
2931
)
3032

3133
def test_get_report_vulns_with_ignore_pagination(self):
32-
self.gmp.get_report_vulns(report_id="r1", ignore_pagination=True)
34+
self.gmp.get_report_vulnerabilities(
35+
report_id="r1", ignore_pagination=True
36+
)
3337

3438
self.connection.send.has_been_called_with(
3539
b'<get_report_vulns report_id="r1" ignore_pagination="1" details="1"/>'
3640
)
3741

38-
self.gmp.get_report_vulns(report_id="r1", ignore_pagination=False)
42+
self.gmp.get_report_vulnerabilities(
43+
report_id="r1", ignore_pagination=False
44+
)
3945

4046
self.connection.send.has_been_called_with(
4147
b'<get_report_vulns report_id="r1" ignore_pagination="0" details="1"/>'
4248
)
4349

4450
def test_get_report_vulns_with_details(self):
45-
self.gmp.get_report_vulns(report_id="r1", details=True)
51+
self.gmp.get_report_vulnerabilities(report_id="r1", details=True)
4652

4753
self.connection.send.has_been_called_with(
4854
b'<get_report_vulns report_id="r1" details="1"/>'
4955
)
5056

51-
self.gmp.get_report_vulns(report_id="r1", details=False)
57+
self.gmp.get_report_vulnerabilities(report_id="r1", details=False)
5258

5359
self.connection.send.has_been_called_with(
5460
b'<get_report_vulns report_id="r1" details="0"/>'

tests/protocols/gmpnext/entities/test_report_vulns.py renamed to tests/protocols/gmpnext/entities/test_report_vulnerabilities.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55

66
from ...gmpnext import GMPTestCase
7-
from .report_vulns.test_get_report_vulns import (
7+
from .report_vulnerabilities.test_get_report_vulnerabilities import (
88
GmpGetReportVulnsTestMixin,
99
)
1010

0 commit comments

Comments
 (0)