diff --git a/mkp/nvdct-0.8.10-20240614.mkp b/mkp/nvdct-0.8.10-20240614.mkp index a911c7671d476c4f76d631112aa2ed973257de0c..93de1810923af4058121300f1a55a98bf55eb7f1 100644 Binary files a/mkp/nvdct-0.8.10-20240614.mkp and b/mkp/nvdct-0.8.10-20240614.mkp differ diff --git a/source/bin/nvdct/lib/utils.py b/source/bin/nvdct/lib/utils.py index 0df0382d25a896b1fbf326bc748805dd6bb31790..a244981729fe1d189ba434508c48ecf7a80f4807 100755 --- a/source/bin/nvdct/lib/utils.py +++ b/source/bin/nvdct/lib/utils.py @@ -23,7 +23,7 @@ from time import time as now_time from tomllib import loads as toml_loads, TOMLDecodeError from typing import List, Dict, TextIO -NVDCT_VERSION = '0.8.10-20240614' +NVDCT_VERSION = '0.8.11-20240617' @unique diff --git a/source/bin/nvdct/nvdct.py b/source/bin/nvdct/nvdct.py index fa0512dadf18e3ce351ebdb34f61f3903ac6df1f..39c334ac9c543fe0f559e5454baf42b18cfc83fe 100755 --- a/source/bin/nvdct/nvdct.py +++ b/source/bin/nvdct/nvdct.py @@ -112,6 +112,7 @@ # 2024-06-09: moved topologiy helpers to lib/topologies.py # moved (default) config file(s) to ./conf/ # 2024-06-14: added debug code for bad IPv4 address data +# 2024-06-17: fixed bad IPv4 address data (just drop it) # creating topology data json from inventory data # @@ -541,24 +542,27 @@ def create_l3v4_topology( try: ipv4_info = Ipv4Info(**_entry) except TypeError as e: - LOGGER.exception(f'error in ipv4 address data: {e}') - LOGGER.debug(f'host with wrong data: {host}') - LOGGER.debug(f'IPv4 address data: {_entry}') - sys.exit() + LOGGER.warning(f'Drop IPv4 address data for host: {host}, data: {_entry}') + continue if ipv4_info.address.startswith('127.'): # drop loopback addresses + LOGGER.info(f'host: {host} dropped loopback address: {ipv4_info.address}') continue if ipv4_info.cidr == 32: # drop host addresses + LOGGER.info(f'host: {host} dropped host address: {ipv4_info.address}/{ipv4_info.cidr}') continue if ipv4_info.type.lower() != 'ipv4': # drop if not ipv4 + LOGGER.warning(f'host: {host} dropped non ipv4 address: {ipv4_info.address}, type: {ipv4_info.type}') continue if is_ignore_ipv4(ipv4_info.address, ignore_ips): + LOGGER.info(f'host: {host} dropped ignore address: {ipv4_info.address}') continue if is_ignore_wildcard(ipv4_info.address, ignore_wildcard): + LOGGER.info(f'host: {host} dropped wildcard address: {ipv4_info.address}') continue if network := get_network_summary( diff --git a/source/packages/nvdct b/source/packages/nvdct index ceb0811d2b7cbc4b43b4c0f244a408cf744bfe80..4811221eaa06723eceb86713f6dbf03dd19ef581 100644 --- a/source/packages/nvdct +++ b/source/packages/nvdct @@ -60,5 +60,5 @@ 'title': 'Network Visualization Data Creation Tool (NVDCT)', 'version': '0.8.10-20240614', 'version.min_required': '2.2.0b1', - 'version.packaged': '2.2.0p24', + 'version.packaged': 'cmk-mkp-tool 0.2.0', 'version.usable_until': '2.4.0p1'}