Merge pull request #581 from networktocode/develop

1.10.0 Release

Author: jeffkala

docs/admin/release_notes/version_1.10.md

@@ -0,0 +1,20 @@
+# v1.10 Release Notes
+
+## Release Overview
+
+- Added Functionality to ip_network filter to support method calls with kwargs.
+- Fix configuration parsers to allow newlines, no longer auto strip all newlines.
+
+## [v1.10.0] 2024-09
+
+### Added
+- [534](https://github.com/networktocode/netutils/pull/534) Extend ip_network extension to support method calls with kwargs.
+
+### Changed
+- [570](https://github.com/networktocode/netutils/pull/570) OUI File Updates.
+- [571](https://github.com/networktocode/netutils/pull/571) PROTOCOL File Updates.
+
+### Fixed
+
+- [569](https://github.com/networktocode/netutils/pull/569) Fix banner parsers auto striping all newlines. Allow newlines in banners.
+- [574](https://github.com/networktocode/netutils/pull/574) Fix ntc_template reverse mapping for cisco xe.

docs/user/lib_mapper/ntctemplates.md

@@ -33,7 +33,7 @@
 | cisco_s300 | → | cisco_s300 |
 | cisco_tp | → | cisco_tp |
 | cisco_wlc | → | cisco_wlc |
-| cisco_xe | → | cisco_ios |
+| cisco_xe | → | cisco_xe |
 | cisco_xr | → | cisco_xr |
 | cloudgenix_ion | → | cloudgenix_ion |
 | coriant | → | coriant |

docs/user/lib_mapper/ntctemplates_reverse.md

@@ -33,6 +33,7 @@
 | cisco_s300 | → | cisco_s300 |
 | cisco_tp | → | cisco_tp |
 | cisco_wlc | → | cisco_wlc |
+| cisco_xe | → | cisco_ios |
 | cisco_xr | → | cisco_xr |
 | cloudgenix_ion | → | cloudgenix_ion |
 | coriant | → | coriant |

netutils/config/parser.py

@@ -223,7 +223,7 @@ def _build_banner(self, config_line: str) -> t.Optional[str]:
                 line = "\n".join(banner_config)
                 if line.endswith("^C"):
                     banner, end, _ = line.rpartition("^C")
-                    line = banner.rstrip() + end
+                    line = banner + end
                 self._update_config_lines(line)
                 self._current_parents = self._current_parents[:-1]
                 try:
@@ -1310,7 +1310,7 @@ def _build_banner(self, config_line: str) -> t.Optional[str]:
                 line = "\n".join(banner_config)
                 if line.endswith(self.delimiter):
                     banner, end, _ = line.rpartition(self.delimiter)
-                    line = banner.rstrip() + end
+                    line = banner + end
                 self._update_config_lines(line)
                 self._current_parents = self._current_parents[:-1]
                 try:
@@ -1481,7 +1481,7 @@ def _build_banner(self, config_line: str) -> t.Optional[str]:
                 line = "\n".join(banner_config)
                 if line.endswith("^C"):
                     banner, end, _ = line.rpartition("^C")
-                    line = banner.rstrip() + end
+                    line = banner + end
                 self._update_config_lines(line.strip())
                 self._current_parents = self._current_parents[:-1]
                 try:
@@ -1591,7 +1591,7 @@ def _build_banner(self, config_line: str) -> t.Optional[str]:
                 line = "\n".join(banner_config)
                 if line.endswith(self.banner_end):
                     banner, end, _ = line.rpartition(self.banner_end)
-                    line = banner.rstrip() + end
+                    line = banner + end
                 self._update_config_lines(line)
                 self._current_parents = self._current_parents[:-1]
                 try:
@@ -1671,7 +1671,7 @@ def _build_banner(self, config_line: str) -> t.Optional[str]:
                 line = "\n".join(banner_config)
                 if line.endswith(self.delimiter):
                     banner, end, _ = line.rpartition(self.delimiter)
-                    line = banner.rstrip() + end
+                    line = banner + end
                 self._update_config_lines(line)
                 self._current_parents = self._current_parents[:-1]
                 try: