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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ and this project adheres to [Calendar Versioning](https://calver.org)html).
## [Unreleased]
### Added
### Changed
* Changed API calls for SecInfo [#501](https://github.com/greenbone/python-gvm/pull/501):
* `get_nvt_list()` -> `get_nvts()`
* `get_cpe_list()` -> `get_cpes()`
* `get_cve_list()` -> `get_cves()`
* `get_cert_bund_advisory_list()` -> `get_cert_bund_advisories()`
* `get_dnf_cert_advisory_list()` -> `get_dnf_cert_advisories()`
* `get_oval_definition_list()` -> `get_oval_definitions()`

### Deprecated
### Removed
### Fixed
Expand Down
12 changes: 6 additions & 6 deletions gvm/protocols/gmpv208/entities/secinfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ def get_scan_config_nvt(self, nvt_oid: str):
cmd.set_attribute("preference_count", "1")
return self._send_xml_command(cmd)

def get_cve_list(
def get_cves(
self,
*,
filter_string: Optional[str] = None,
Expand Down Expand Up @@ -182,7 +182,7 @@ def get_cve_list(
details=details,
)

def get_cpe_list(
def get_cpes(
self,
*,
filter_string: Optional[str] = None,
Expand Down Expand Up @@ -211,7 +211,7 @@ def get_cpe_list(
details=details,
)

def get_nvt_list(
def get_nvts(
self,
*,
filter_string: Optional[str] = None,
Expand Down Expand Up @@ -240,7 +240,7 @@ def get_nvt_list(
details=details,
)

def get_dfn_cert_advisory_list(
def get_dfn_cert_advisories(
self,
*,
filter_string: Optional[str] = None,
Expand Down Expand Up @@ -269,7 +269,7 @@ def get_dfn_cert_advisory_list(
details=details,
)

def get_cert_bund_advisory_list(
def get_cert_bund_advisories(
self,
*,
filter_string: Optional[str] = None,
Expand Down Expand Up @@ -298,7 +298,7 @@ def get_cert_bund_advisory_list(
details=details,
)

def get_oval_definition_list(
def get_oval_definitions(
self,
*,
filter_string: Optional[str] = None,
Expand Down
12 changes: 6 additions & 6 deletions tests/protocols/gmpv208/entities/secinfo/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.

from .test_get_cert_bund_advisory import GmpGetCertBundTestMixin
from .test_get_cert_bund_advisory_list import GmpGetCertBundListTestMixin
from .test_get_cert_bund_advisories import GmpGetCertBundListTestMixin
from .test_get_cpe import GmpGetCpeTestMixin
from .test_get_cpe_list import GmpGetCpeListTestMixin
from .test_get_cpes import GmpGetCpeListTestMixin
from .test_get_cve import GmpGetCveTestMixin
from .test_get_cve_list import GmpGetCveListTestMixin
from .test_get_cves import GmpGetCveListTestMixin
from .test_get_dfn_cert_advisory import GmpGetDfnCertTestMixin
from .test_get_dfn_cert_advisory_list import GmpGetDfnCertListTestMixin
from .test_get_dfn_cert_advisories import GmpGetDfnCertListTestMixin
from .test_get_info import GmpGetInfoTestMixin
from .test_get_info_list import GmpGetInfoListTestMixin
from .test_get_nvt import GmpGetNvtTestMixin
from .test_get_nvt_families import GmpGetNvtFamiliesTestMixin
from .test_get_nvt_list import GmpGetNvtListTestMixin
from .test_get_nvts import GmpGetNvtListTestMixin
from .test_get_nvt_preference import GmpGetNvtPreferenceTestMixin
from .test_get_nvt_preferences import GmpGetNvtPreferencesTestMixin
from .test_get_oval_definition import GmpGetOvalDefTestMixin
from .test_get_oval_definition_list import GmpGetOvalDefListTestMixin
from .test_get_oval_definitions import GmpGetOvalDefListTestMixin
from .test_get_scan_config_nvt import GmpGetScanConfigNvtTestMixin
from .test_get_scan_config_nvts import GmpGetScanConfigNvtsTestMixin
Original file line number Diff line number Diff line change
Expand Up @@ -18,42 +18,42 @@


class GmpGetCertBundListTestMixin:
def test_get_cpe_list(self):
self.gmp.get_cert_bund_advisory_list()
def test_get_cpes(self):
self.gmp.get_cert_bund_advisories()

self.connection.send.has_been_called_with(
'<get_info type="CERT_BUND_ADV"/>'
)

def test_get_cve_list_with_filter_string(self):
self.gmp.get_cert_bund_advisory_list(filter_string='foo=bar')
def test_get_cves_with_filter_string(self):
self.gmp.get_cert_bund_advisories(filter_string='foo=bar')

self.connection.send.has_been_called_with(
'<get_info type="CERT_BUND_ADV" filter="foo=bar"/>'
)

def test_get_cve_list_with_filter_id(self):
self.gmp.get_cert_bund_advisory_list(filter_id='f1')
def test_get_cves_with_filter_id(self):
self.gmp.get_cert_bund_advisories(filter_id='f1')

self.connection.send.has_been_called_with(
'<get_info type="CERT_BUND_ADV" filt_id="f1"/>'
)

def test_get_cve_list_with_name(self):
self.gmp.get_cert_bund_advisory_list(name='foo')
def test_get_cves_with_name(self):
self.gmp.get_cert_bund_advisories(name='foo')

self.connection.send.has_been_called_with(
'<get_info type="CERT_BUND_ADV" name="foo"/>'
)

def test_get_cve_list_with_details(self):
self.gmp.get_cert_bund_advisory_list(details=True)
def test_get_cves_with_details(self):
self.gmp.get_cert_bund_advisories(details=True)

self.connection.send.has_been_called_with(
'<get_info type="CERT_BUND_ADV" details="1"/>'
)

self.gmp.get_cert_bund_advisory_list(details=False)
self.gmp.get_cert_bund_advisories(details=False)

self.connection.send.has_been_called_with(
'<get_info type="CERT_BUND_ADV" details="0"/>'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,40 +18,40 @@


class GmpGetCpeListTestMixin:
def test_get_cpe_list(self):
self.gmp.get_cpe_list()
def test_get_cpes(self):
self.gmp.get_cpes()

self.connection.send.has_been_called_with('<get_info type="CPE"/>')

def test_get_cpe_list_with_filter_string(self):
self.gmp.get_cpe_list(filter_string='foo=bar')
def test_get_cpes_with_filter_string(self):
self.gmp.get_cpes(filter_string='foo=bar')

self.connection.send.has_been_called_with(
'<get_info type="CPE" filter="foo=bar"/>'
)

def test_get_cpe_list_with_filter_id(self):
self.gmp.get_cpe_list(filter_id='f1')
def test_get_cpes_with_filter_id(self):
self.gmp.get_cpes(filter_id='f1')

self.connection.send.has_been_called_with(
'<get_info type="CPE" filt_id="f1"/>'
)

def test_get_cpe_list_with_name(self):
self.gmp.get_cpe_list(name='foo')
def test_get_cpes_with_name(self):
self.gmp.get_cpes(name='foo')

self.connection.send.has_been_called_with(
'<get_info type="CPE" name="foo"/>'
)

def test_get_cpe_list_with_details(self):
self.gmp.get_cpe_list(details=True)
def test_get_cpes_with_details(self):
self.gmp.get_cpes(details=True)

self.connection.send.has_been_called_with(
'<get_info type="CPE" details="1"/>'
)

self.gmp.get_cpe_list(details=False)
self.gmp.get_cpes(details=False)

self.connection.send.has_been_called_with(
'<get_info type="CPE" details="0"/>'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,40 +18,40 @@


class GmpGetCveListTestMixin:
def test_get_cpe_list(self):
self.gmp.get_cve_list()
def test_get_cpes(self):
self.gmp.get_cves()

self.connection.send.has_been_called_with('<get_info type="CVE"/>')

def test_get_cve_list_with_filter_string(self):
self.gmp.get_cve_list(filter_string='foo=bar')
def test_get_cves_with_filter_string(self):
self.gmp.get_cves(filter_string='foo=bar')

self.connection.send.has_been_called_with(
'<get_info type="CVE" filter="foo=bar"/>'
)

def test_get_cve_list_with_filter_id(self):
self.gmp.get_cve_list(filter_id='f1')
def test_get_cves_with_filter_id(self):
self.gmp.get_cves(filter_id='f1')

self.connection.send.has_been_called_with(
'<get_info type="CVE" filt_id="f1"/>'
)

def test_get_cve_list_with_name(self):
self.gmp.get_cve_list(name='foo')
def test_get_cves_with_name(self):
self.gmp.get_cves(name='foo')

self.connection.send.has_been_called_with(
'<get_info type="CVE" name="foo"/>'
)

def test_get_cve_list_with_details(self):
self.gmp.get_cve_list(details=True)
def test_get_cves_with_details(self):
self.gmp.get_cves(details=True)

self.connection.send.has_been_called_with(
'<get_info type="CVE" details="1"/>'
)

self.gmp.get_cve_list(details=False)
self.gmp.get_cves(details=False)

self.connection.send.has_been_called_with(
'<get_info type="CVE" details="0"/>'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,42 +18,42 @@


class GmpGetDfnCertListTestMixin:
def test_get_cpe_list(self):
self.gmp.get_dfn_cert_advisory_list()
def test_get_cpes(self):
self.gmp.get_dfn_cert_advisories()

self.connection.send.has_been_called_with(
'<get_info type="DFN_CERT_ADV"/>'
)

def test_get_cve_list_with_filter_string(self):
self.gmp.get_dfn_cert_advisory_list(filter_string='foo=bar')
def test_get_cves_with_filter_string(self):
self.gmp.get_dfn_cert_advisories(filter_string='foo=bar')

self.connection.send.has_been_called_with(
'<get_info type="DFN_CERT_ADV" filter="foo=bar"/>'
)

def test_get_cve_list_with_filter_id(self):
self.gmp.get_dfn_cert_advisory_list(filter_id='f1')
def test_get_cves_with_filter_id(self):
self.gmp.get_dfn_cert_advisories(filter_id='f1')

self.connection.send.has_been_called_with(
'<get_info type="DFN_CERT_ADV" filt_id="f1"/>'
)

def test_get_cve_list_with_name(self):
self.gmp.get_dfn_cert_advisory_list(name='foo')
def test_get_cves_with_name(self):
self.gmp.get_dfn_cert_advisories(name='foo')

self.connection.send.has_been_called_with(
'<get_info type="DFN_CERT_ADV" name="foo"/>'
)

def test_get_cve_list_with_details(self):
self.gmp.get_dfn_cert_advisory_list(details=True)
def test_get_cves_with_details(self):
self.gmp.get_dfn_cert_advisories(details=True)

self.connection.send.has_been_called_with(
'<get_info type="DFN_CERT_ADV" details="1"/>'
)

self.gmp.get_dfn_cert_advisory_list(details=False)
self.gmp.get_dfn_cert_advisories(details=False)

self.connection.send.has_been_called_with(
'<get_info type="DFN_CERT_ADV" details="0"/>'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,40 +18,40 @@


class GmpGetNvtListTestMixin:
def test_get_cpe_list(self):
self.gmp.get_nvt_list()
def test_get_cpes(self):
self.gmp.get_nvts()

self.connection.send.has_been_called_with('<get_info type="NVT"/>')

def test_get_nvt_list_with_filter_string(self):
self.gmp.get_nvt_list(filter_string='foo=bar')
def test_get_nvts_with_filter_string(self):
self.gmp.get_nvts(filter_string='foo=bar')

self.connection.send.has_been_called_with(
'<get_info type="NVT" filter="foo=bar"/>'
)

def test_get_nvt_list_with_filter_id(self):
self.gmp.get_nvt_list(filter_id='f1')
def test_get_nvts_with_filter_id(self):
self.gmp.get_nvts(filter_id='f1')

self.connection.send.has_been_called_with(
'<get_info type="NVT" filt_id="f1"/>'
)

def test_get_nvt_list_with_name(self):
self.gmp.get_nvt_list(name='foo')
def test_get_nvts_with_name(self):
self.gmp.get_nvts(name='foo')

self.connection.send.has_been_called_with(
'<get_info type="NVT" name="foo"/>'
)

def test_get_nvt_list_with_details(self):
self.gmp.get_nvt_list(details=True)
def test_get_nvts_with_details(self):
self.gmp.get_nvts(details=True)

self.connection.send.has_been_called_with(
'<get_info type="NVT" details="1"/>'
)

self.gmp.get_nvt_list(details=False)
self.gmp.get_nvts(details=False)

self.connection.send.has_been_called_with(
'<get_info type="NVT" details="0"/>'
Expand Down
Loading