Fixes and Add Aruba config parser mappings (#632)

Co-authored-by: Ryan Gillespie <24619595+nopg@users.noreply.github.com>

Author: jeffkala

docs/dev/include_parser_list.md

@@ -1,7 +1,9 @@
 | OS Name | Parser Class |
 | ---------- | ------ |
 | arista_eos | netutils.config.parser.EOSConfigParser |
-| aruba_aoscx | netutils.config.parser.ArubaConfigParser |
+| aruba_aoscx | netutils.config.parser.ArubaConfigCXParser |
+| aruba_os | netutils.config.parser.ArubaConfigOSParser |
+| aruba_osswitch | netutils.config.parser.ArubaConfigOSParser |
 | bigip_f5 | netutils.config.parser.F5ConfigParser |
 | cisco_aireos | netutils.config.parser.AIREOSConfigParser |
 | cisco_asa | netutils.config.parser.ASAConfigParser |

docs/user/lib_mapper/netutilsparser.md

@@ -2,6 +2,8 @@
 | ---------- | -- | ------ |
 | arista_eos | → | arista_eos |
 | aruba_aoscx | → | aruba_aoscx |
+| aruba_os | → | aruba_os |
+| aruba_osswitch | → | aruba_osswitch |
 | bigip_f5 | → | bigip_f5 |
 | cisco_aireos | → | cisco_aireos |
 | cisco_asa | → | cisco_asa |

docs/user/lib_mapper/netutilsparser_reverse.md

@@ -2,6 +2,8 @@
 | ---------- | -- | ------ |
 | arista_eos | → | arista_eos |
 | aruba_aoscx | → | aruba_aoscx |
+| aruba_os | → | aruba_os |
+| aruba_osswitch | → | aruba_osswitch |
 | bigip_f5 | → | bigip_f5 |
 | cisco_aireos | → | cisco_aireos |
 | cisco_asa | → | cisco_asa |

netutils/config/compliance.py

@@ -8,7 +8,9 @@
 
 parser_map: t.Dict[str, t.Type[parser.BaseConfigParser]] = {
     "arista_eos": parser.EOSConfigParser,
-    "aruba_aoscx": parser.ArubaConfigParser,
+    "aruba_aoscx": parser.ArubaConfigCXParser,
+    "aruba_os": parser.ArubaConfigOSParser,
+    "aruba_osswitch": parser.ArubaConfigOSParser,
     "bigip_f5": parser.F5ConfigParser,
     "cisco_aireos": parser.AIREOSConfigParser,
     "cisco_asa": parser.ASAConfigParser,
@@ -196,7 +198,9 @@ def compliance(
 
 
 def config_section_not_parsed(
-    features: t.List[t.Dict[str, t.Union[str, bool, t.List[str]]]], device_cfg: str, network_os: str
+    features: t.List[t.Dict[str, t.Union[str, bool, t.List[str]]]],
+    device_cfg: str,
+    network_os: str,
 ) -> t.Dict[str, t.Union[str, t.List[str]]]:
     r"""Return device config section that is not checked by compliance.
 
@@ -291,7 +295,10 @@ def diff_network_config(compare_config: str, base_config: str, network_os: str)
 
 
 def feature_compliance(
-    feature: t.Dict[str, t.Union[str, bool, t.List[str]]], backup_cfg: str, intended_cfg: str, network_os: str
+    feature: t.Dict[str, t.Union[str, bool, t.List[str]]],
+    backup_cfg: str,
+    intended_cfg: str,
+    network_os: str,
 ) -> t.Dict[str, t.Union[str, bool]]:
     r"""Report compliance for all features provided as input.
 
@@ -391,7 +398,11 @@ def find_unordered_cfg_lines(intended_cfg: str, actual_cfg: str) -> t.Tuple[bool
     return (False, unordered_lines)
 
 
-def section_config(feature: t.Dict[str, t.Union[str, bool, t.List[str]]], device_cfg: str, network_os: str) -> str:
+def section_config(
+    feature: t.Dict[str, t.Union[str, bool, t.List[str]]],
+    device_cfg: str,
+    network_os: str,
+) -> str:
     """Parse feature section config from device cfg.
 
         In case section attribute of the the feature is not provided

netutils/config/parser.py

@@ -417,7 +417,9 @@ def find_children_w_parents(
         ]
         for cfg_line in self.build_config_relationship():
             parents = cfg_line.parents[0] if cfg_line.parents else None
-            if parents in potential_parents and self._match_type_check(parents, parent_pattern, match_type):  # type: ignore[arg-type]
+            if parents in potential_parents and self._match_type_check(
+                parents, parent_pattern, match_type  # type: ignore[arg-type]
+            ):
                 config.append(cfg_line.config_line)
         return config
 
@@ -1205,8 +1207,8 @@ def banner_end(self) -> str:
         raise NotImplementedError("Netscaler platform doesn't have a banner.")
 
 
-class ArubaConfigParser(BaseSpaceConfigParser):
-    """Aruba AOS-CX implementation fo ConfigParser Class."""
+class _ArubaBaseConfigParser(BaseSpaceConfigParser):
+    """Aruba Base implementation fo ConfigParser Class."""
 
     banner_end = "!"
     comment_chars = ["!"]
@@ -1287,6 +1289,20 @@ def config_lines_only(self) -> str:
         return self._config
 
 
+class ArubaConfigCXParser(_ArubaBaseConfigParser):
+    """Aruba AOS-CX implementation fo ConfigParser Class."""
+
+
+class ArubaConfigOSParser(_ArubaBaseConfigParser):
+    """Aruba OS / OSSWITCH implementation fo ConfigParser Class."""
+
+
+class ArubaConfigParser(_ArubaBaseConfigParser):
+    """Aruba Config implementation fo ConfigParser Class."""
+
+    # Remove on next major release.
+
+
 class IOSXRConfigParser(CiscoConfigParser):
     """IOS-XR config parser."""
 

netutils/lib_mapper.py

@@ -389,6 +389,8 @@
 NETUTILSPARSER_LIB_MAPPER: t.Dict[str, str] = {
     "arista_eos": "arista_eos",
     "aruba_aoscx": "aruba_aoscx",
+    "aruba_os": "aruba_os",
+    "aruba_osswitch": "aruba_osswitch",
     "bigip_f5": "bigip_f5",
     "cisco_aireos": "cisco_aireos",
     "cisco_asa": "cisco_asa",
@@ -554,6 +556,8 @@
 NETUTILSPARSER_LIB_MAPPER_REVERSE: t.Dict[str, str] = {
     "arista_eos": "arista_eos",
     "aruba_aoscx": "aruba_aoscx",
+    "aruba_os": "aruba_os",
+    "aruba_osswitch": "aruba_osswitch",
     "bigip_f5": "bigip_f5",
     "cisco_aireos": "cisco_aireos",
     "cisco_asa": "cisco_asa",