Merge pull request #511 from networktocode/develop

Merge develop branch into main - 1.8.1

development_scripts.py

@@ -1,4 +1,5 @@
 """Developer script to generate markdown tables."""
+
 from jinja2 import Environment, BaseLoader, select_autoescape
 from netutils.utils import _JINJA2_FUNCTION_MAPPINGS
 from netutils import lib_mapper

docs/admin/release_notes/version_1.8.md

@@ -29,3 +29,9 @@
 
 - [#496](https://github.com/networktocode/netutils/pull/496) Fixed vyos lib_mapper.
 - [#416](https://github.com/networktocode/netutils/pull/416) Fixed for `\n` characters in parsing bug in palo parser.
+
+## [v1.8.1] 2024-04
+
+### Fixed
+- [#509](https://github.com/networktocode/netutils/pull/509) Fixed parsing of empty banner, and dual banner for Cisco platforms.
+

flat_postprocess/oui_postprocess.py

@@ -1,4 +1,5 @@
 """Python code used to postprocess Flat github action data related to OUI mappings."""
+
 import sys
 import re
 from urllib.request import urlopen

flat_postprocess/protocol_number_postprocess.py

@@ -1,4 +1,5 @@
 """Python code used to postprocess Flat github action data related to Protocol mappings."""
+
 import csv
 import os
 import sys

flat_postprocess/protocol_postprocess.py

@@ -1,4 +1,5 @@
 """Python code used to postprocess Flat github action data related to Protocol mappings."""
+
 import csv
 import os
 import sys

netutils/__init__.py

@@ -1,6 +1,5 @@
 """Initialization file for library."""
 
-
 from importlib import metadata
 
 

netutils/bandwidth.py

@@ -1,4 +1,5 @@
 """Functions for performing bandwidth calculations."""
+
 import re
 import typing as t
 

netutils/banner.py

@@ -1,4 +1,5 @@
 """Functions for working with the banner configuration."""
+
 import re
 
 from netutils.constants import CARET_C

netutils/config/clean.py

@@ -1,4 +1,5 @@
 """Functions for working with configuration to clean the config."""
+
 # pylint: disable=anomalous-backslash-in-string
 
 import re

netutils/config/conversion.py

@@ -114,9 +114,11 @@ def paloalto_panos_clean_newlines(cfg: str) -> str:
     )
 
     newlines_cleaned_cfg = paloalto_panos_newline_regex.sub(
-        lambda match: match.group().replace("\n", " ")
-        if not any(substring in match.group() for substring in paloalto_panos_no_newline_cleanup_match)
-        else match.group(),
+        lambda match: (
+            match.group().replace("\n", " ")
+            if not any(substring in match.group() for substring in paloalto_panos_no_newline_cleanup_match)
+            else match.group()
+        ),
         cfg,
     )
 

netutils/config/parser.py

@@ -1,4 +1,5 @@
 """Parsers for different network operating systems."""
+
 # pylint: disable=no-member,super-with-arguments,invalid-overridden-method,raise-missing-from,invalid-overridden-method,inconsistent-return-statements,super-with-arguments,redefined-argument-from-local,no-else-break,useless-super-delegation,too-many-lines
 
 import re
@@ -95,6 +96,8 @@ def is_banner_start(self, line: str) -> bool:
             True if line starts banner, else False.
         """
         for banner_start in self.banner_start:
+            if not line:
+                return False
             if line.lstrip().startswith(banner_start):
                 return True
         return False
@@ -330,6 +333,9 @@ def build_config_relationship(self) -> t.List[ConfigLine]:
                 break
             elif self.is_banner_start(line):
                 line = self._build_banner(line)  # type: ignore
+                # line can potentially be another banner start therefore we do a secondary check.
+                if self.is_banner_start(line):
+                    line = self._build_banner(line)  # type: ignore
 
             self._update_config_lines(line)
         return self.config_lines
@@ -551,6 +557,9 @@ def _build_banner(self, config_line: str) -> t.Optional[str]:
     def is_banner_one_line(config_line: str) -> bool:
         """Determine if all banner config is on one line."""
         _, delimeter, banner = config_line.partition("^C")
+        # if the banner is the delimeter is a single line empty banner. e.g banner motd ^C^C which ios allows.
+        if banner == "^C":
+            return True
         # Based on NXOS configs, the banner delimeter is ignored until another char is used
         banner_config_start = banner.lstrip(delimeter)
         if delimeter not in banner_config_start:

netutils/constants.py

@@ -1,4 +1,5 @@
 """Constant definitions used in project."""
+
 from netutils.data_files.protocol_mappings import (  # noqa: F401 # pylint:disable=unused-import
     PROTOCOLS,
 )