Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions gvm/protocols/gmp/_gmp226.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ def get_report(
filter_id: Optional[str] = None,
delta_report_id: Optional[EntityID] = None,
report_format_id: Optional[Union[str, ReportFormatType]] = None,
report_config_id: Optional[str] = None,
ignore_pagination: Optional[bool] = None,
details: Optional[bool] = True,
) -> T:
Expand All @@ -115,6 +116,7 @@ def get_report(
delta_report_id: UUID of an existing report to compare report to.
report_format_id: UUID of report format to use
or ReportFormatType (enum)
report_config_id: UUID of report format config to use
ignore_pagination: Whether to ignore the filter terms "first" and
"rows".
details: Request additional report information details
Expand All @@ -127,6 +129,7 @@ def get_report(
filter_id=filter_id,
delta_report_id=delta_report_id,
report_format_id=report_format_id,
report_config_id=report_config_id,
ignore_pagination=ignore_pagination,
details=details,
)
Expand Down
5 changes: 5 additions & 0 deletions gvm/protocols/gmp/requests/v226/_reports.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ def get_report(
filter_id: Optional[str] = None,
delta_report_id: Optional[EntityID] = None,
report_format_id: Optional[Union[str, ReportFormatType]] = None,
report_config_id: Optional[str] = None,
ignore_pagination: Optional[bool] = None,
details: Optional[bool] = True,
) -> Request:
Expand All @@ -53,6 +54,7 @@ def get_report(
delta_report_id: UUID of an existing report to compare report to.
report_format_id: UUID of report format to use
or ReportFormatType (enum)
report_config_id: UUID of report format config to use
ignore_pagination: Whether to ignore the filter terms "first" and
"rows".
details: Request additional report information details
Expand All @@ -76,6 +78,9 @@ def get_report(
if report_format_id:
cmd.set_attribute("format_id", str(report_format_id))

if report_config_id:
cmd.set_attribute("config_id", str(report_config_id))

if ignore_pagination is not None:
cmd.set_attribute("ignore_pagination", to_bool(ignore_pagination))

Expand Down
11 changes: 11 additions & 0 deletions tests/protocols/gmp/requests/v226/test_reports.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,17 @@ def test_get_report_with_report_format_id(self):
b'<get_reports report_id="report_id" usage_type="scan" format_id="report_format_id" details="1"/>',
)

def test_get_report_with_report_format_id_and_config_id(self):
request = Reports.get_report(
"report_id",
report_format_id="report_format_id",
report_config_id="report_config_id",
)
self.assertEqual(
bytes(request),
b'<get_reports report_id="report_id" usage_type="scan" format_id="report_format_id" config_id="report_config_id" details="1"/>',
)

def test_get_report_with_ignore_pagination(self):
request = Reports.get_report("report_id", ignore_pagination=True)
self.assertEqual(
Expand Down
9 changes: 9 additions & 0 deletions tests/protocols/gmpv226/entities/reports/test_get_report.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ def test_get_report_with_report_format_id(self):
b'<get_reports report_id="r1" usage_type="scan" format_id="bar" details="1"/>'
)

def test_get_report_with_report_format_id_and_config_id(self):
self.gmp.get_report(
report_id="r1", report_format_id="bar", report_config_id="c1"
)

self.connection.send.has_been_called_with(
b'<get_reports report_id="r1" usage_type="scan" format_id="bar" config_id="c1" details="1"/>'
)

def test_get_report_with_report_format_type(self):
self.gmp.get_report(
report_id="r1", report_format_id=ReportFormatType.TXT
Expand Down
Loading