This repository has been archived by the owner on Nov 29, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 36
Show progress as int #269
Merged
Merged
Show progress as int #269
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
14d6580
Show progress as int
jjnicola f369c01
Add test
jjnicola f798495
Update changelog
jjnicola b224ac3
Remove wrapper and access scan_collection method directly
jjnicola 12e8062
Store progress information as integer instead of float
jjnicola 562300f
Adjust tests
jjnicola File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -140,6 +140,7 @@ def set_host_progress( | |
self, scan_id: str, host_progress_batch: Dict[str, int] | ||
) -> None: | ||
""" Sets scan_id scan's progress. """ | ||
|
||
host_progresses = self.scans_table[scan_id].get('target_progress') | ||
host_progresses.update(host_progress_batch) | ||
|
||
|
@@ -274,7 +275,12 @@ def get_count_alive(self, scan_id: str) -> int: | |
def get_current_target_progress(self, scan_id: str) -> Dict[str, int]: | ||
""" Get a scan's current dead host count. """ | ||
|
||
return self.scans_table[scan_id]['target_progress'] | ||
hosts = self.scans_table[scan_id]['target_progress'] | ||
if hosts: | ||
for host, progress in hosts.items(): | ||
hosts[host] = int(progress) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Shouldn't we ensure that progress is already an int in the scans table? |
||
|
||
return hosts | ||
|
||
def simplify_exclude_host_count(self, scan_id: str) -> int: | ||
""" Remove from exclude_hosts the received hosts in the finished_hosts | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why should be a float still allowed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This comes from the wrapper. It depends on the wrapper implementation. Currently ospd-openvas sends a float value
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we fix that?