Improved exceptions

Author: rameshraghupathy

scripts/ipintutil

@@ -49,15 +49,15 @@ def get_bgp_peer():
     config_db.connect()
     data = config_db.get_table('BGP_NEIGHBOR')
 
-    for neighbor_ip in data.keys():
-        # The data collected here will only work for manually defined neighbors
-        # so we need to ignore errors when using BGP Unnumbered.
-        try:
-            local_addr = data[neighbor_ip]['local_addr']
-            neighbor_name = data[neighbor_ip]['name']
+    for neighbor_ip, attrs in data.items():
+        # Works for manually defined neighbors; ignore errors for unnumbered
+        if not isinstance(attrs, dict):
+            sys.stderr.write(f"Error: BGP_NEIGHBOR entry {neighbor_ip} has invalid type {type(attrs).__name__}, expected dict\n")
+            continue
+        local_addr = attrs.get('local_addr')
+        neighbor_name = attrs.get('name', 'N/A')
+        if local_addr:
             bgp_peer.setdefault(local_addr, [neighbor_name, neighbor_ip])
-        except KeyError:
-            pass
     return bgp_peer
 
 
@@ -164,25 +164,34 @@ def _addr_show(namespace, af, display):
     addrs = {}
     for line in out.splitlines():
         # Example: "12: Po101.1645@PortChannel101    inet 30.2.135.1/24 scope global Po101.1645"
-        colon = line.find(":")
-        if colon < 0:
-            continue
-        ifname = line[colon + 1:].lstrip().split()[0]
+        try:
+            colon = line.find(":")
+            if colon < 0:
+                continue
 
-        if namespace != constants.DEFAULT_NAMESPACE and skip_ip_intf_display(ifname, display):
-            continue
+            parts = line[colon + 1:].lstrip().split()
+            if not parts:
+                continue
+            ifname = parts[0]
 
-        toks = line.split()
-        cidr = None
-        for i, t in enumerate(toks):
-            if t == "inet" or t == "inet6":
-                if i + 1 < len(toks):
-                    cidr = toks[i + 1]
-                break
-        if not cidr:
-            continue
+            if namespace != constants.DEFAULT_NAMESPACE and skip_ip_intf_display(ifname, display):
+                continue
 
-        addrs.setdefault(ifname, []).append(["", cidr])
+            toks = line.split()
+            cidr = None
+            for i, t in enumerate(toks):
+                if t == "inet" or t == "inet6":
+                    if i + 1 < len(toks):
+                        cidr = toks[i + 1]
+                    break
+            if not cidr:
+                continue
+
+            addrs.setdefault(ifname, []).append(["", cidr])
+        except (IndexError, ValueError) as e:
+            # Log parsing errors - may indicate kernel/network issues
+            sys.stderr.write(f"Error: Failed to parse ip addr output line: {e}\n")
+            continue
 
     return addrs
 
@@ -256,10 +265,12 @@ def get_ip_intfs_in_namespace(af, namespace, display):
 
         bgp_neighs = {}
         for _, cidr in ifaddresses:
-            local_ip = cidr.split('/', 1)[0]
             try:
-                neighbor_name, neighbor_ip = bgp_peer[local_ip]
-            except (KeyError, TypeError):
+                local_ip = cidr.split('/', 1)[0]
+                neighbor_name, neighbor_ip = bgp_peer.get(local_ip, ('N/A', 'N/A'))
+            except (IndexError, ValueError) as e:
+                # Log CIDR parsing errors - indicates data corruption
+                sys.stderr.write(f"Error: Malformed CIDR '{cidr}': {e}\n")
                 neighbor_name, neighbor_ip = 'N/A', 'N/A'
             bgp_neighs[cidr] = [neighbor_name, neighbor_ip]