cisco-config-parser 2.2.7__tar.gz → 2.2.8__tar.gz

{cisco_config_parser-2.2.7 → cisco_config_parser-2.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cisco_config_parser
-Version: 2.2.7
+Version: 2.2.8
 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

{cisco_config_parser-2.2.7 → cisco_config_parser-2.2.8}/cisco_config_parser/__init__.py

@@ -6,7 +6,7 @@ _ALL_ = [
     "ConfigParserOld",
 ]
 
-__version__ = "2.2.7"
+__version__ = "2.2.8"
 __author__ = "Ahmad Rezazadeh"
 __email__ = "ahmad@klevernet.io"
 __url__ = "klevernet.ai"

{cisco_config_parser-2.2.7 → cisco_config_parser-2.2.8}/cisco_config_parser/layer3_interface/l3_interface_parser.py

@@ -41,25 +41,26 @@ class L3InterfaceParser:
 
         for l3_interface in l3_interfaces:
 
+            l3_interface_stripped = "\n".join([line.strip() for line in l3_interface.split("\n") if line.strip()])
             # create an instance of the L3Interface class
             l3_intf_cls = L3Interface()
 
             # split the l3_interface section into lines
             # remove the first line which is the interface name
             # and store the rest of the lines in the children attribute of the l3_intf_cls object
-            l3_intf_split_line = SPLIT_ON_LINE.split(l3_interface)
+            l3_intf_split_line = SPLIT_ON_LINE.split(l3_interface_stripped)
             l3_intf_cls.children = [
                 line.strip() for line in l3_intf_split_line
                 if line and not line.startswith("interface")
             ]
 
             # search for the regex in the l3_interface section
-            interface_regex = INTERFACE_MULTILINE_REGEX.search(l3_interface)
-            description_regex = DESCRIPTION_REGEX.search(l3_interface)
-            ip_address_regex = IP_ADDRESS_REGEX.search(l3_interface)
-            vrf_regex = VRF_REGEX.search(l3_interface)
-            helper_address_regex = HELPER_ADDRESS_REGEX.search(l3_interface)
-            sec_ip_address_regex = SECONDARY_IP_ADDRESS_REGEX.search(l3_interface)
+            interface_regex = INTERFACE_MULTILINE_REGEX.search(l3_interface_stripped)
+            description_regex = DESCRIPTION_REGEX.search(l3_interface_stripped)
+            ip_address_regex = IP_ADDRESS_REGEX.search(l3_interface_stripped)
+            vrf_regex = VRF_REGEX.search(l3_interface_stripped)
+            helper_address_regex = HELPER_ADDRESS_REGEX.search(l3_interface_stripped)
+            sec_ip_address_regex = SECONDARY_IP_ADDRESS_REGEX.search(l3_interface_stripped)
 
 
             # if the regex is found, parse the line and store the value in the l3_intf_cls object
@@ -82,7 +83,7 @@ class L3InterfaceParser:
                 l3_intf_cls = _L3SectionParser._parse_vrf_line(vrf_line_regex=vrf_regex, l3_interface_obj=l3_intf_cls)
 
             if helper_address_regex:
-                l3_intf_cls = _L3SectionParser._parse_helper_address_line(l3_interface_obj=l3_intf_cls, section=l3_interface)
+                l3_intf_cls = _L3SectionParser._parse_helper_address_line(l3_interface_obj=l3_intf_cls, section=l3_interface_stripped)
 
             if interface_regex:
                 l3_intf_cls.name = interface_regex.group(1).strip()

{cisco_config_parser-2.2.7 → cisco_config_parser-2.2.8}/cisco_config_parser/layer3_interface/l3_section_parser.py

@@ -73,7 +73,9 @@ class _L3SectionParser:
         vrf_line_regex = kwargs.get("vrf_line_regex")
         l3_interface_obj = kwargs.get("l3_interface_obj")
         vrf = vrf_line_regex.groups()
+
         vrf = [vrf_group for vrf_group in vrf if vrf_group][0]
+
         l3_interface_obj.vrf = vrf.strip()
         return l3_interface_obj
 

{cisco_config_parser-2.2.7 → cisco_config_parser-2.2.8}/cisco_config_parser/parser_regex/ios_regex.py

@@ -28,10 +28,10 @@ INTERFACE_REGEX = re.compile(r"interface\s(.*)", flags=re.MULTILINE)
 # L3 Interface
 DESCRIPTION_REGEX = re.compile(r"description\s(.*)", flags=re.MULTILINE)
 IP_ADDRESS_REGEX = re.compile(r"ip\saddress\s(\d+\.\d+\.\d+\.\d+\s\d+\.\d+\.\d+\.\d+)|ip\saddress\s(\d+\.\d+\.\d+\.\d+/\d+)|ipv4\saddress\s(\d+\.\d+\.\d+\.\d+\s\d+\.\d+\.\d+\.\d+)|ipv4\saddress\s(\d+\.\d+\.\d+\.\d+/\d+)")
-IP_ADDRESS_CIDR_REGEX = re.compile(r"ip\saddress\s(\d+\.\d+\.\d+\.\d+/\d+)")
-HELPER_ADDRESS_REGEX = re.compile(r"ip\shelper-address\s(.*)")
-SECONDARY_IP_ADDRESS_REGEX = re.compile(r"ip\saddress\s(.*)secondary")
-VRF_REGEX = re.compile(r"ip\svrf\sforwarding\s(.*)|vrf\smember\s(.*)|vrf\s(.*)")
+IP_ADDRESS_CIDR_REGEX = re.compile(r"ip\saddress\s(\d+\.\d+\.\d+\.\d+/\d+)", flags=re.MULTILINE)
+HELPER_ADDRESS_REGEX = re.compile(r"ip\shelper-address\s(.*)", flags=re.MULTILINE)
+SECONDARY_IP_ADDRESS_REGEX = re.compile(r"ip\saddress\s(.*)secondary", flags=re.MULTILINE)
+VRF_REGEX = re.compile(r"^ip\svrf\sforwarding\s(.*)|^vrf\smember\s(.*)|^vrf\sforwarding\s(.*)|^vrf\s(\S+)$", flags=re.MULTILINE)
 
 
 

{cisco_config_parser-2.2.7 → cisco_config_parser-2.2.8}/cisco_config_parser/setup.py

@@ -3,6 +3,6 @@ from setuptools import setup, find_packages
 
 setup(
     name='cisco_config_parser',
-    version='2.2.7',
+    version='2.2.8',
     packages=find_packages(),
 )

{cisco_config_parser-2.2.7 → cisco_config_parser-2.2.8}/cisco_config_parser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cisco_config_parser
-Version: 2.2.7
+Version: 2.2.8
 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

{cisco_config_parser-2.2.7 → cisco_config_parser-2.2.8}/setup.py

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