cisco-config-parser 2.2.5__tar.gz → 2.2.6__tar.gz

{cisco_config_parser-2.2.5 → cisco_config_parser-2.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cisco_config_parser
-Version: 2.2.5
+Version: 2.2.6
 Summary: This library is used for Network Automation involving Cisco Routers and Switch. It will parse Cisco IOS, IOS-XE, IOS-XR, and NXOS configuration file into objects and/or json format
 Home-page: https://github.com/arezazadeh/cisco_config_parser
 Author: Ahmad Rezazadeh
@@ -58,6 +58,10 @@ Some of those configs are as follow:
     - OSPF
     - IS-IS
     - BGP
+- VXLAN Related Configs (NXOS)
+    - BGP EVPN MP-BGP
+    - NVE Config 
+    - Anycast Gateway Config
 
 - Line-vty 
 - Line-con

{cisco_config_parser-2.2.5 → cisco_config_parser-2.2.6}/README.md

@@ -48,6 +48,10 @@ Some of those configs are as follow:
     - OSPF
     - IS-IS
     - BGP
+- VXLAN Related Configs (NXOS)
+    - BGP EVPN MP-BGP
+    - NVE Config 
+    - Anycast Gateway Config
 
 - Line-vty 
 - Line-con

{cisco_config_parser-2.2.5 → cisco_config_parser-2.2.6}/cisco_config_parser/__init__.py

@@ -14,4 +14,4 @@ __license__ = "MIT"
 __description__ = "A simple library to parse Cisco configuration files"
 
 
-__all__ = _ALL_
+__all__ = _ALL_

{cisco_config_parser-2.2.5 → cisco_config_parser-2.2.6}/cisco_config_parser/layer2_interface/l2_interface_parser.py

@@ -147,7 +147,7 @@ class L2InterfaceParser:
                 l2_trunk_intf_cls.description = description_regex.group(1)
 
             if allowed_vlan_regex:
-                l2_trunk_intf_cls.allowed_vlan = allowed_vlan_regex.group(1)
+                l2_trunk_intf_cls.allowed_vlans = allowed_vlan_regex.group(1)
 
             if native_vlan_regex:
                 l2_trunk_intf_cls.native_vlan = native_vlan_regex.group(1)

{cisco_config_parser-2.2.5 → cisco_config_parser-2.2.6}/cisco_config_parser/layer3_interface/l3_interface_parser.py

@@ -36,6 +36,7 @@ class L3InterfaceParser:
 
         l3_intf = L3InterfaceSeparator(self.content)
         l3_interfaces = l3_intf.find_all_l3_interfaces()
+
         l3_intf_objects = []
 
         for l3_interface in l3_interfaces:
@@ -89,7 +90,6 @@ class L3InterfaceParser:
             if description_regex:
                 l3_intf_cls.description = description_regex.group(1).strip()
 
-
             # if there are custom kwargs, search for the custom regex in the l3_interface section
             # if the regex is found, parse the line and store the value in the l3_intf_cls object
             if kwargs:
@@ -104,7 +104,6 @@ class L3InterfaceParser:
                     }
                     l3_intf_cls = _L3SectionParser._parse_custom_regex(**custom_regex_kwargs)
 
-
             # append the l3_intf_cls object to the l3_intf_objects list
             l3_intf_objects.append(l3_intf_cls)
 

{cisco_config_parser-2.2.5 → cisco_config_parser-2.2.6}/cisco_config_parser/layer3_interface/l3_interface_separator.py

@@ -12,7 +12,7 @@ class L3InterfaceSeparator(Separator):
     def _is_l3_interface_section(self, section):
         interface_regex = re.search(r"^interface", section, flags=re.MULTILINE)
         if interface_regex:
-            l3_interface_regex = re.search(r"ip address", section, flags=re.MULTILINE)
+            l3_interface_regex = re.search(r"(ip address)|(ipv4 address)", section, flags=re.MULTILINE)
             if l3_interface_regex:
                 return True
             return False

{cisco_config_parser-2.2.5 → cisco_config_parser-2.2.6}/cisco_config_parser/parser/parser.py

@@ -2,10 +2,6 @@ from cisco_config_parser.layer3_interface import L3InterfaceParser
 from cisco_config_parser.layer2_interface import L2InterfaceParser
 from cisco_config_parser.parent_child import ParentChildParser
 from cisco_config_parser.global_search import GlobalParser
-# from cisco_config_parser.routing_protocol.ios.rtp_ospf import IOSOSPFConfig
-# from cisco_config_parser.routing_protocol.ios.rtp_eigtp import IOSEIGRPConfig
-# from cisco_config_parser.routing_protocol.ios.rtp_static import IOSStaticRouteConfig
-# from cisco_config_parser.routing_protocol.ios.rtp_bgp import IOSBGPConfig
 from cisco_config_parser.routing_protocol import *
 
 from cisco_config_parser.parser_regex.ios_regex import *

cisco_config_parser-2.2.6/cisco_config_parser/parser_regex/nxos_regex.py

@@ -0,0 +1,23 @@
+import re
+
+
+RTP_NXOS_REGEX = re.compile(r"^router\s(\S+)", flags=re.MULTILINE)
+
+
+# NXOS STATIC ROUTE
+
+
+RTP_NXOS_VRF_CONTEXT_REGEX = re.compile(r"^vrf\scontext\s(\S+)", flags=re.MULTILINE)
+RTP_NXOS_VRF_STATIC_ROUTE_REGEX = re.compile(r" ip route .*", flags=re.MULTILINE)
+RTP_NXOS_GLOBAL_STATIC_ROUTE_REGEX = re.compile(r"^ip route .*", flags=re.MULTILINE)
+RTP_NXOS_STATIC_ROUTE_REGEX = re.compile(r"ip route .*", flags=re.MULTILINE)
+
+# Global
+RTP_NXOS_STATIC_REGEX = re.compile(r"ip route (\S+) (\S+)$", flags=re.MULTILINE)
+RTP_NXOS_STATIC_AD_REGEX = re.compile(r"ip route (\S+) (\S+) (\d+)", flags=re.MULTILINE)
+RTP_NXOS_STATIC_NAME_REGEX = re.compile(r"ip route (\S+) (\S+) name (.*)$", flags=re.MULTILINE)
+RTP_NXOS_STATIC_NAME_AD_REGEX = re.compile(r"ip route (\S+) (\S+) name (.*) (\d+)$", flags=re.MULTILINE)
+
+
+
+

{cisco_config_parser-2.2.5 → cisco_config_parser-2.2.6}/cisco_config_parser/routing_protocol/nxos/rtp_nxos_rtp_obj.py

@@ -6,15 +6,11 @@ from dataclasses import dataclass
 
 @dataclass
 class StaticRoute:
-    network: str = None
-    mask: str = None
-    nexthop_ip: str = None
-    subnet: str = None
-    vrf: str = None
-    name: str = None
-    admin_distance: str = None
-
+    networks: list = None
 
+    def __post_init__(self):
+        if self.networks is None:
+            self.networks = []
 
 
 @dataclass

cisco_config_parser-2.2.6/cisco_config_parser/routing_protocol/nxos/rtp_static.py

@@ -0,0 +1,91 @@
+from .rtp_nxos_rtp_obj import StaticRoute
+from cisco_config_parser.parser_regex import *
+from dataclasses import dataclass
+from cisco_config_parser.routing_protocol.utils import *
+from cisco_config_parser.routing_protocol.utils.rtp_nxos_separator import NXOSRoutingProtocolSeparator
+
+@dataclass
+class NXOSStaticRouteConfig:
+    content: str = None
+
+
+    def _rewrite_static_route_section(self, section):
+        """
+        Rewrite static route section
+        :param section: section of the config file
+        :return: str
+        """
+        cleaned_section = [line.strip() for line in section.split("\n") if line.strip()]
+        return "\n".join(cleaned_section)
+
+
+    def _process_static_route_alone(self, section):
+        """
+        Process static route alone
+        :param section: section of the config file
+        :return: dict
+        """
+        cleaned_section = self._rewrite_static_route_section(section)
+        result = RTP_NXOS_STATIC_REGEX.findall(cleaned_section)
+        print(result)
+
+
+
+    def _process_static_route(self, section, obj):
+        """
+        Description:
+            the global static routes come to this function one line at a time
+        """
+        static_alone = RTP_NXOS_STATIC_REGEX.findall(section)
+        static_with_name = RTP_NXOS_STATIC_NAME_REGEX.findall(section)
+        static_with_ad = RTP_NXOS_STATIC_AD_REGEX.findall(section)
+        static_with_name_ad = RTP_NXOS_STATIC_NAME_AD_REGEX.findall(section)
+        print(static_alone)
+        print(static_with_name)
+        print(static_with_ad)
+        print(static_with_name_ad)
+
+        pass
+
+
+
+    def _fetch_static_route_config(self, return_json=False):
+        """
+        Fetch static route configuration
+        :param return_json: return the output in json format
+        :return: str or dict
+        """
+
+        static_route_obj_list = []
+        static_route_sections = NXOSRoutingProtocolSeparator(self.content).find_static_route_section()
+
+        global_routes = []
+        for section in static_route_sections:
+            static_route_obj = StaticRoute()
+
+            # Process Global Static Route
+            if RTP_NXOS_GLOBAL_STATIC_ROUTE_REGEX.findall(section):
+
+                # some global static route might have vrf in them,
+                # so we will ignore them while processing global static route
+                # and process them in vrf context
+                if "vrf" not in section:
+                    global_routes.append(section)
+
+        global_results = self._process_static_route(
+            "\n".join(global_routes), static_route_obj
+        )
+
+
+            # # Process VRF Static Route
+            # elif RTP_NXOS_VRF_CONTEXT_REGEX.search(section):
+            #     static_route_obj = self._process_static_route(section, static_route_obj)
+            #     static_route_obj.vrf = RTP_NXOS_VRF_CONTEXT_REGEX.search(section).group(1)
+            #     static_route_obj_list.append(static_route_obj)
+
+        if return_json:
+            return [obj.__dict__.copy() for obj in static_route_obj_list]
+
+        return static_route_obj_list
+
+

{cisco_config_parser-2.2.5 → cisco_config_parser-2.2.6}/cisco_config_parser/routing_protocol/utils/utils.py

@@ -1,14 +1,25 @@
 import ipaddress
 
 
-def get_subnet(network, mask):
+def get_subnet(network=None, mask=None):
     """
     Get the subnet from the network and mask
     :param network: str
     :param mask: str
     :return: str
     """
-    return str(ipaddress.ip_network((network, mask), strict=False))
+    return str(ipaddress.ip_network((network, mask), strict=False)) if mask else str(ipaddress.ip_network(network))
+
+
+def get_mask_from_cidr(subnet):
+    """
+    Get the mask from the CIDR
+    Args:
+        subnet: str
+    Returns:
+        str
+    """
+    return str(ipaddress.IPv4Network(subnet).netmask)
 
 
 def convert_wildcard_to_mask(wildcard_mask):

{cisco_config_parser-2.2.5 → cisco_config_parser-2.2.6}/cisco_config_parser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
-Name: cisco-config-parser
-Version: 2.2.5
+Name: cisco_config_parser
+Version: 2.2.6
 Summary: This library is used for Network Automation involving Cisco Routers and Switch. It will parse Cisco IOS, IOS-XE, IOS-XR, and NXOS configuration file into objects and/or json format
 Home-page: https://github.com/arezazadeh/cisco_config_parser
 Author: Ahmad Rezazadeh
@@ -58,6 +58,10 @@ Some of those configs are as follow:
     - OSPF
     - IS-IS
     - BGP
+- VXLAN Related Configs (NXOS)
+    - BGP EVPN MP-BGP
+    - NVE Config 
+    - Anycast Gateway Config
 
 - Line-vty 
 - Line-con

{cisco_config_parser-2.2.5 → cisco_config_parser-2.2.6}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 HERE = pathlib.Path(__file__).parent
 
-VERSION = '2.2.5'
+VERSION = '2.2.6'
 PACKAGE_NAME = 'cisco_config_parser'
 AUTHOR = 'Ahmad Rezazadeh'
 AUTHOR_EMAIL = 'ahmad@klevernet.io'

cisco_config_parser-2.2.5/cisco_config_parser/parser_regex/nxos_regex.py

@@ -1,17 +0,0 @@
-import re
-
-
-RTP_NXOS_REGEX = re.compile(r"^router\s(\S+)", flags=re.MULTILINE)
-
-
-# NXOS STATIC ROUTE
-
-
-RTP_NXOS_VRF_CONTEXT_REGEX = re.compile(r"^vrf\scontext\s(\S+)", flags=re.MULTILINE)
-RTP_NXOS_VRF_STATIC_ROUTE_REGEX = re.compile(r"\s+ip\sroute\s.*", flags=re.MULTILINE)
-RTP_NXOS_GLOBAL_STATIC_ROUTE_REGEX = re.compile(r"^ip\sroute\s.*", flags=re.MULTILINE)
-RTP_NXOS_STATIC_ROUTE_REGEX = re.compile(r"ip\sroute\s.*", flags=re.MULTILINE)
-RTP_NXOS_STATIC_W_NAME_REGEX = re.compile(r"ip route\s(\S+)\s(\S+)\sname\s(.*)$", flags=re.MULTILINE)
-RTP_NXOS_STATIC_W_NAME_AD_REGEX = re.compile(r"ip route\s(\S+)\s(\S+)\sname\s(.*)\s(\d+)$", flags=re.MULTILINE)
-RTP_NXOS_STATIC_WO_NAME_REGEX = re.compile(r"ip route\s(\S+)\s(\S+)$", flags=re.MULTILINE)
-

cisco_config_parser-2.2.5/cisco_config_parser/routing_protocol/nxos/rtp_static.py

@@ -1,49 +0,0 @@
-from .rtp_nxos_rtp_obj import StaticRoute
-from cisco_config_parser.parser_regex import *
-from dataclasses import dataclass
-from cisco_config_parser.routing_protocol.utils.rtp_nxos_separator import NXOSRoutingProtocolSeparator
-
-@dataclass
-class NXOSStaticRouteConfig:
-    content: str = None
-
-
-    def _process_global_static_route(self, section, obj):
-        """
-        Process global static route
-        :param section: section of the config file
-        :param obj: object to store the data
-        :return: None
-        """
-        static_route_with_name = RTP_NXOS_STATIC_W_NAME_REGEX.search(section)
-        static_route_with_name_and_ad = RTP_NXOS_STATIC_W_NAME_AD_REGEX.search(section)
-        static_route = RTP_NXOS_STATIC_WO_NAME_REGEX.search(section)
-        print(section)
-        if static_route_with_name:
-            obj.network = static_route_with_name.group(1)
-            obj.mask = static_route_with_name.group(2)
-            obj.name = static_route_with_name.group(3)
-        if static_route:
-            print("no name")
-            print(static_route.groups())
-            obj.network = static_route.group(1)
-            obj.mask = static_route.group(2)
-
-
-
-
-    def _fetch_static_route_config(self, return_json=False):
-        """
-        Fetch static route configuration
-        :param return_json: return the output in json format
-        :return: str or dict
-        """
-
-        static_route_obj_list = []
-        static_route_sections = NXOSRoutingProtocolSeparator(self.content).find_static_route_section()
-        for section in static_route_sections:
-            static_route_obj = StaticRoute()
-            if RTP_NXOS_GLOBAL_STATIC_ROUTE_REGEX.search(section):
-                static_route_obj = self._process_global_static_route(section, static_route_obj)
-
-