diff --git a/docs/admin/release_notes/version_4.3.md b/docs/admin/release_notes/version_4.3.md new file mode 100644 index 0000000000..756122b35a --- /dev/null +++ b/docs/admin/release_notes/version_4.3.md @@ -0,0 +1,20 @@ +## What's Changed + +* Template additions and fixes by @tom0010 in https://github.com/networktocode/ntc-templates/pull/1610 +* Added support for Cisco NVFIS by @SaschaSchwarzKyndryl in https://github.com/networktocode/ntc-templates/pull/1609 +* New template: cisco_xr_show_lldp_neighbors_detail by @lamiskin in https://github.com/networktocode/ntc-templates/pull/1602 +* New template: cisco_xr_show_inventory by @lamiskin in https://github.com/networktocode/ntc-templates/pull/1600 +* New template: cisco_xr_dir by @lamiskin in https://github.com/networktocode/ntc-templates/pull/1599 +* New Template: cisco_nxos_show_vrf_detail by @lamiskin in https://github.com/networktocode/ntc-templates/pull/1598 +* New Template: cisco_nxos_dir by @lamiskin in https://github.com/networktocode/ntc-templates/pull/1597 +* New Template: cisco_ios_show_authentication_sessions_method_details by @lamiskin in https://github.com/networktocode/ntc-templates/pull/1596 +* New Template: cisco_asa_show_module by @lamiskin in https://github.com/networktocode/ntc-templates/pull/1595 +* Fix issue #1577 so junos logical interface link status and mtu are captured by @mjbear in https://github.com/networktocode/ntc-templates/pull/1593 +* Added Support for Checkpoint VSX by @SaschaSchwarzKyndryl in https://github.com/networktocode/ntc-templates/pull/1592 +* MikroTik RouterOS '/interface print terse without-paging' fix by @PavloSkliarenko in https://github.com/networktocode/ntc-templates/pull/1588 +* Update to fortinet_get_system_status template. by @zickster in https://github.com/networktocode/ntc-templates/pull/1554 + +## New Contributors +* @zickster made their first contribution in https://github.com/networktocode/ntc-templates/pull/1554 + +**Full Changelog**: https://github.com/networktocode/ntc-templates/compare/v4.2.0...v4.3.0 \ No newline at end of file diff --git a/mkdocs.yml b/mkdocs.yml index 4e00249934..7b1329ceb2 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -120,6 +120,13 @@ nav: - v3.0: "admin/release_notes/version_3.0.md" - v3.1: "admin/release_notes/version_3.1.md" - v3.2: "admin/release_notes/version_3.2.md" + - v3.3: "admin/release_notes/version_3.3.md" + - v3.4: "admin/release_notes/version_3.4.md" + - v3.5: "admin/release_notes/version_3.5.md" + - v4.0: "admin/release_notes/version_4.0.md" + - v4.1: "admin/release_notes/version_4.1.md" + - v4.2: "admin/release_notes/version_4.2.md" + - v4.3: "admin/release_notes/version_4.3.md" - Developer Guide: - Extending the Library: "dev/extending.md" - Contributing to the Library: "dev/contributing.md" diff --git a/ntc_templates/templates/fortinet_get_system_status.textfsm b/ntc_templates/templates/fortinet_get_system_status.textfsm index 42ec153d3e..750e9cdf35 100644 --- a/ntc_templates/templates/fortinet_get_system_status.textfsm +++ b/ntc_templates/templates/fortinet_get_system_status.textfsm @@ -34,7 +34,7 @@ Value IPS_ENGINE (.*) Value BOTNET_DB (.*) Value BIOS_VERSION (\S+) Value SYSTEM_PART_NUMBER (\S+) -Value LOG_HARD_DISK (\S+) +Value LOG_HARD_DISK (.*) Value PRIVATE_ENCRYPTION (\S+) Value OPERATION_MODE (\S+) Value CURRENT_VIRTUAL_DOMAIN (\S+) diff --git a/pyproject.toml b/pyproject.toml index b07ef23c0d..43507e0d2d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "ntc_templates" -version = "4.0.1" +version = "4.3.0" description = "TextFSM Templates for Network Devices, and Python wrapper for TextFSM's CliTable." authors = ["Network to Code "] license = "Apache-2.0" @@ -78,11 +78,11 @@ exclude = ''' ''' [tool.pylint.master] -ignore=".venv" +ignore = ".venv" [tool.pylint.basic] # No docstrings required for private methods (Pylint default), or for test_ functions, or for inner Meta classes. -no-docstring-rgx="^(_|test_|Meta$)" +no-docstring-rgx = "^(_|test_|Meta$)" [tool.pylint.messages_control] # Line length is enforced by Black, so pylint doesn't need to check it. @@ -116,7 +116,5 @@ requires = ["poetry_core>=1.0.0"] build-backend = "poetry.core.masonry.api" [tool.pytest.ini_options] -testpaths = [ - "tests" -] +testpaths = ["tests"] addopts = "-vv --doctest-modules" diff --git a/tests/fortinet/get_system_status/fortinet_get_system_status.yml b/tests/fortinet/get_system_status/fortinet_get_system_status.yml index 12c4670ebb..0dae46c61b 100644 --- a/tests/fortinet/get_system_status/fortinet_get_system_status.yml +++ b/tests/fortinet/get_system_status/fortinet_get_system_status.yml @@ -32,3 +32,10 @@ parsed_sample: system_time: "Fri Jan 10 23:10:02 2020" av_ai_ml_model: "" last_reboot_reason: "" + ot_patch_db: "" + fmwp_db: "" + securitylevel: "" + ot_detect_db: "" + iot_detect: "" + ot_threat_db: "" + ips_engine: "" diff --git a/tests/fortinet/get_system_status/fortinet_get_system_status_6.2.yml b/tests/fortinet/get_system_status/fortinet_get_system_status_6.2.yml index 86986f17e3..94b3faab41 100644 --- a/tests/fortinet/get_system_status/fortinet_get_system_status_6.2.yml +++ b/tests/fortinet/get_system_status/fortinet_get_system_status_6.2.yml @@ -1,34 +1,41 @@ --- parsed_sample: - - hostname: "fgt-600e" - version: "FortiGate-600E v6.2.6,build1175,201110 (GA)" - signature: "certified" - virus_db: "83.00146(2021-01-08 11:20)" + - app_db: "16.00992(2021-01-06 02:37)" + av_ai_ml_model: "" + bios_version: "05000006" + botnet_db: "1.00000(2012-05-28 22:51)" + branch_point: "1175" + cluster_state_change_time: "2020-12-02 22:40:46" + cluster_uptime: "36 days, 21 hours, 42 minutes, 22 seconds" + current_ha_mode: "a-p, master" + current_virtual_domain: "root" extended_db: "83.00146(2021-01-08 11:20)" extreme_db: "1.00000(2018-04-09 18:07)" + fips_cc_mode: "disable" + fmwp_db: "" + fortios_x86_64: "Yes" + hostname: "fgt-600e" + industrial_db: "6.00741(2015-12-01 02:30)" + iot_detect: "" ips_db: "6.00741(2015-12-01 02:30)" + ips_engine: "" ips_etdb: "16.00993(2021-01-07 00:45)" - app_db: "16.00992(2021-01-06 02:37)" - industrial_db: "6.00741(2015-12-01 02:30)" - serial_number: "FG6H0Exxxxxxxxx" ips_malicious_url_database: "2.00883(2021-01-08 06:19)" - botnet_db: "1.00000(2012-05-28 22:51)" - bios_version: "05000006" - system_part_number: "P24088-03" - log_hard_disk: "Not" - private_encryption: "Disable" - operation_mode: "NAT" - current_virtual_domain: "root" + last_reboot_reason: "" + log_hard_disk: "Not available" max_number_of_virtual_domains: "10" - virtual_domains_status: "2 in NAT mode, 0 in TP mode" - virtual_domain_configuration: "multiple" - fips_cc_mode: "disable" - current_ha_mode: "a-p, master" - cluster_uptime: "36 days, 21 hours, 42 minutes, 22 seconds" - cluster_state_change_time: "2020-12-02 22:40:46" - branch_point: "1175" + operation_mode: "NAT" + ot_detect_db: "" + ot_patch_db: "" + ot_threat_db: "" + private_encryption: "Disable" release_version_information: "GA" - fortios_x86_64: "Yes" + securitylevel: "" + serial_number: "FG6H0Exxxxxxxxx" + signature: "certified" + system_part_number: "P24088-03" system_time: "Fri Jan 8 13:22:01 2021" - av_ai_ml_model: "" - last_reboot_reason: "" + version: "FortiGate-600E v6.2.6,build1175,201110 (GA)" + virtual_domains_status: "2 in NAT mode, 0 in TP mode" + virtual_domain_configuration: "multiple" + virus_db: "83.00146(2021-01-08 11:20)" diff --git a/tests/fortinet/get_system_status/fortinet_get_system_status_7.0.yml b/tests/fortinet/get_system_status/fortinet_get_system_status_7.0.yml index 0b9052f194..aef4856c00 100644 --- a/tests/fortinet/get_system_status/fortinet_get_system_status_7.0.yml +++ b/tests/fortinet/get_system_status/fortinet_get_system_status_7.0.yml @@ -1,34 +1,41 @@ --- parsed_sample: - - hostname: "fw1" - version: "FortiGate-60F v7.0.7,build0367,221005 (GA.F)" - signature: "certified" - virus_db: "90.02571(2022-05-23 20:26)" + - app_db: "22.00444(2022-11-22 02:49)" + av_ai_ml_model: "2.05720(2022-05-23 11:45)" + bios_version: "05000009" + botnet_db: "" + branch_point: "0367" + cluster_state_change_time: "" + cluster_uptime: "" + current_ha_mode: "standalone" + current_virtual_domain: "root" extended_db: "90.02571(2022-05-23 20:26)" extreme_db: "" + fips_cc_mode: "disable" + fmwp_db: "" + fortios_x86_64: "" + hostname: "fw1" + industrial_db: "6.00741(2015-12-01 02:30)" + iot_detect: "" ips_db: "22.00446(2022-11-24 01:49)" + ips_engine: "" ips_etdb: "0.00000(2001-01-01 00:00)" - app_db: "22.00444(2022-11-22 02:49)" - industrial_db: "6.00741(2015-12-01 02:30)" - serial_number: "FGT60xxxxxxxxxxx" ips_malicious_url_database: "4.00542(2022-11-26 11:33)" - botnet_db: "" - bios_version: "05000009" - system_part_number: "P24286-03" - log_hard_disk: "Not" - private_encryption: "Disable" - operation_mode: "NAT" - current_virtual_domain: "root" + last_reboot_reason: "warm reboot" + log_hard_disk: "Not available" max_number_of_virtual_domains: "10" - virtual_domains_status: "1 in NAT mode, 0 in TP mode" - virtual_domain_configuration: "disable" - fips_cc_mode: "disable" - current_ha_mode: "standalone" - cluster_uptime: "" - cluster_state_change_time: "" - branch_point: "0367" + operation_mode: "NAT" + ot_detect_db: "" + ot_patch_db: "" + ot_threat_db: "" + private_encryption: "Disable" release_version_information: "GA" - fortios_x86_64: "" + securitylevel: "" + serial_number: "FGT60xxxxxxxxxxx" + signature: "certified" + system_part_number: "P24286-03" system_time: "Sun Nov 27 00:26:34 2022" - last_reboot_reason: "warm reboot" - av_ai_ml_model: "2.05720(2022-05-23 11:45)" + version: "FortiGate-60F v7.0.7,build0367,221005 (GA.F)" + virtual_domains_status: "1 in NAT mode, 0 in TP mode" + virtual_domain_configuration: "disable" + virus_db: "90.02571(2022-05-23 20:26)" diff --git a/tests/fortinet/get_system_status/fortinet_get_system_status_7.4.raw b/tests/fortinet/get_system_status/fortinet_get_system_status_7.4.raw index 67dd24d413..df0ba7aff2 100644 --- a/tests/fortinet/get_system_status/fortinet_get_system_status_7.4.raw +++ b/tests/fortinet/get_system_status/fortinet_get_system_status_7.4.raw @@ -18,7 +18,7 @@ Serial-Number: FG60EPTK19010019 BIOS version: 05000015 System Part-Number: P21035-02 Log hard disk: Not available -Hostname: PSS0-FWH-1-1 +Hostname: fw1 Private Encryption: Disable Operation Mode: NAT Current virtual domain: root diff --git a/tests/fortinet/get_system_status/fortinet_get_system_status_7.4.yml b/tests/fortinet/get_system_status/fortinet_get_system_status_7.4.yml index 597c09f9a6..5853d6119f 100644 --- a/tests/fortinet/get_system_status/fortinet_get_system_status_7.4.yml +++ b/tests/fortinet/get_system_status/fortinet_get_system_status_7.4.yml @@ -1,41 +1,41 @@ --- parsed_sample: - - hostname: "fw1" - version: "FortiGate-60E-POE v7.4.1,build2463,230830 (GA.F)" - security_level: "1" - signature: "certified" - virus_db: "90.02571(2022-05-23 20:26)" - extended_db: "90.02571(2022-05-23 20:26)" - extreme_db: "" - ips_db: "22.00446(2022-11-24 01:49)" - ips_etdb: "0.00000(2001-01-01 00:00)" - app_db: "22.00444(2022-11-22 02:49)" - fmwp_db: "23.00107(2023-10-25 16:54)" - iot_detect: "0.00000(2022-08-17 17:31)" - ot_detect_db: "0.00000(2001-01-01 00:00)" - ot_patch_db: "0.00000(2001-01-01 00:00)" - ot_threat_db: "6.00741(2015-12-01 02:30)" - ips_engine: "7.00509(2023-08-10 23:09)" - industrial_db: "6.00741(2015-12-01 02:30)" - serial_number: "FGT60xxxxxxxxxxx" - ips_malicious_url_database: "4.00542(2022-11-26 11:33)" + - app_db: "7.00509(2023-08-10 23:09)" + av_ai_ml_model: "0.00000(2001-01-01 00:00)" + bios_version: "05000015" botnet_db: "" - bios_version: "05000009" - system_part_number: "P24286-03" - log_hard_disk: "Not" - private_encryption: "Disable" - operation_mode: "NAT" + branch_point: "2463" + cluster_state_change_time: "" + cluster_uptime: "" + current_ha_mode: "standalone" current_virtual_domain: "root" - max_number_of_virtual_domains: "10" - virtual_domains_status: "1 in NAT mode, 0 in TP mode" - virtual_domain_configuration: "disable" + extended_db: "1.00000(2018-04-09 18:07)" + extreme_db: "" fips_cc_mode: "disable" - current_ha_mode: "standalone" - cluster_uptime: "" - cluster_state_change_time: "" - branch_point: "0367" - release_version_information: "GA" + fmwp_db: "" fortios_x86_64: "" - system_time: "Sun Nov 27 00:26:34 2022" + hostname: "fw1" + industrial_db: "" + iot_detect: "" + ips_db: "6.00741(2015-12-01 02:30)" + ips_engine: "" + ips_etdb: "0.00000(2001-01-01 00:00)" + ips_malicious_url_database: "1.00001(2015-01-01 01:01)" last_reboot_reason: "warm reboot" - av_ai_ml_model: "2.05720(2022-05-23 11:45)" + log_hard_disk: "Not available" + max_number_of_virtual_domains: "10" + operation_mode: "NAT" + ot_detect_db: "" + ot_patch_db: "" + ot_threat_db: "" + private_encryption: "Disable" + release_version_information: "GA" + securitylevel: "1" + serial_number: "FG60EPTK19010019" + signature: "certified" + system_part_number: "P21035-02" + system_time: "Thu Oct 26 17:35:21 2023" + version: "FortiGate-60E-POE v7.4.1,build2463,230830 (GA.F)" + virtual_domains_status: "1 in NAT mode, 0 in TP mode" + virtual_domain_configuration: "disable" + virus_db: "1.00000(2018-04-09 18:07)"