Repository: napalm-automation/napalm
Pull request #2116 (2024-07-15 22:12:37)

Rework `eos.get_bgp_neighbor`
Use all JSON output for `get_bgp_neighbor` to remove any text-parsing and prevent CLI output updates from breaking the code.  Supercedes #2112 

Since I'm touching the code and the tests, I'd really love some more eyes on this before a merge.


Patch:
diff --git a/napalm/base/models.py b/napalm/base/models.py
index 8ddfde0d..395c3c8d 100644
--- a/napalm/base/models.py
+++ b/napalm/base/models.py
@@ -188,8 +188,8 @@ BGPConfigNeighborDict = TypedDict(
     },
 )
 
-BGPStateAdressFamilyDict = TypedDict(
-    "BGPStateAdressFamilyDict",
+BGPStateAddressFamilyDict = TypedDict(
+    "BGPStateAddressFamilyDict",
     {"received_prefixes": int, "accepted_prefixes": int, "sent_prefixes": int},
 )
 
@@ -203,7 +203,7 @@ BGPStateNeighborDict = TypedDict(
         "is_enabled": bool,
         "description": str,
         "uptime": int,
-        "address_family": Dict[str, BGPStateAdressFamilyDict],
+        "address_family": Dict[str, BGPStateAddressFamilyDict],
     },
 )
 
diff --git a/napalm/eos/eos.py b/napalm/eos/eos.py
index b0a31ed1..f31f2ad4 100644
--- a/napalm/eos/eos.py
+++ b/napalm/eos/eos.py
@@ -34,11 +34,12 @@ from collections import defaultdict
 import pyeapi
 from pyeapi.eapilib import ConnectionError, EapiConnection
 from netmiko import ConfigInvalidException
+from typing import Dict
 
 # NAPALM base
 import napalm.base.helpers
 from napalm.base.netmiko_helpers import netmiko_args
-from napalm.base.base import NetworkDriver
+from napalm.base.base import NetworkDriver, models
 from napalm.base.utils import string_parsers
 from napalm.base.exceptions import (
     CommitError,
@@ -672,140 +673,84 @@ class EOSDriver(NetworkDriver):
             )
         return interface_counters
 
-    def get_bgp_neighbors(self):
-        def get_re_group(res, key, default=None):
-            """Small helper to retrieve data from re match groups"""
-            try:
-                return res.group(key)
-            except KeyError:
-                return default
-
-        NEIGHBOR_FILTER = "vrf all | include IPv[46] (Unicast|6PE):.*[0-9]+ | grep -v ' IPv[46] Unicast:/.' | remote AS |^Local AS|Desc|BGP state |remote router ID"  # noqa
-        output_summary_cmds = self._run_commands(
-            ["show ipv6 bgp summary vrf all", "show ip bgp summary vrf all"],
-            encoding="json",
-        )
-        output_neighbor_cmds = self._run_commands(
+    def get_bgp_neighbors(self) -> Dict[str, models.BGPStateNeighborsPerVRFDict]:
+        cmd_outputs = self._run_commands(
             [
-                "show ip bgp neighbors " + NEIGHBOR_FILTER,
-                "show ipv6 bgp peers " + NEIGHBOR_FILTER,
+                "show ip bgp summary vrf all",
+                "show ipv6 bgp summary vrf all",
+                "show ip bgp neighbors vrf all",
+                "show ipv6 bgp peers vrf all",
             ],
-            encoding="text",
+            encoding="json",
         )
 
-        bgp_counters = defaultdict(lambda: dict(peers={}))
-        for summary in output_summary_cmds:
-            """
-            Json output looks as follows
-            "vrfs": {
-                "default": {
-                    "routerId": 1,
-                    "asn": 1,
-                    "peers": {
-                        "1.1.1.1": {
-                            "msgSent": 1,
-                            "inMsgQueue": 0,
-                            "prefixReceived": 3926,
-                            "upDownTime": 1449501378.418644,
-                            "version": 4,
-                            "msgReceived": 59616,
-                            "prefixAccepted": 3926,
-                            "peerState": "Established",
-                            "outMsgQueue": 0,
-                            "underMaintenance": false,
-                            "asn": 1
-                        }
-                    }
-                }
-            }
-            """
-            for vrf, vrf_data in summary["vrfs"].items():
-                bgp_counters[vrf]["router_id"] = vrf_data["routerId"]
-                for peer, peer_data in vrf_data["peers"].items():
-                    if peer_data["peerState"] == "Idle":
+        bgp_counters = defaultdict(
+            lambda: models.BGPStateNeighborsPerVRFDict(
+                peers=models.BGPStateNeighborDict()  # type: ignore
+            )  # type: ignore
+        )  # type: ignore
+        # Iterate IPv4 and IPv6 neighbor details
+        for cmd in cmd_outputs[2:]:
+            for vrf_name, vrf_data in cmd["vrfs"].items():
+                vrf = bgp_counters[vrf_name]
+                for peer in vrf_data["peerList"]:
+                    peer_ip = napalm.base.helpers.ip(peer["peerAddress"])
+                    v4_summary = cmd_outputs[0]["vrfs"][vrf_name]["peers"].get(
+                        peer_ip, {}
+                    )
+                    v6_summary = cmd_outputs[1]["vrfs"][vrf_name]["peers"].get(
+                        peer_ip, {}
+                    )
+                    local_as = napalm.base.helpers.as_number(peer["localAsn"])
+                    remote_as = napalm.base.helpers.as_number(peer["asn"])
+                    remote_id = napalm.base.helpers.ip(peer["routerId"])
+                    if peer["state"] == "Idle":
                         is_enabled = (
                             True
-                            if peer_data["peerStateIdleReason"] != "Admin"
+                            if peer["idleReason"] != "Administratively shut down"
                             else False
                         )
                     else:
                         is_enabled = True
-                    peer_info = {
-                        "is_up": peer_data["peerState"] == "Established",
-                        "is_enabled": is_enabled,
-                        "uptime": int(time.time() - float(peer_data["upDownTime"])),
-                        "description": peer_data.get("description", ""),
-                    }
-                    bgp_counters[vrf]["peers"][napalm.base.helpers.ip(peer)] = peer_info
-        lines = []
-        [lines.extend(x["output"].splitlines()) for x in output_neighbor_cmds]
-        while lines:
-            """
-            Raw output from the command looks like the following:
-
-              BGP neighbor is 1.1.1.1, remote AS 1, external link
-                Description: Very info such descriptive
-                BGP version 4, remote router ID 1.1.1.1, VRF my_vrf
-                BGP state is Idle, Administratively shut down
-                 IPv4 Unicast:         683        78
-                 IPv6 Unicast:           0         0
-              Local AS is 2, local router ID 2.2.2.2
-            """
-            neighbor_info = re.match(self._RE_BGP_INFO, lines.pop(0))
-            # this line can be either description or rid info
-            next_line = lines.pop(0)
-            desc = re.match(self._RE_BGP_DESC, next_line)
-            if desc is None:
-                rid_info = re.match(self._RE_BGP_RID_INFO, next_line)
-                desc = ""
-            else:
-                rid_info = re.match(self._RE_BGP_RID_INFO, lines.pop(0))
-                desc = desc.group("description")
-            lines.pop(0)
-            v4_stats = re.match(self._RE_BGP_PREFIX, lines.pop(0))
-            v6_stats = re.match(self._RE_BGP_PREFIX, lines.pop(0))
-            local_as = re.match(self._RE_BGP_LOCAL, lines.pop(0))
-            data = {
-                "remote_as": napalm.base.helpers.as_number(neighbor_info.group("as")),
-                "remote_id": napalm.base.helpers.ip(
-                    get_re_group(rid_info, "rid", "0.0.0.0")
-                ),
-                "local_as": napalm.base.helpers.as_number(local_as.group("as")),
-                "description": str(desc),
-                "address_family": {
-                    "ipv4": {
-                        "sent_prefixes": int(get_re_group(v4_stats, "sent", -1)),
-                        "received_prefixes": int(
-                            get_re_group(v4_stats, "received", -1)
+                    is_up = peer["state"] == "Established"
+                    description = peer.get("description", "")
+                    uptime = int(peer.get("establishedTime", -1))
+                    v4: models.BGPStateAddressFamilyDict = {
+                        "received_prefixes": peer["prefixesReceived"],
+                        "accepted_prefixes": (
+                            v4_summary["prefixAccepted"] if v4_summary else 0
                         ),
-                        "accepted_prefixes": -1,
-                    },
-                    "ipv6": {
-                        "sent_prefixes": int(get_re_group(v6_stats, "sent", -1)),
-                        "received_prefixes": int(
-                            get_re_group(v6_stats, "received", -1)
+                        "sent_prefixes": peer["prefixesSent"],
+                    }
+                    v6: models.BGPStateAddressFamilyDict = {
+                        "received_prefixes": peer["v6PrefixesReceived"],
+                        "accepted_prefixes": (
+                            v6_summary["prefixAccepted"] if v6_summary else 0
                         ),
-                        "accepted_prefixes": -1,
-                    },
-                },
-            }
-            peer_addr = napalm.base.helpers.ip(neighbor_info.group("neighbor"))
-            vrf = rid_info.group("vrf")
-            if peer_addr not in bgp_counters[vrf]["peers"]:
-                bgp_counters[vrf]["peers"][peer_addr] = {
-                    "is_up": False,  # if not found, means it was not found in the oper stats
-                    # i.e. neighbor down,
-                    "uptime": 0,
-                    "is_enabled": True,
-                }
-            if (
-                "description" in bgp_counters[vrf]["peers"][peer_addr]
-                and not data["description"]
-            ):
-                data["description"] = bgp_counters[vrf]["peers"][peer_addr][
-                    "description"
-                ]
-            bgp_counters[vrf]["peers"][peer_addr].update(data)
+                        "sent_prefixes": peer["v6PrefixesSent"],
+                    }
+                    peer_data: models.BGPStateNeighborDict = {
+                        "local_as": local_as,
+                        "remote_as": remote_as,
+                        "remote_id": remote_id,
+                        "is_up": is_up,
+                        "is_enabled": is_enabled,
+                        "description": description,
+                        "uptime": uptime,
+                        "address_family": {
+                            "ipv4": v4,
+                            "ipv6": v6,
+                        },
+                    }
+                    vrf["peers"][peer_ip] = peer_data
+
+        # Iterate IPv4 and IPv6 summary details for router-id assignment
+        for cmd in cmd_outputs[:2]:
+            for vrf_name, vrf_data in cmd["vrfs"].items():
+                bgp_counters[vrf_name]["router_id"] = napalm.base.helpers.ip(
+                    vrf_data["routerId"]
+                )
+
         if "default" in bgp_counters:
             bgp_counters["global"] = bgp_counters.pop("default")
         return dict(bgp_counters)


Test patch:
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue1168/expected_result.json b/test/eos/mocked_data/test_get_bgp_neighbors/issue1168/expected_result.json
deleted file mode 100644
index a22cd863..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue1168/expected_result.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "global": {
-    "router_id": "192.168.56.3",
-    "peers": {
-      "192.168.56.4": {
-        "is_enabled": true,
-        "uptime": "...",
-        "remote_as": 65001,
-        "description": "",
-        "remote_id": "192.168.56.3",
-        "local_as": 65002,
-        "is_up": false,
-        "address_family": {
-          "ipv4": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          },
-          "ipv6": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          }
-        }
-      },
-      "192.168.56.2": {
-        "is_enabled": true,
-        "uptime": "...",
-        "remote_as": 65002,
-        "description": "",
-        "remote_id": "192.168.56.2",
-        "local_as": 65001,
-        "is_up": true,
-        "address_family": {
-          "ipv4": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          },
-          "ipv6": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          }
-        }
-      },
-      "2001:7f8::f10:0:2": {
-        "is_enabled": true,
-        "uptime": "...",
-        "remote_as": 65002,
-        "description": "",
-        "remote_id": "192.168.56.2",
-        "local_as": 65001,
-        "is_up": true,
-        "address_family": {
-          "ipv4": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          },
-          "ipv6": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          }
-        }
-      },
-      "2001:7f8::f10:0:3": {
-        "is_enabled": true,
-        "uptime": "...",
-        "remote_as": 65001,
-        "description": "",
-        "remote_id": "192.168.56.3",
-        "local_as": 65002,
-        "is_up": false,
-        "address_family": {
-          "ipv4": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          },
-          "ipv6": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue1168/show_ip_bgp_neighbors_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_r.text b/test/eos/mocked_data/test_get_bgp_neighbors/issue1168/show_ip_bgp_neighbors_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_r.text
deleted file mode 100644
index 270822d7..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue1168/show_ip_bgp_neighbors_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_r.text
+++ /dev/null
@@ -1,12 +0,0 @@
-BGP neighbor is 192.168.56.2, remote AS 65002, external link
-  BGP version 4, remote router ID 192.168.56.2, VRF default
-  BGP state is Established, up for   32d16h
-    IPv4 Unicast:           0         0
-    IPv6 Unicast:           0         0
-Local AS is 65001, local router ID 192.168.56.3
-BGP neighbor is 192.168.56.4, remote AS 65001, external link
-  BGP version 4, remote router ID 192.168.56.3, VRF default
-  BGP state is Established, up for   32d16h
-    IPv4 Unicast:           0         0
-    IPv6 Unicast:           0         0
-Local AS is 65002, local router ID 192.168.56.2
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue1168/show_ip_bgp_summary_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/issue1168/show_ip_bgp_summary_vrf_all.json
deleted file mode 100644
index 67667787..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue1168/show_ip_bgp_summary_vrf_all.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-"vrfs": {
-"default": {
-"routerId": "192.168.56.3",
-"peers": {
-"192.168.56.2": {
-"msgSent": 6,
-"inMsgQueue": 0,
-"prefixReceived": 0,
-"upDownTime": "1452680643.198489",
-"version": 4,
-"msgReceived": 5,
-"prefixAccepted": 0,
-"peerState": "Established",
-"outMsgQueue": 0,
-"underMaintenance": false,
-"asn": 65002
-},
-"192.168.56.4": {
-"msgSent": 267,
-"inMsgQueue": 0,
-"prefixReceived": 0,
-"upDownTime": "1452696202.499104",
-"version": 4,
-"msgReceived": 263,
-"prefixAccepted": 0,
-"peerState": "Active",
-"outMsgQueue": 0,
-"underMaintenance": false,
-"asn": 65001
-}
-},
-"vrf": "default",
-"asn": 65001
-}
-}
-}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue1168/show_ipv6_bgp_peers_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_rou.text b/test/eos/mocked_data/test_get_bgp_neighbors/issue1168/show_ipv6_bgp_peers_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_rou.text
deleted file mode 100644
index 6643bdc0..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue1168/show_ipv6_bgp_peers_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_rou.text
+++ /dev/null
@@ -1,12 +0,0 @@
-BGP neighbor is 2001:7f8::f10:0:2, remote AS 65002, external link
-  BGP version 4, remote router ID 192.168.56.2, VRF default
-  BGP state is Established, up for   32d16h
-    IPv4 Unicast:           0         0
-    IPv6 Unicast:           0         0
-Local AS is 65001, local router ID 192.168.56.3
-BGP neighbor is 2001:7f8::f10:0:3, remote AS 65001, external link
-  BGP version 4, remote router ID 192.168.56.3, VRF default
-  BGP state is Established, up for   32d16h
-    IPv4 Unicast:           0         0
-    IPv6 Unicast:           0         0
-Local AS is 65002, local router ID 192.168.56.2
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue1168/show_ipv6_bgp_summary_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/issue1168/show_ipv6_bgp_summary_vrf_all.json
deleted file mode 100644
index 3252cda1..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue1168/show_ipv6_bgp_summary_vrf_all.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-"vrfs": {
-"default": {
-"routerId": "192.168.56.3",
-"peers": {
-"2001:7f8::f10:0:2": {
-"msgSent": 5,
-"inMsgQueue": 0,
-"prefixReceived": 0,
-"upDownTime": "1452681618.167685",
-"version": 4,
-"msgReceived": 5,
-"prefixAccepted": 0,
-"peerState": "Established",
-"outMsgQueue": 0,
-"underMaintenance": false,
-"asn": 65002
-},
-"2001:7f8::f10:0:3": {
-"msgSent": 267,
-"inMsgQueue": 0,
-"prefixReceived": 0,
-"upDownTime": "1452696202.499104",
-"version": 4,
-"msgReceived": 263,
-"prefixAccepted": 0,
-"peerState": "Active",
-"outMsgQueue": 0,
-"underMaintenance": false,
-"asn": 65001
-}
-},
-"vrf": "default",
-"asn": 65001
-}
-}
-}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue1356/expected_result.json b/test/eos/mocked_data/test_get_bgp_neighbors/issue1356/expected_result.json
deleted file mode 100644
index 60d0b8c4..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue1356/expected_result.json
+++ /dev/null
@@ -1,841 +0,0 @@
-{
-   "RED": {
-      "peers": {
-         "10.10.10.1": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 64804,
-            "remote_id": "10.10.10.2",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 14,
-                  "received_prefixes": 2,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.3": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 65066,
-            "remote_id": "10.10.10.4",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 3,
-                  "received_prefixes": 11,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.5": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 64804,
-            "remote_id": "10.10.10.2",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 12,
-                  "received_prefixes": 2,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         }
-      },
-      "router_id": "10.10.10.7"
-   },
-   "BLUE": {
-      "peers": {
-         "10.10.10.8": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 64805,
-            "remote_id": "10.10.10.9",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 12,
-                  "received_prefixes": 2,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.10": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 64805,
-            "remote_id": "10.10.10.9",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 14,
-                  "received_prefixes": 2,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.12": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 65066,
-            "remote_id": "10.10.10.13",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 7,
-                  "received_prefixes": 7,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.14": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 65066,
-            "remote_id": "10.10.10.15",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 10,
-                  "received_prefixes": 7,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.16": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 65066,
-            "remote_id": "10.10.10.13",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 14,
-                  "received_prefixes": 7,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         }
-      },
-      "router_id": "10.10.10.18"
-   },
-   "GREEN": {
-      "peers": {
-         "10.10.10.19": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 64805,
-            "remote_id": "10.10.10.20",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 58,
-                  "received_prefixes": 8,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.21": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 64805,
-            "remote_id": "10.10.10.20",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 58,
-                  "received_prefixes": 8,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.23": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 65066,
-            "remote_id": "10.10.10.24",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 44,
-                  "received_prefixes": 44,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.25": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 65066,
-            "remote_id": "10.10.10.26",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 59,
-                  "received_prefixes": 50,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.30": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 64804,
-            "remote_id": "10.10.10.27",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 53,
-                  "received_prefixes": 8,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.31": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 65066,
-            "remote_id": "10.10.10.26",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 24,
-                  "received_prefixes": 50,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.32": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 65066,
-            "remote_id": "10.10.10.26",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 59,
-                  "received_prefixes": 50,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.33": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 64804,
-            "remote_id": "10.10.10.27",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 59,
-                  "received_prefixes": 8,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         }
-      },
-      "router_id": "10.10.10.28"
-   },
-   "global": {
-      "peers": {
-         "10.10.10.34": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 65118,
-            "remote_id": "10.10.10.29",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 4241,
-                  "received_prefixes": 1620,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.44": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 65118,
-            "remote_id": "10.10.10.35",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 3701,
-                  "received_prefixes": 1620,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.45": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 65118,
-            "remote_id": "10.10.10.39",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 3998,
-                  "received_prefixes": 1620,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.46": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 65118,
-            "remote_id": "10.10.10.38",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 3919,
-                  "received_prefixes": 1620,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.47": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 64805,
-            "remote_id": "10.10.10.48",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 4369,
-                  "received_prefixes": 4,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.57": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 64805,
-            "remote_id": "10.10.10.48",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 4368,
-                  "received_prefixes": 4,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.58": {
-            "is_up": false,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 64638,
-            "remote_id": "10.10.10.43",
-            "local_as": 65101,
-            "description": "",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.59": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 65066,
-            "remote_id": "10.10.10.37",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 4369,
-                  "received_prefixes": 2721,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.56": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 65066,
-            "remote_id": "10.10.10.37",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 3048,
-                  "received_prefixes": 2721,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.55": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 65066,
-            "remote_id": "10.10.10.37",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 4219,
-                  "received_prefixes": 2720,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.54": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 64638,
-            "remote_id": "10.10.10.43",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 4357,
-                  "received_prefixes": 14,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.53": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 65066,
-            "remote_id": "10.10.10.37",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 3119,
-                  "received_prefixes": 2721,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.52": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 64804,
-            "remote_id": "10.10.10.50",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 4366,
-                  "received_prefixes": 4,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.51": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 64804,
-            "remote_id": "10.10.10.50",
-            "local_as": 65101,
-            "description": "TEST_DESCRIPTION",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 4369,
-                  "received_prefixes": 4,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.49": {
-            "is_up": true,
-            "is_enabled": true,
-            "uptime": "...",
-            "remote_as": 64638,
-            "remote_id": "10.10.10.41",
-            "local_as": 65101,
-            "description": "",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 4369,
-                  "received_prefixes": 14,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.43": {
-            "is_up": false,
-            "uptime": 0,
-            "is_enabled": true,
-            "remote_as": 64638,
-            "remote_id": "10.10.10.43",
-            "local_as": 65101,
-            "description": "",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.41": {
-            "is_up": false,
-            "uptime": 0,
-            "is_enabled": true,
-            "remote_as": 64638,
-            "remote_id": "10.10.10.41",
-            "local_as": 65101,
-            "description": "",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.29": {
-            "is_up": false,
-            "uptime": 0,
-            "is_enabled": true,
-            "remote_as": 65118,
-            "remote_id": "10.10.10.29",
-            "local_as": 65101,
-            "description": "",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.35": {
-            "is_up": false,
-            "uptime": 0,
-            "is_enabled": true,
-            "remote_as": 65118,
-            "remote_id": "10.10.10.35",
-            "local_as": 65101,
-            "description": "",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.39": {
-            "is_up": false,
-            "uptime": 0,
-            "is_enabled": true,
-            "remote_as": 65118,
-            "remote_id": "10.10.10.39",
-            "local_as": 65101,
-            "description": "",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.38": {
-            "is_up": false,
-            "uptime": 0,
-            "is_enabled": true,
-            "remote_as": 65118,
-            "remote_id": "10.10.10.38",
-            "local_as": 65101,
-            "description": "",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.37": {
-            "is_up": false,
-            "uptime": 0,
-            "is_enabled": true,
-            "remote_as": 65066,
-            "remote_id": "10.10.10.37",
-            "local_as": 65101,
-            "description": "",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         },
-         "10.10.10.36": {
-            "is_up": false,
-            "uptime": 0,
-            "is_enabled": true,
-            "remote_as": 65066,
-            "remote_id": "10.10.10.37",
-            "local_as": 65101,
-            "description": "",
-            "address_family": {
-               "ipv4": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               },
-               "ipv6": {
-                  "sent_prefixes": 0,
-                  "received_prefixes": 0,
-                  "accepted_prefixes": -1
-               }
-            }
-         }
-      },
-      "router_id": "2.2.2.2"
-   }
-}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue1356/show_ip_bgp_neighbors_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_r.text b/test/eos/mocked_data/test_get_bgp_neighbors/issue1356/show_ip_bgp_neighbors_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_r.text
deleted file mode 100644
index e8d38e42..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue1356/show_ip_bgp_neighbors_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_r.text
+++ /dev/null
@@ -1,234 +0,0 @@
-BGP neighbor is 10.10.10.52, remote AS 64804, external link
-  BGP version 4, remote router ID 10.10.10.50, VRF default
-  BGP state is Established, up for 55d22h
-    IPv4 Unicast:                  4366         4
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.51, remote AS 64804, external link
-  BGP version 4, remote router ID 10.10.10.50, VRF default
-  BGP state is Established, up for 6d01h
-    IPv4 Unicast:                  4369         4
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.47, remote AS 64805, external link
-  BGP version 4, remote router ID 10.10.10.48, VRF default
-  BGP state is Established, up for 5d23h
-    IPv4 Unicast:                  4369         4
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.57, remote AS 64805, external link
-  BGP version 4, remote router ID 10.10.10.48, VRF default
-  BGP state is Established, up for 5d23h
-    IPv4 Unicast:                  4368         4
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.43, remote AS 64638, external link
-  BGP version 4, remote router ID 10.10.10.43, VRF default
-  BGP state is Established, up for 49d06h
-    IPv4 Unicast:                     0         0
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.41, remote AS 64638, external link
-  BGP version 4, remote router ID 10.10.10.41, VRF default
-  BGP state is Established, up for 22:42:48
-    IPv4 Unicast:                     0         0
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.29, remote AS 65118, external link
-  BGP version 4, remote router ID 10.10.10.29, VRF default
-  BGP state is Established, up for 97d08h
-    IPv4 Unicast:                     0         0
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.35, remote AS 65118, external link
-  BGP version 4, remote router ID 10.10.10.35, VRF default
-  BGP state is Established, up for 134d05h
-    IPv4 Unicast:                     0         0
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.39, remote AS 65118, external link
-  BGP version 4, remote router ID 10.10.10.39, VRF default
-  BGP state is Established, up for 82d03h
-    IPv4 Unicast:                     0         0
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.38, remote AS 65118, external link
-  BGP version 4, remote router ID 10.10.10.38, VRF default
-  BGP state is Established, up for 128d07h
-    IPv4 Unicast:                     0         0
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.34, remote AS 65118, external link
-  BGP version 4, remote router ID 10.10.10.29, VRF default
-  BGP state is Established, up for 4d06h
-    IPv4 Unicast:                  4241      1620
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.44, remote AS 65118, external link
-  BGP version 4, remote router ID 10.10.10.35, VRF default
-  BGP state is Established, up for 81d08h
-    IPv4 Unicast:                  3701      1620
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.45, remote AS 65118, external link
-  BGP version 4, remote router ID 10.10.10.39, VRF default
-  BGP state is Established, up for 81d08h
-    IPv4 Unicast:                  3998      1620
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.46, remote AS 65118, external link
-  BGP version 4, remote router ID 10.10.10.38, VRF default
-  BGP state is Established, up for 124d02h
-    IPv4 Unicast:                  3919      1620
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.58, remote AS 64638, external link
-  BGP version 4, remote router ID 10.10.10.43, VRF default
-  BGP state is Idle, Could not find interface for peer
-    IPv4 Unicast:                     0         0
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.49, remote AS 64638, external link
-  BGP version 4, remote router ID 10.10.10.41, VRF default
-  BGP state is Established, up for 22:44:04
-    IPv4 Unicast:                  4369        14
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.54, remote AS 64638, external link
-  BGP version 4, remote router ID 10.10.10.43, VRF default
-  BGP state is Established, up for 6d02h
-    IPv4 Unicast:                  4357        14
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.37, remote AS 65066, external link
-  BGP version 4, remote router ID 10.10.10.37, VRF default
-  BGP state is Established, up for 96d00h
-    IPv4 Unicast:                     0         0
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.36, remote AS 65066, external link
-  BGP version 4, remote router ID 10.10.10.37, VRF default
-  BGP state is Established, up for 90d07h
-    IPv4 Unicast:                     0         0
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.53, remote AS 65066, external link
-  BGP version 4, remote router ID 10.10.10.37, VRF default
-  BGP state is Established, up for 81d07h
-    IPv4 Unicast:                  3119      2721
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.59, remote AS 65066, external link
-  BGP version 4, remote router ID 10.10.10.37, VRF default
-  BGP state is Established, up for 22d00h
-    IPv4 Unicast:                  4369      2721
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.56, remote AS 65066, external link
-  BGP version 4, remote router ID 10.10.10.37, VRF default
-  BGP state is Established, up for 62d07h
-    IPv4 Unicast:                  3048      2721
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.55, remote AS 65066, external link
-  BGP version 4, remote router ID 10.10.10.37, VRF default
-  BGP state is Established, up for 62d07h
-    IPv4 Unicast:                  4219      2720
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 2.2.2.2
-BGP neighbor is 10.10.10.8, remote AS 64805, external link
-  BGP version 4, remote router ID 10.10.10.9, VRF BLUE
-  BGP state is Established, up for 5d23h
-    IPv4 Unicast:                    12         2
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 10.10.10.18
-BGP neighbor is 10.10.10.10, remote AS 64805, external link
-  BGP version 4, remote router ID 10.10.10.9, VRF BLUE
-  BGP state is Established, up for 5d23h
-    IPv4 Unicast:                    14         2
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 10.10.10.18
-BGP neighbor is 10.10.10.16, remote AS 65066, external link
-  BGP version 4, remote router ID 10.10.10.13, VRF BLUE
-  BGP state is Established, up for 22d00h
-    IPv4 Unicast:                    14         7
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 10.10.10.18
-BGP neighbor is 10.10.10.12, remote AS 65066, external link
-  BGP version 4, remote router ID 10.10.10.13, VRF BLUE
-  BGP state is Established, up for 60d02h
-    IPv4 Unicast:                     7         7
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 10.10.10.18
-BGP neighbor is 10.10.10.14, remote AS 65066, external link
-  BGP version 4, remote router ID 10.10.10.15, VRF BLUE
-  BGP state is Established, up for 60d02h
-    IPv4 Unicast:                    10         7
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 10.10.10.18
-BGP neighbor is 10.10.10.30, remote AS 64804, external link
-  BGP version 4, remote router ID 10.10.10.27, VRF GREEN
-  BGP state is Established, up for 55d22h
-    IPv4 Unicast:                    53         8
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 10.10.10.28
-BGP neighbor is 10.10.10.33, remote AS 64804, external link
-  BGP version 4, remote router ID 10.10.10.27, VRF GREEN
-  BGP state is Established, up for 6d01h
-    IPv4 Unicast:                    59         8
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 10.10.10.28
-BGP neighbor is 10.10.10.21, remote AS 64805, external link
-  BGP version 4, remote router ID 10.10.10.20, VRF GREEN
-  BGP state is Established, up for 5d23h
-    IPv4 Unicast:                    58         8
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 10.10.10.28
-BGP neighbor is 10.10.10.19, remote AS 64805, external link
-  BGP version 4, remote router ID 10.10.10.20, VRF GREEN
-  BGP state is Established, up for 5d23h
-    IPv4 Unicast:                    58         8
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 10.10.10.28
-BGP neighbor is 10.10.10.31, remote AS 65066, external link
-  BGP version 4, remote router ID 10.10.10.26, VRF GREEN
-  BGP state is Established, up for 60d02h
-    IPv4 Unicast:                    24        50
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 10.10.10.28
-BGP neighbor is 10.10.10.32, remote AS 65066, external link
-  BGP version 4, remote router ID 10.10.10.26, VRF GREEN
-  BGP state is Established, up for 22d00h
-    IPv4 Unicast:                    59        50
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 10.10.10.28
-BGP neighbor is 10.10.10.25, remote AS 65066, external link
-  BGP version 4, remote router ID 10.10.10.26, VRF GREEN
-  BGP state is Established, up for 60d02h
-    IPv4 Unicast:                    59        50
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 10.10.10.28
-BGP neighbor is 10.10.10.23, remote AS 65066, external link
-  BGP version 4, remote router ID 10.10.10.24, VRF GREEN
-  BGP state is Established, up for 60d02h
-    IPv4 Unicast:                    44        44
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 10.10.10.28
-BGP neighbor is 10.10.10.5, remote AS 64804, external link
-  BGP version 4, remote router ID 10.10.10.2, VRF RED
-  BGP state is Established, up for 55d22h
-    IPv4 Unicast:                    12         2
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 10.10.10.7
-BGP neighbor is 10.10.10.1, remote AS 64804, external link
-  BGP version 4, remote router ID 10.10.10.2, VRF RED
-  BGP state is Established, up for 6d01h
-    IPv4 Unicast:                    14         2
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 10.10.10.7
-BGP neighbor is 10.10.10.3, remote AS 65066, external link
-  BGP version 4, remote router ID 10.10.10.4, VRF RED
-  BGP state is Established, up for 60d02h
-    IPv4 Unicast:                     3        11
-    IPv6 Unicast:                     0         0
-Local AS is 65101, local router ID 10.10.10.7
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue1356/show_ip_bgp_summary_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/issue1356/show_ip_bgp_summary_vrf_all.json
deleted file mode 100644
index 3785b964..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue1356/show_ip_bgp_summary_vrf_all.json
+++ /dev/null
@@ -1,465 +0,0 @@
-{
-    "vrfs": {
-        "RED": {
-            "routerId": "10.10.10.7",
-            "peers": {
-                "10.10.10.1": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 364186,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 2,
-                    "upDownTime": 1609977600.0,
-                    "version": 4,
-                    "prefixAccepted": 2,
-                    "msgReceived": 457251,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "64804"
-                },
-                "10.10.10.3": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 101743,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 11,
-                    "upDownTime": 1605305600.0,
-                    "version": 4,
-                    "prefixAccepted": 11,
-                    "msgReceived": 101674,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65066"
-                },
-                "10.10.10.5": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 106639,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 2,
-                    "upDownTime": 1605665792.0,
-                    "version": 4,
-                    "prefixAccepted": 2,
-                    "msgReceived": 106358,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "64804"
-                }
-            },
-            "vrf": "RED",
-            "asn": "65101"
-        },
-        "BLUE": {
-            "routerId": "10.10.10.18",
-            "peers": {
-                "10.10.10.8": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 79261,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 2,
-                    "upDownTime": 1609982208.0,
-                    "version": 4,
-                    "prefixAccepted": 2,
-                    "msgReceived": 78617,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "64805"
-                },
-                "10.10.10.10": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 79191,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 2,
-                    "upDownTime": 1609982208.0,
-                    "version": 4,
-                    "prefixAccepted": 2,
-                    "msgReceived": 78571,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "64805"
-                },
-                "10.10.10.12": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 101673,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 7,
-                    "upDownTime": 1605305600.0,
-                    "version": 4,
-                    "prefixAccepted": 7,
-                    "msgReceived": 101731,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65066"
-                },
-                "10.10.10.14": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 101697,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 7,
-                    "upDownTime": 1605306368.0,
-                    "version": 4,
-                    "prefixAccepted": 7,
-                    "msgReceived": 101696,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65066"
-                },
-                "10.10.10.16": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 101718,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 7,
-                    "upDownTime": 1608598272.0,
-                    "version": 4,
-                    "prefixAccepted": 7,
-                    "msgReceived": 101762,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65066"
-                }
-            },
-            "vrf": "BLUE",
-            "asn": "65101"
-        },
-        "GREEN": {
-            "routerId": "10.10.10.28",
-            "peers": {
-                "10.10.10.19": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 79487,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 8,
-                    "upDownTime": 1609982208.0,
-                    "version": 4,
-                    "prefixAccepted": 8,
-                    "msgReceived": 79021,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "64805"
-                },
-                "10.10.10.21": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 79500,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 8,
-                    "upDownTime": 1609982208.0,
-                    "version": 4,
-                    "prefixAccepted": 8,
-                    "msgReceived": 78944,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "64805"
-                },
-                "10.10.10.23": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 101910,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 44,
-                    "upDownTime": 1605306112.0,
-                    "version": 4,
-                    "prefixAccepted": 44,
-                    "msgReceived": 101898,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65066"
-                },
-                "10.10.10.25": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 101906,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 50,
-                    "upDownTime": 1605305216.0,
-                    "version": 4,
-                    "prefixAccepted": 50,
-                    "msgReceived": 101872,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65066"
-                },
-                "10.10.10.30": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 106865,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 8,
-                    "upDownTime": 1605665792.0,
-                    "version": 4,
-                    "prefixAccepted": 8,
-                    "msgReceived": 106462,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "64804"
-                },
-                "10.10.10.31": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 101798,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 50,
-                    "upDownTime": 1605305216.0,
-                    "version": 4,
-                    "prefixAccepted": 50,
-                    "msgReceived": 101891,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65066"
-                },
-                "10.10.10.32": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 102008,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 50,
-                    "upDownTime": 1608598272.0,
-                    "version": 4,
-                    "prefixAccepted": 50,
-                    "msgReceived": 101927,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65066"
-                },
-                "10.10.10.33": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 739925,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 8,
-                    "upDownTime": 1609977600.0,
-                    "version": 4,
-                    "prefixAccepted": 8,
-                    "msgReceived": 775079,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "64804"
-                }
-            },
-            "vrf": "GREEN",
-            "asn": "65101"
-        },
-        "default": {
-            "routerId": "2.2.2.2",
-            "peers": {
-                "10.10.10.34": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 2267110,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 1615,
-                    "upDownTime": 1610129536.0,
-                    "version": 4,
-                    "prefixAccepted": 1615,
-                    "msgReceived": 2109321,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65118"
-                },
-                "10.10.10.44": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 2148074,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 1615,
-                    "upDownTime": 1603470976.0,
-                    "version": 4,
-                    "prefixAccepted": 1615,
-                    "msgReceived": 2121077,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65118"
-                },
-                "10.10.10.45": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 2044419,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 1615,
-                    "upDownTime": 1603470208.0,
-                    "version": 4,
-                    "prefixAccepted": 1615,
-                    "msgReceived": 2108285,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65118"
-                },
-                "10.10.10.46": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 2234699,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 1615,
-                    "upDownTime": 1599775616.0,
-                    "version": 4,
-                    "prefixAccepted": 1615,
-                    "msgReceived": 2181235,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65118"
-                },
-                "10.10.10.47": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 1124065,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 4,
-                    "upDownTime": 1609982208.0,
-                    "version": 4,
-                    "prefixAccepted": 4,
-                    "msgReceived": 126715,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "64805"
-                },
-                "10.10.10.57": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 1124065,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 4,
-                    "upDownTime": 1609982208.0,
-                    "version": 4,
-                    "prefixAccepted": 4,
-                    "msgReceived": 129890,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "64805"
-                },
-                "10.10.10.58": {
-                    "msgSent": 1159191,
-                    "inMsgQueue": 0,
-                    "peerStateIdleReason": "NoInterface",
-                    "prefixReceived": 0,
-                    "upDownTime": 1609975040.0,
-                    "version": 4,
-                    "msgReceived": 757763,
-                    "prefixAccepted": 0,
-                    "peerState": "Idle",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "64638"
-                },
-                "10.10.10.59": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 2181044,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 2721,
-                    "upDownTime": 1608598272.0,
-                    "version": 4,
-                    "prefixAccepted": 2721,
-                    "msgReceived": 1728564,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65066"
-                },
-                "10.10.10.56": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 1931429,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 2721,
-                    "upDownTime": 1605115520.0,
-                    "version": 4,
-                    "prefixAccepted": 2721,
-                    "msgReceived": 1772562,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65066"
-                },
-                "10.10.10.55": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 1958057,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 2720,
-                    "upDownTime": 1605115520.0,
-                    "version": 4,
-                    "prefixAccepted": 2720,
-                    "msgReceived": 1645064,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65066"
-                },
-                "10.10.10.54": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 991398,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 14,
-                    "upDownTime": 1609972480.0,
-                    "version": 4,
-                    "prefixAccepted": 14,
-                    "msgReceived": 749926,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "64638"
-                },
-                "10.10.10.53": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 2271489,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 2721,
-                    "upDownTime": 1603473536.0,
-                    "version": 4,
-                    "prefixAccepted": 2721,
-                    "msgReceived": 2003091,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65066"
-                },
-                "10.10.10.52": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 1652455,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 4,
-                    "upDownTime": 1605665792.0,
-                    "version": 4,
-                    "prefixAccepted": 4,
-                    "msgReceived": 108253,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "64804"
-                },
-                "10.10.10.51": {
-                    "description": "TEST_DESCRIPTION",
-                    "msgSent": 5587106,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 4,
-                    "upDownTime": 1609977600.0,
-                    "version": 4,
-                    "prefixAccepted": 4,
-                    "msgReceived": 668095,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "64804"
-                },
-                "10.10.10.49": {
-                    "msgSent": 39221,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 14,
-                    "upDownTime": 1610418048.0,
-                    "version": 4,
-                    "prefixAccepted": 14,
-                    "msgReceived": 42632,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "64638"
-                }
-            },
-            "vrf": "default",
-            "asn": "65101"
-        }
-    }
-}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue1356/show_ipv6_bgp_peers_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_rou.text b/test/eos/mocked_data/test_get_bgp_neighbors/issue1356/show_ipv6_bgp_peers_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_rou.text
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue1356/show_ipv6_bgp_summary_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/issue1356/show_ipv6_bgp_summary_vrf_all.json
deleted file mode 100644
index 40ea5266..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue1356/show_ipv6_bgp_summary_vrf_all.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "vrfs": {
-        "RED": {
-            "routerId": "10.10.10.7",
-            "peers": {},
-            "vrf": "RED",
-            "asn": "65101"
-        },
-        "BLUE": {
-            "routerId": "10.10.10.18",
-            "peers": {},
-            "vrf": "BLUE",
-            "asn": "65101"
-        },
-        "GREEN": {
-            "routerId": "10.10.10.28",
-            "peers": {},
-            "vrf": "GREEN",
-            "asn": "65101"
-        },
-        "default": {
-            "routerId": "2.2.2.2",
-            "peers": {},
-            "vrf": "default",
-            "asn": "65101"
-        }
-    }
-}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/expected_result.json b/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/expected_result.json
index ee792239..0d84063f 100644
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/expected_result.json
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/expected_result.json
@@ -1,112 +1,70 @@
 {
   "global": {
     "peers": {
-      "fe80::a8c1:abff:fe0b:7b5f%Et5": {
+      "fe80::a8c1:abff:fe94:4171%Et3": {
+        "local_as": 4259973120,
+        "remote_as": 4259906564,
+        "remote_id": "172.18.4.4",
         "is_up": true,
         "is_enabled": true,
-        "uptime": "...",
         "description": "",
-        "remote_as": 4259840008,
-        "remote_id": "172.18.0.8",
-        "local_as": 4259906562,
+        "uptime": 9,
         "address_family": {
           "ipv4": {
-            "sent_prefixes": 9,
-            "received_prefixes": 2,
-            "accepted_prefixes": -1
+            "received_prefixes": 3,
+            "accepted_prefixes": 3,
+            "sent_prefixes": 9
           },
           "ipv6": {
-            "sent_prefixes": 9,
-            "received_prefixes": 2,
-            "accepted_prefixes": -1
+            "received_prefixes": 3,
+            "accepted_prefixes": 3,
+            "sent_prefixes": 9
           }
         }
       },
-      "fe80::a8c1:abff:fe27:69e9%Et2": {
+      "fe80::a8c1:abff:fea1:b618%Et2": {
+        "local_as": 4259973120,
+        "remote_as": 4259906563,
+        "remote_id": "172.18.4.3",
         "is_up": true,
         "is_enabled": true,
-        "uptime": "...",
         "description": "",
-        "remote_as": 4259973121,
-        "remote_id": "172.18.8.1",
-        "local_as": 4259906562,
+        "uptime": 9,
         "address_family": {
           "ipv4": {
-            "sent_prefixes": 9,
             "received_prefixes": 5,
-            "accepted_prefixes": -1
+            "accepted_prefixes": 5,
+            "sent_prefixes": 8
           },
           "ipv6": {
-            "sent_prefixes": 9,
             "received_prefixes": 5,
-            "accepted_prefixes": -1
+            "accepted_prefixes": 5,
+            "sent_prefixes": 8
           }
         }
       },
-      "fe80::a8c1:abff:fe35:51d9%Et1": {
+      "fe80::a8c1:abff:fedc:fb58%Et1": {
+        "local_as": 4259973120,
+        "remote_as": 4259906562,
+        "remote_id": "172.18.4.2",
         "is_up": true,
         "is_enabled": true,
-        "uptime": "...",
         "description": "",
-        "remote_as": 4259973120,
-        "remote_id": "172.18.8.0",
-        "local_as": 4259906562,
+        "uptime": 9,
         "address_family": {
           "ipv4": {
-            "sent_prefixes": 6,
-            "received_prefixes": 5,
-            "accepted_prefixes": -1
-          },
-          "ipv6": {
-            "sent_prefixes": 6,
-            "received_prefixes": 5,
-            "accepted_prefixes": -1
-          }
-        }
-      },
-      "fe80::a8c1:abff:fe5d:9706%Et4": {
-        "is_up": true,
-        "is_enabled": true,
-        "uptime": "...",
-        "description": "",
-        "remote_as": 4259840007,
-        "remote_id": "172.18.0.7",
-        "local_as": 4259906562,
-        "address_family": {
-          "ipv4": {
-            "sent_prefixes": 9,
-            "received_prefixes": 2,
-            "accepted_prefixes": -1
-          },
-          "ipv6": {
-            "sent_prefixes": 9,
-            "received_prefixes": 2,
-            "accepted_prefixes": -1
-          }
-        }
-      },
-      "fe80::a8c1:abff:fe95:fa49%Et3": {
-        "is_up": true,
-        "is_enabled": true,
-        "uptime": "...",
-        "description": "",
-        "remote_as": 4259840005,
-        "remote_id": "172.18.0.5",
-        "local_as": 4259906562,
-        "address_family": {
-          "ipv4": {
-            "sent_prefixes": 9,
-            "received_prefixes": 2,
-            "accepted_prefixes": -1
+            "received_prefixes": 6,
+            "accepted_prefixes": 6,
+            "sent_prefixes": 5
           },
           "ipv6": {
-            "sent_prefixes": 9,
-            "received_prefixes": 2,
-            "accepted_prefixes": -1
+            "received_prefixes": 6,
+            "accepted_prefixes": 6,
+            "sent_prefixes": 5
           }
         }
       }
     },
-    "router_id": "172.18.4.2"
+    "router_id": "172.18.8.0"
   }
 }
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/show_ip_bgp_neighbors_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/show_ip_bgp_neighbors_vrf_all.json
new file mode 100644
index 00000000..3022e1ca
--- /dev/null
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/show_ip_bgp_neighbors_vrf_all.json
@@ -0,0 +1,7 @@
+{
+  "vrfs": {
+    "default": {
+      "peerList": []
+    }
+  }
+}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/show_ip_bgp_neighbors_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_r.text b/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/show_ip_bgp_neighbors_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_r.text
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/show_ip_bgp_summary_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/show_ip_bgp_summary_vrf_all.json
index 0155ea42..631c9f6d 100644
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/show_ip_bgp_summary_vrf_all.json
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/show_ip_bgp_summary_vrf_all.json
@@ -1,76 +1,50 @@
 {
-    "vrfs": {
-        "default": {
-            "routerId": "172.18.4.2",
-            "peers": {
-                "fe80::a8c1:abff:fe0b:7b5f%Et5": {
-                    "msgSent": 239229,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 2,
-                    "upDownTime": 1664912777.128896,
-                    "version": 4,
-                    "prefixAccepted": 2,
-                    "msgReceived": 203694,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65000.8"
-                },
-                "fe80::a8c1:abff:fe27:69e9%Et2": {
-                    "msgSent": 11997,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 5,
-                    "upDownTime": 1664912780.356704,
-                    "version": 4,
-                    "prefixAccepted": 5,
-                    "msgReceived": 11972,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65002.2049"
-                },
-                "fe80::a8c1:abff:fe35:51d9%Et1": {
-                    "msgSent": 11984,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 5,
-                    "upDownTime": 1664912783.670673,
-                    "version": 4,
-                    "prefixAccepted": 5,
-                    "msgReceived": 11979,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65002.2048"
-                },
-                "fe80::a8c1:abff:fe5d:9706%Et4": {
-                    "msgSent": 239170,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 2,
-                    "upDownTime": 1664912777.50903,
-                    "version": 4,
-                    "prefixAccepted": 2,
-                    "msgReceived": 203718,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65000.7"
-                },
-                "fe80::a8c1:abff:fe95:fa49%Et3": {
-                    "msgSent": 239116,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 2,
-                    "upDownTime": 1664912777.604791,
-                    "version": 4,
-                    "prefixAccepted": 2,
-                    "msgReceived": 203718,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65000.5"
-                }
-            },
-            "vrf": "default",
-            "asn": "65001.1026"
+  "vrfs": {
+    "default": {
+      "vrf": "default",
+      "routerId": "172.18.8.0",
+      "asn": "65002.2048",
+      "peers": {
+        "fe80::a8c1:abff:fe94:4171%Et3": {
+          "version": 4,
+          "msgReceived": 27,
+          "msgSent": 25,
+          "inMsgQueue": 0,
+          "outMsgQueue": 0,
+          "asn": "65001.1028",
+          "prefixAccepted": 3,
+          "prefixReceived": 3,
+          "upDownTime": 1721149910.529752,
+          "underMaintenance": false,
+          "peerState": "Established"
+        },
+        "fe80::a8c1:abff:fea1:b618%Et2": {
+          "version": 4,
+          "msgReceived": 15,
+          "msgSent": 23,
+          "inMsgQueue": 0,
+          "outMsgQueue": 0,
+          "asn": "65001.1027",
+          "prefixAccepted": 5,
+          "prefixReceived": 5,
+          "upDownTime": 1721149910.47622,
+          "underMaintenance": false,
+          "peerState": "Established"
+        },
+        "fe80::a8c1:abff:fedc:fb58%Et1": {
+          "version": 4,
+          "msgReceived": 21,
+          "msgSent": 23,
+          "inMsgQueue": 0,
+          "outMsgQueue": 0,
+          "asn": "65001.1026",
+          "prefixAccepted": 6,
+          "prefixReceived": 6,
+          "upDownTime": 1721149910.456982,
+          "underMaintenance": false,
+          "peerState": "Established"
         }
+      }
     }
+  }
 }
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/show_ipv6_bgp_peers_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/show_ipv6_bgp_peers_vrf_all.json
new file mode 100644
index 00000000..04ecf83e
--- /dev/null
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/show_ipv6_bgp_peers_vrf_all.json
@@ -0,0 +1,717 @@
+{
+  "vrfs": {
+    "default": {
+      "peerList": [
+        {
+          "peerAddress": "fe80::a8c1:abff:fe94:4171%Et3",
+          "asn": "65001.1028",
+          "linkType": "external",
+          "routerId": "172.18.4.4",
+          "vrf": "default",
+          "version": 4,
+          "lldpNeighbors": [
+            {
+              "device": "node-65001.1028",
+              "description": "Arista Networks EOS version 4.30.5M-35156751.4305M (engineering build) running on an Arista cEOSLab"
+            }
+          ],
+          "peerGroupName": "LEAVES",
+          "peerFilter": "ASN4-PRIVATE",
+          "negotiatedVersion": 4,
+          "updateGroupIndex": -1,
+          "lastRcvd": 8,
+          "lastSent": 8,
+          "holdTime": 180,
+          "keepaliveTime": 60,
+          "configHoldTime": 180,
+          "configKeepaliveTime": 60,
+          "minHoldTime": 3,
+          "configMinHoldTime": 3,
+          "holdTimeLeft": 0,
+          "keepaliveTimeLeft": 0,
+          "state": "Established",
+          "establishedTime": 9,
+          "establishedTransitions": 1,
+          "lastState": "OpenConfirm",
+          "lastEvent": "RecvKeepAlive",
+          "enRRefreshstalePathRemoval": false,
+          "outboundEnRRefreshEnabled": true,
+          "neighborCapabilities": {
+            "negotiationDisabled": false,
+            "unsupportedCapReceived": false,
+            "multiprotocolCaps": {
+              "ipv4Unicast": {
+                "advertised": true,
+                "received": true,
+                "enabled": true
+              },
+              "ipv6Unicast": {
+                "advertised": true,
+                "received": true,
+                "enabled": true
+              }
+            },
+            "fourOctetAsnCap": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "routeRefreshCap": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "enhancedRouteRefreshCap": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "sendEorMessages": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "addPathsCaps": {
+              "ipv4Unicast": {
+                "receivingAddPaths": {
+                  "receiveCapabilityAdvertised": true,
+                  "sendCapabilityReceived": false,
+                  "enabled": false
+                },
+                "sendingAddPaths": {
+                  "sendCapabilityAdvertised": false,
+                  "receiveCapabilityReceived": true,
+                  "enabled": false
+                }
+              },
+              "ipv6Unicast": {
+                "receivingAddPaths": {
+                  "receiveCapabilityAdvertised": true,
+                  "sendCapabilityReceived": false,
+                  "enabled": false
+                },
+                "sendingAddPaths": {
+                  "sendCapabilityAdvertised": false,
+                  "receiveCapabilityReceived": true,
+                  "enabled": false
+                }
+              }
+            },
+            "extendedNextHopCaps": {
+              "ipv4UnicastOverIpv6": {
+                "advertised": true,
+                "received": true,
+                "enabled": true
+              }
+            }
+          },
+          "endOfRibs": {
+            "incoming": {
+              "ipv4Unicast": {
+                "status": "timeout",
+                "stalePathsDeleted": 0
+              },
+              "ipv6Unicast": {
+                "status": "timeout",
+                "stalePathsDeleted": 0
+              }
+            }
+          },
+          "nexthopLuOriginateIpv4Uni": false,
+          "thirdPartyNexthopLuOriginateIpv4Uni": false,
+          "nexthopLuOriginateLfibBackupIpForwardIpv4Uni": false,
+          "nexthopLuOriginateIpv6Uni": false,
+          "thirdPartyNexthopLuOriginateIpv6Uni": false,
+          "nexthopLuOriginateLfibBackupIpForwardIpv6Uni": false,
+          "aigpSessionIpv4Uni": false,
+          "aigpSessionIpv4LabeledUni": false,
+          "aigpSessionIpv6Uni": false,
+          "aigpSessionIpv6LabeledUni": false,
+          "fwdFailoverTriggerSessionIpv6Uni": false,
+          "fwdFailoverTriggerSessionIpv4Uni": false,
+          "outMessageStats": {
+            "opens": 1,
+            "notifications": 0,
+            "updates": 20,
+            "keepalives": 2,
+            "rtRefreshes": 0,
+            "beginOfRtRefreshes": 0,
+            "endOfRtRefreshes": 0
+          },
+          "inMessageStats": {
+            "opens": 1,
+            "notifications": 0,
+            "updates": 21,
+            "keepalives": 2,
+            "rtRefreshes": 0,
+            "beginOfRtRefreshes": 0,
+            "endOfRtRefreshes": 0
+          },
+          "sentMessages": 23,
+          "receivedMessages": 24,
+          "prefixesSent": 9,
+          "prefixesReceived": 3,
+          "v4BestPaths": 1,
+          "v4BestEcmpPaths": 0,
+          "v6PrefixesSent": 9,
+          "v6PrefixesReceived": 3,
+          "v6BestPaths": 1,
+          "v6BestEcmpPaths": 0,
+          "totalRoutesWarnLimit": 204800,
+          "maxTotalRoutes": 256000,
+          "dropStats": {
+            "inDropAsloop": 0,
+            "inDropClusterIdLoop": 0,
+            "inDropMalformedMpbgp": 0,
+            "inDropOrigId": 0,
+            "inDropNhLocal": 0,
+            "inDropNhAfV6": 0,
+            "prefixDroppedMartianV4": 0,
+            "prefixDroppedMartianV6": 0,
+            "prefixLuDroppedV4": 0,
+            "prefixLuDroppedMartianV4": 0,
+            "prefixLuDroppedV6": 0,
+            "prefixLuDroppedMartianV6": 0,
+            "prefixEvpnDroppedUnsupportedRouteType": 0,
+            "prefixBgpLsDroppedReceptionUnsupported": 0,
+            "outDropV4LocalAddr": 0,
+            "outDropV6LocalAddr": 0,
+            "prefixVpnIpv4DroppedImportMatchFailure": 0,
+            "prefixVpnIpv6DroppedImportMatchFailure": 0,
+            "prefixEvpnDroppedImportMatchFailure": 0,
+            "prefixRtMembershipDroppedLocalAsReject": 0
+          },
+          "peerInUpdateErrors": {
+            "inUpdErrWithdraw": 0,
+            "inUpdErrIgnore": 0,
+            "inUpdErrDisableAfiSafi": 0,
+            "disabledAfiSafi": "None",
+            "lastUpdErrTime": 0
+          },
+          "bgpSoftReconfigInbound": "Default",
+          "rpkiOriginValidationMethod": "disabled",
+          "rpkiOriginValidationSendExtComm": false,
+          "rpkiOriginValidationRouteMap": "",
+          "orrPosition": {},
+          "localAsn": "65002.2048",
+          "localRouterId": "172.18.8.0",
+          "ttl": 1,
+          "maxTtlHops": 255,
+          "updateSource": "fe80::a8c1:abff:fe5a:41a7",
+          "localPort": 179,
+          "remotePort": 41861,
+          "prependOwnDisabled": false,
+          "peerTcpInfo": {
+            "state": "ESTABLISHED",
+            "options": 7,
+            "sendWindowScale": 7,
+            "rcvWindowScale": 7,
+            "retransTimeout": 208000,
+            "delayedAckTimeout": 40000,
+            "maxSegmentSize": 1428,
+            "sndRtt": 5738,
+            "sndRttVariance": 10800,
+            "slowStartThreshold": 2147483647,
+            "congestionWindow": 10,
+            "rcvRtt": 955000,
+            "rcvWindow": 14400,
+            "totalRetrans": 0,
+            "outputQueueLength": 0,
+            "outputMaxQueueLength": 87040,
+            "inputQueueLength": 0,
+            "inputMaxQueueLength": 32768,
+            "connectionOptions": {
+              "timestampsEnabled": true,
+              "selectiveAcknowledgementsEnabled": true,
+              "windowScaleEnabled": true,
+              "ecnEnabled": false
+            }
+          },
+          "ifName": "Ethernet3",
+          "afiSafiInfo": {
+            "ipv4Unicast": {
+              "localNexthop": ""
+            },
+            "ipv6Unicast": {
+              "localNexthop": "fe80::a8c1:abff:fe5a:41a7"
+            }
+          }
+        },
+        {
+          "peerAddress": "fe80::a8c1:abff:fea1:b618%Et2",
+          "asn": "65001.1027",
+          "linkType": "external",
+          "routerId": "172.18.4.3",
+          "vrf": "default",
+          "version": 4,
+          "lldpNeighbors": [
+            {
+              "device": "node-65001.1027",
+              "description": "Arista Networks EOS version 4.30.5M-35156751.4305M (engineering build) running on an Arista cEOSLab"
+            }
+          ],
+          "peerGroupName": "LEAVES",
+          "peerFilter": "ASN4-PRIVATE",
+          "negotiatedVersion": 4,
+          "updateGroupIndex": -1,
+          "lastRcvd": 8,
+          "lastSent": 8,
+          "holdTime": 180,
+          "keepaliveTime": 60,
+          "configHoldTime": 180,
+          "configKeepaliveTime": 60,
+          "minHoldTime": 3,
+          "configMinHoldTime": 3,
+          "holdTimeLeft": 0,
+          "keepaliveTimeLeft": 0,
+          "state": "Established",
+          "establishedTime": 9,
+          "establishedTransitions": 1,
+          "lastState": "OpenConfirm",
+          "lastEvent": "ReapplyInboundPolicy",
+          "enRRefreshstalePathRemoval": false,
+          "outboundEnRRefreshEnabled": true,
+          "neighborCapabilities": {
+            "negotiationDisabled": false,
+            "unsupportedCapReceived": false,
+            "multiprotocolCaps": {
+              "ipv4Unicast": {
+                "advertised": true,
+                "received": true,
+                "enabled": true
+              },
+              "ipv6Unicast": {
+                "advertised": true,
+                "received": true,
+                "enabled": true
+              }
+            },
+            "fourOctetAsnCap": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "routeRefreshCap": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "enhancedRouteRefreshCap": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "sendEorMessages": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "addPathsCaps": {
+              "ipv4Unicast": {
+                "receivingAddPaths": {
+                  "receiveCapabilityAdvertised": true,
+                  "sendCapabilityReceived": false,
+                  "enabled": false
+                },
+                "sendingAddPaths": {
+                  "sendCapabilityAdvertised": false,
+                  "receiveCapabilityReceived": true,
+                  "enabled": false
+                }
+              },
+              "ipv6Unicast": {
+                "receivingAddPaths": {
+                  "receiveCapabilityAdvertised": true,
+                  "sendCapabilityReceived": false,
+                  "enabled": false
+                },
+                "sendingAddPaths": {
+                  "sendCapabilityAdvertised": false,
+                  "receiveCapabilityReceived": true,
+                  "enabled": false
+                }
+              }
+            },
+            "extendedNextHopCaps": {
+              "ipv4UnicastOverIpv6": {
+                "advertised": true,
+                "received": true,
+                "enabled": true
+              }
+            }
+          },
+          "endOfRibs": {
+            "incoming": {
+              "ipv4Unicast": {
+                "status": "received",
+                "eorReceivedTime": 1721149911.520603,
+                "stalePathsDeleted": 0
+              },
+              "ipv6Unicast": {
+                "status": "received",
+                "eorReceivedTime": 1721149911.520582,
+                "stalePathsDeleted": 0
+              }
+            }
+          },
+          "nexthopLuOriginateIpv4Uni": false,
+          "thirdPartyNexthopLuOriginateIpv4Uni": false,
+          "nexthopLuOriginateLfibBackupIpForwardIpv4Uni": false,
+          "nexthopLuOriginateIpv6Uni": false,
+          "thirdPartyNexthopLuOriginateIpv6Uni": false,
+          "nexthopLuOriginateLfibBackupIpForwardIpv6Uni": false,
+          "aigpSessionIpv4Uni": false,
+          "aigpSessionIpv4LabeledUni": false,
+          "aigpSessionIpv6Uni": false,
+          "aigpSessionIpv6LabeledUni": false,
+          "fwdFailoverTriggerSessionIpv6Uni": false,
+          "fwdFailoverTriggerSessionIpv4Uni": false,
+          "outMessageStats": {
+            "opens": 1,
+            "notifications": 0,
+            "updates": 18,
+            "keepalives": 2,
+            "rtRefreshes": 0,
+            "beginOfRtRefreshes": 0,
+            "endOfRtRefreshes": 0
+          },
+          "inMessageStats": {
+            "opens": 1,
+            "notifications": 0,
+            "updates": 10,
+            "keepalives": 2,
+            "rtRefreshes": 0,
+            "beginOfRtRefreshes": 0,
+            "endOfRtRefreshes": 0
+          },
+          "sentMessages": 21,
+          "receivedMessages": 13,
+          "prefixesSent": 8,
+          "prefixesReceived": 5,
+          "v4BestPaths": 2,
+          "v4BestEcmpPaths": 0,
+          "v6PrefixesSent": 8,
+          "v6PrefixesReceived": 5,
+          "v6BestPaths": 2,
+          "v6BestEcmpPaths": 0,
+          "totalRoutesWarnLimit": 204800,
+          "maxTotalRoutes": 256000,
+          "dropStats": {
+            "inDropAsloop": 0,
+            "inDropClusterIdLoop": 0,
+            "inDropMalformedMpbgp": 0,
+            "inDropOrigId": 0,
+            "inDropNhLocal": 0,
+            "inDropNhAfV6": 0,
+            "prefixDroppedMartianV4": 0,
+            "prefixDroppedMartianV6": 0,
+            "prefixLuDroppedV4": 0,
+            "prefixLuDroppedMartianV4": 0,
+            "prefixLuDroppedV6": 0,
+            "prefixLuDroppedMartianV6": 0,
+            "prefixEvpnDroppedUnsupportedRouteType": 0,
+            "prefixBgpLsDroppedReceptionUnsupported": 0,
+            "outDropV4LocalAddr": 0,
+            "outDropV6LocalAddr": 0,
+            "prefixVpnIpv4DroppedImportMatchFailure": 0,
+            "prefixVpnIpv6DroppedImportMatchFailure": 0,
+            "prefixEvpnDroppedImportMatchFailure": 0,
+            "prefixRtMembershipDroppedLocalAsReject": 0
+          },
+          "peerInUpdateErrors": {
+            "inUpdErrWithdraw": 0,
+            "inUpdErrIgnore": 0,
+            "inUpdErrDisableAfiSafi": 0,
+            "disabledAfiSafi": "None",
+            "lastUpdErrTime": 0
+          },
+          "bgpSoftReconfigInbound": "Default",
+          "rpkiOriginValidationMethod": "disabled",
+          "rpkiOriginValidationSendExtComm": false,
+          "rpkiOriginValidationRouteMap": "",
+          "orrPosition": {},
+          "localAsn": "65002.2048",
+          "localRouterId": "172.18.8.0",
+          "ttl": 1,
+          "maxTtlHops": 255,
+          "updateSource": "fe80::a8c1:abff:fe85:a217",
+          "localPort": 179,
+          "remotePort": 33217,
+          "prependOwnDisabled": false,
+          "peerTcpInfo": {
+            "state": "ESTABLISHED",
+            "options": 7,
+            "sendWindowScale": 7,
+            "rcvWindowScale": 7,
+            "retransTimeout": 204000,
+            "delayedAckTimeout": 40000,
+            "maxSegmentSize": 1428,
+            "sndRtt": 3481,
+            "sndRttVariance": 6449,
+            "slowStartThreshold": 2147483647,
+            "congestionWindow": 10,
+            "rcvRtt": 0,
+            "rcvWindow": 14400,
+            "totalRetrans": 0,
+            "outputQueueLength": 0,
+            "outputMaxQueueLength": 87040,
+            "inputQueueLength": 0,
+            "inputMaxQueueLength": 32768,
+            "connectionOptions": {
+              "timestampsEnabled": true,
+              "selectiveAcknowledgementsEnabled": true,
+              "windowScaleEnabled": true,
+              "ecnEnabled": false
+            }
+          },
+          "ifName": "Ethernet2",
+          "afiSafiInfo": {
+            "ipv4Unicast": {
+              "localNexthop": ""
+            },
+            "ipv6Unicast": {
+              "localNexthop": "fe80::a8c1:abff:fe85:a217"
+            }
+          }
+        },
+        {
+          "peerAddress": "fe80::a8c1:abff:fedc:fb58%Et1",
+          "asn": "65001.1026",
+          "linkType": "external",
+          "routerId": "172.18.4.2",
+          "vrf": "default",
+          "version": 4,
+          "lldpNeighbors": [
+            {
+              "device": "node-65001.1026",
+              "description": "Arista Networks EOS version 4.30.5M-35156751.4305M (engineering build) running on an Arista cEOSLab"
+            }
+          ],
+          "peerGroupName": "LEAVES",
+          "peerFilter": "ASN4-PRIVATE",
+          "negotiatedVersion": 4,
+          "updateGroupIndex": -1,
+          "lastRcvd": 8,
+          "lastSent": 8,
+          "holdTime": 180,
+          "keepaliveTime": 60,
+          "configHoldTime": 180,
+          "configKeepaliveTime": 60,
+          "minHoldTime": 3,
+          "configMinHoldTime": 3,
+          "holdTimeLeft": 0,
+          "keepaliveTimeLeft": 0,
+          "state": "Established",
+          "establishedTime": 9,
+          "establishedTransitions": 1,
+          "lastState": "OpenConfirm",
+          "lastEvent": "RecvKeepAlive",
+          "enRRefreshstalePathRemoval": false,
+          "outboundEnRRefreshEnabled": true,
+          "neighborCapabilities": {
+            "negotiationDisabled": false,
+            "unsupportedCapReceived": false,
+            "multiprotocolCaps": {
+              "ipv4Unicast": {
+                "advertised": true,
+                "received": true,
+                "enabled": true
+              },
+              "ipv6Unicast": {
+                "advertised": true,
+                "received": true,
+                "enabled": true
+              }
+            },
+            "fourOctetAsnCap": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "routeRefreshCap": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "enhancedRouteRefreshCap": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "sendEorMessages": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "addPathsCaps": {
+              "ipv4Unicast": {
+                "receivingAddPaths": {
+                  "receiveCapabilityAdvertised": true,
+                  "sendCapabilityReceived": false,
+                  "enabled": false
+                },
+                "sendingAddPaths": {
+                  "sendCapabilityAdvertised": false,
+                  "receiveCapabilityReceived": true,
+                  "enabled": false
+                }
+              },
+              "ipv6Unicast": {
+                "receivingAddPaths": {
+                  "receiveCapabilityAdvertised": true,
+                  "sendCapabilityReceived": false,
+                  "enabled": false
+                },
+                "sendingAddPaths": {
+                  "sendCapabilityAdvertised": false,
+                  "receiveCapabilityReceived": true,
+                  "enabled": false
+                }
+              }
+            },
+            "extendedNextHopCaps": {
+              "ipv4UnicastOverIpv6": {
+                "advertised": true,
+                "received": true,
+                "enabled": true
+              }
+            }
+          },
+          "endOfRibs": {
+            "incoming": {
+              "ipv4Unicast": {
+                "status": "received",
+                "eorReceivedTime": 1721149911.53437,
+                "stalePathsDeleted": 0
+              },
+              "ipv6Unicast": {
+                "status": "received",
+                "eorReceivedTime": 1721149911.534352,
+                "stalePathsDeleted": 0
+              }
+            }
+          },
+          "nexthopLuOriginateIpv4Uni": false,
+          "thirdPartyNexthopLuOriginateIpv4Uni": false,
+          "nexthopLuOriginateLfibBackupIpForwardIpv4Uni": false,
+          "nexthopLuOriginateIpv6Uni": false,
+          "thirdPartyNexthopLuOriginateIpv6Uni": false,
+          "nexthopLuOriginateLfibBackupIpForwardIpv6Uni": false,
+          "aigpSessionIpv4Uni": false,
+          "aigpSessionIpv4LabeledUni": false,
+          "aigpSessionIpv6Uni": false,
+          "aigpSessionIpv6LabeledUni": false,
+          "fwdFailoverTriggerSessionIpv6Uni": false,
+          "fwdFailoverTriggerSessionIpv4Uni": false,
+          "outMessageStats": {
+            "opens": 1,
+            "notifications": 0,
+            "updates": 18,
+            "keepalives": 2,
+            "rtRefreshes": 0,
+            "beginOfRtRefreshes": 0,
+            "endOfRtRefreshes": 0
+          },
+          "inMessageStats": {
+            "opens": 1,
+            "notifications": 0,
+            "updates": 16,
+            "keepalives": 2,
+            "rtRefreshes": 0,
+            "beginOfRtRefreshes": 0,
+            "endOfRtRefreshes": 0
+          },
+          "sentMessages": 21,
+          "receivedMessages": 19,
+          "prefixesSent": 5,
+          "prefixesReceived": 6,
+          "v4BestPaths": 5,
+          "v4BestEcmpPaths": 0,
+          "v6PrefixesSent": 5,
+          "v6PrefixesReceived": 6,
+          "v6BestPaths": 5,
+          "v6BestEcmpPaths": 0,
+          "totalRoutesWarnLimit": 204800,
+          "maxTotalRoutes": 256000,
+          "dropStats": {
+            "inDropAsloop": 0,
+            "inDropClusterIdLoop": 0,
+            "inDropMalformedMpbgp": 0,
+            "inDropOrigId": 0,
+            "inDropNhLocal": 0,
+            "inDropNhAfV6": 0,
+            "prefixDroppedMartianV4": 0,
+            "prefixDroppedMartianV6": 0,
+            "prefixLuDroppedV4": 0,
+            "prefixLuDroppedMartianV4": 0,
+            "prefixLuDroppedV6": 0,
+            "prefixLuDroppedMartianV6": 0,
+            "prefixEvpnDroppedUnsupportedRouteType": 0,
+            "prefixBgpLsDroppedReceptionUnsupported": 0,
+            "outDropV4LocalAddr": 0,
+            "outDropV6LocalAddr": 0,
+            "prefixVpnIpv4DroppedImportMatchFailure": 0,
+            "prefixVpnIpv6DroppedImportMatchFailure": 0,
+            "prefixEvpnDroppedImportMatchFailure": 0,
+            "prefixRtMembershipDroppedLocalAsReject": 0
+          },
+          "peerInUpdateErrors": {
+            "inUpdErrWithdraw": 0,
+            "inUpdErrIgnore": 0,
+            "inUpdErrDisableAfiSafi": 0,
+            "disabledAfiSafi": "None",
+            "lastUpdErrTime": 0
+          },
+          "bgpSoftReconfigInbound": "Default",
+          "rpkiOriginValidationMethod": "disabled",
+          "rpkiOriginValidationSendExtComm": false,
+          "rpkiOriginValidationRouteMap": "",
+          "orrPosition": {},
+          "localAsn": "65002.2048",
+          "localRouterId": "172.18.8.0",
+          "ttl": 1,
+          "maxTtlHops": 255,
+          "updateSource": "fe80::a8c1:abff:fece:2f12",
+          "localPort": 46863,
+          "remotePort": 179,
+          "prependOwnDisabled": false,
+          "peerTcpInfo": {
+            "state": "ESTABLISHED",
+            "options": 7,
+            "sendWindowScale": 7,
+            "rcvWindowScale": 7,
+            "retransTimeout": 208000,
+            "delayedAckTimeout": 40000,
+            "maxSegmentSize": 1428,
+            "sndRtt": 6920,
+            "sndRttVariance": 12272,
+            "slowStartThreshold": 2147483647,
+            "congestionWindow": 10,
+            "rcvRtt": 0,
+            "rcvWindow": 14280,
+            "totalRetrans": 0,
+            "outputQueueLength": 0,
+            "outputMaxQueueLength": 87040,
+            "inputQueueLength": 0,
+            "inputMaxQueueLength": 32768,
+            "connectionOptions": {
+              "timestampsEnabled": true,
+              "selectiveAcknowledgementsEnabled": true,
+              "windowScaleEnabled": true,
+              "ecnEnabled": false
+            }
+          },
+          "ifName": "Ethernet1",
+          "afiSafiInfo": {
+            "ipv4Unicast": {
+              "localNexthop": ""
+            },
+            "ipv6Unicast": {
+              "localNexthop": "fe80::a8c1:abff:fece:2f12"
+            }
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/show_ipv6_bgp_peers_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_rou.text b/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/show_ipv6_bgp_peers_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_rou.text
deleted file mode 100644
index f1d5ed37..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/show_ipv6_bgp_peers_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_rou.text
+++ /dev/null
@@ -1,30 +0,0 @@
-BGP neighbor is fe80::a8c1:abff:fe0b:7b5f%Et5, remote AS 65000.8, external link
-  BGP version 4, remote router ID 172.18.0.8, VRF default
-  BGP state is Established, up for 7d01h
-    IPv4 Unicast:                     9         2              1                   0
-    IPv6 Unicast:                     9         2              1                   0
-Local AS is 65001.1026, local router ID 172.18.4.2
-BGP neighbor is fe80::a8c1:abff:fe27:69e9%Et2, remote AS 65002.2049, external link
-  BGP version 4, remote router ID 172.18.8.1, VRF default
-  BGP state is Established, up for 7d01h
-    IPv4 Unicast:                     9         5              1                   0
-    IPv6 Unicast:                     9         5              1                   0
-Local AS is 65001.1026, local router ID 172.18.4.2
-BGP neighbor is fe80::a8c1:abff:fe35:51d9%Et1, remote AS 65002.2048, external link
-  BGP version 4, remote router ID 172.18.8.0, VRF default
-  BGP state is Established, up for 7d01h
-    IPv4 Unicast:                     6         5              4                   0
-    IPv6 Unicast:                     6         5              4                   0
-Local AS is 65001.1026, local router ID 172.18.4.2
-BGP neighbor is fe80::a8c1:abff:fe5d:9706%Et4, remote AS 65000.7, external link
-  BGP version 4, remote router ID 172.18.0.7, VRF default
-  BGP state is Established, up for 7d01h
-    IPv4 Unicast:                     9         2              1                   0
-    IPv6 Unicast:                     9         2              1                   0
-Local AS is 65001.1026, local router ID 172.18.4.2
-BGP neighbor is fe80::a8c1:abff:fe95:fa49%Et3, remote AS 65000.5, external link
-  BGP version 4, remote router ID 172.18.0.5, VRF default
-  BGP state is Established, up for 7d01h
-    IPv4 Unicast:                     9         2              1                   0
-    IPv6 Unicast:                     9         2              1                   0
-Local AS is 65001.1026, local router ID 172.18.4.2
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/show_ipv6_bgp_summary_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/show_ipv6_bgp_summary_vrf_all.json
index aa96e6d4..b4ddc4c9 100644
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/show_ipv6_bgp_summary_vrf_all.json
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/issue1759/show_ipv6_bgp_summary_vrf_all.json
@@ -1,76 +1,50 @@
 {
-    "vrfs": {
-        "default": {
-            "routerId": "172.18.4.2",
-            "peers": {
-                "fe80::a8c1:abff:fe0b:7b5f%Et5": {
-                    "msgSent": 239193,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 2,
-                    "upDownTime": 1664912777.128896,
-                    "version": 4,
-                    "prefixAccepted": 2,
-                    "msgReceived": 203664,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65000.8"
-                },
-                "fe80::a8c1:abff:fe27:69e9%Et2": {
-                    "msgSent": 11995,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 5,
-                    "upDownTime": 1664912780.356703,
-                    "version": 4,
-                    "prefixAccepted": 5,
-                    "msgReceived": 11970,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65002.2049"
-                },
-                "fe80::a8c1:abff:fe35:51d9%Et1": {
-                    "msgSent": 11982,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 5,
-                    "upDownTime": 1664912783.670674,
-                    "version": 4,
-                    "prefixAccepted": 5,
-                    "msgReceived": 11977,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65002.2048"
-                },
-                "fe80::a8c1:abff:fe5d:9706%Et4": {
-                    "msgSent": 239135,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 2,
-                    "upDownTime": 1664912777.50903,
-                    "version": 4,
-                    "prefixAccepted": 2,
-                    "msgReceived": 203688,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65000.7"
-                },
-                "fe80::a8c1:abff:fe95:fa49%Et3": {
-                    "msgSent": 239080,
-                    "inMsgQueue": 0,
-                    "prefixReceived": 2,
-                    "upDownTime": 1664912777.604791,
-                    "version": 4,
-                    "prefixAccepted": 2,
-                    "msgReceived": 203688,
-                    "peerState": "Established",
-                    "outMsgQueue": 0,
-                    "underMaintenance": false,
-                    "asn": "65000.5"
-                }
-            },
-            "vrf": "default",
-            "asn": "65001.1026"
+  "vrfs": {
+    "default": {
+      "vrf": "default",
+      "routerId": "172.18.8.0",
+      "asn": "65002.2048",
+      "peers": {
+        "fe80::a8c1:abff:fe94:4171%Et3": {
+          "version": 4,
+          "msgReceived": 25,
+          "msgSent": 24,
+          "inMsgQueue": 0,
+          "outMsgQueue": 0,
+          "asn": "65001.1028",
+          "prefixAccepted": 3,
+          "prefixReceived": 3,
+          "upDownTime": 1721149910.529753,
+          "underMaintenance": false,
+          "peerState": "Established"
+        },
+        "fe80::a8c1:abff:fea1:b618%Et2": {
+          "version": 4,
+          "msgReceived": 14,
+          "msgSent": 22,
+          "inMsgQueue": 0,
+          "outMsgQueue": 0,
+          "asn": "65001.1027",
+          "prefixAccepted": 5,
+          "prefixReceived": 5,
+          "upDownTime": 1721149910.47622,
+          "underMaintenance": false,
+          "peerState": "Established"
+        },
+        "fe80::a8c1:abff:fedc:fb58%Et1": {
+          "version": 4,
+          "msgReceived": 20,
+          "msgSent": 22,
+          "inMsgQueue": 0,
+          "outMsgQueue": 0,
+          "asn": "65001.1026",
+          "prefixAccepted": 6,
+          "prefixReceived": 6,
+          "upDownTime": 1721149910.456982,
+          "underMaintenance": false,
+          "peerState": "Established"
         }
+      }
     }
+  }
 }
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue58_neighbor_down/expected_result.json b/test/eos/mocked_data/test_get_bgp_neighbors/issue58_neighbor_down/expected_result.json
deleted file mode 100644
index 26963dca..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue58_neighbor_down/expected_result.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "global": {
-    "router_id": "192.168.56.3",
-    "peers": {
-      "192.168.56.4": {
-        "is_enabled": true,
-        "uptime": "...",
-        "remote_as": 65001,
-        "description": "",
-        "remote_id": "192.168.56.3",
-        "local_as": 65002,
-        "is_up": false,
-        "address_family": {
-          "ipv4": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          },
-          "ipv6": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          }
-        }
-      },
-      "192.168.56.2": {
-        "is_enabled": true,
-        "uptime": "...",
-        "remote_as": 65002,
-        "description": "",
-        "remote_id": "192.168.56.2",
-        "local_as": 65001,
-        "is_up": true,
-        "address_family": {
-          "ipv4": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          },
-          "ipv6": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          }
-        }
-      },
-      "2001:7f8::f10:0:2": {
-        "is_enabled": true,
-        "uptime": "...",
-        "remote_as": 65002,
-        "description": "",
-        "remote_id": "192.168.56.2",
-        "local_as": 65001,
-        "is_up": true,
-        "address_family": {
-          "ipv4": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          },
-          "ipv6": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          }
-        }
-      },
-      "2001:7f8::f10:0:3": {
-        "is_enabled": true,
-        "uptime": 0,
-        "remote_as": 65001,
-        "description": "",
-        "remote_id": "192.168.56.3",
-        "local_as": 65002,
-        "is_up": false,
-        "address_family": {
-          "ipv4": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          },
-          "ipv6": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue58_neighbor_down/show_ip_bgp_neighbors_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_r.text b/test/eos/mocked_data/test_get_bgp_neighbors/issue58_neighbor_down/show_ip_bgp_neighbors_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_r.text
deleted file mode 100644
index 270822d7..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue58_neighbor_down/show_ip_bgp_neighbors_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_r.text
+++ /dev/null
@@ -1,12 +0,0 @@
-BGP neighbor is 192.168.56.2, remote AS 65002, external link
-  BGP version 4, remote router ID 192.168.56.2, VRF default
-  BGP state is Established, up for   32d16h
-    IPv4 Unicast:           0         0
-    IPv6 Unicast:           0         0
-Local AS is 65001, local router ID 192.168.56.3
-BGP neighbor is 192.168.56.4, remote AS 65001, external link
-  BGP version 4, remote router ID 192.168.56.3, VRF default
-  BGP state is Established, up for   32d16h
-    IPv4 Unicast:           0         0
-    IPv6 Unicast:           0         0
-Local AS is 65002, local router ID 192.168.56.2
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue58_neighbor_down/show_ip_bgp_summary_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/issue58_neighbor_down/show_ip_bgp_summary_vrf_all.json
deleted file mode 100644
index 850feca5..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue58_neighbor_down/show_ip_bgp_summary_vrf_all.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-"vrfs": {
-"default": {
-"routerId": "192.168.56.3",
-"peers": {
-"192.168.56.2": {
-"msgSent": 6,
-"inMsgQueue": 0,
-"prefixReceived": 0,
-"upDownTime": 1452680643.198489,
-"version": 4,
-"msgReceived": 5,
-"prefixAccepted": 0,
-"peerState": "Established",
-"outMsgQueue": 0,
-"underMaintenance": false,
-"asn": 65002
-},
-"192.168.56.4": {
-"msgSent": 267,
-"inMsgQueue": 0,
-"prefixReceived": 0,
-"upDownTime": 1452696202.499104,
-"version": 4,
-"msgReceived": 263,
-"prefixAccepted": 0,
-"peerState": "Active",
-"outMsgQueue": 0,
-"underMaintenance": false,
-"asn": 65001
-}
-},
-"vrf": "default",
-"asn": 65001
-}
-}
-}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue58_neighbor_down/show_ipv6_bgp_peers_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_rou.text b/test/eos/mocked_data/test_get_bgp_neighbors/issue58_neighbor_down/show_ipv6_bgp_peers_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_rou.text
deleted file mode 100644
index 6643bdc0..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue58_neighbor_down/show_ipv6_bgp_peers_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_rou.text
+++ /dev/null
@@ -1,12 +0,0 @@
-BGP neighbor is 2001:7f8::f10:0:2, remote AS 65002, external link
-  BGP version 4, remote router ID 192.168.56.2, VRF default
-  BGP state is Established, up for   32d16h
-    IPv4 Unicast:           0         0
-    IPv6 Unicast:           0         0
-Local AS is 65001, local router ID 192.168.56.3
-BGP neighbor is 2001:7f8::f10:0:3, remote AS 65001, external link
-  BGP version 4, remote router ID 192.168.56.3, VRF default
-  BGP state is Established, up for   32d16h
-    IPv4 Unicast:           0         0
-    IPv6 Unicast:           0         0
-Local AS is 65002, local router ID 192.168.56.2
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue58_neighbor_down/show_ipv6_bgp_summary_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/issue58_neighbor_down/show_ipv6_bgp_summary_vrf_all.json
deleted file mode 100644
index 08e5e5c4..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue58_neighbor_down/show_ipv6_bgp_summary_vrf_all.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-"vrfs": {
-"default": {
-"routerId": "192.168.56.3",
-"peers": {
-"2001:7f8::f10:0:2": {
-"msgSent": 5,
-"inMsgQueue": 0,
-"prefixReceived": 0,
-"upDownTime": 1452681618.167685,
-"version": 4,
-"msgReceived": 5,
-"prefixAccepted": 0,
-"peerState": "Established",
-"outMsgQueue": 0,
-"underMaintenance": false,
-"asn": 65002
-}
-},
-"vrf": "default",
-"asn": 65001
-}
-}
-}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue944/expected_result.json b/test/eos/mocked_data/test_get_bgp_neighbors/issue944/expected_result.json
deleted file mode 100644
index a22cd863..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue944/expected_result.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "global": {
-    "router_id": "192.168.56.3",
-    "peers": {
-      "192.168.56.4": {
-        "is_enabled": true,
-        "uptime": "...",
-        "remote_as": 65001,
-        "description": "",
-        "remote_id": "192.168.56.3",
-        "local_as": 65002,
-        "is_up": false,
-        "address_family": {
-          "ipv4": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          },
-          "ipv6": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          }
-        }
-      },
-      "192.168.56.2": {
-        "is_enabled": true,
-        "uptime": "...",
-        "remote_as": 65002,
-        "description": "",
-        "remote_id": "192.168.56.2",
-        "local_as": 65001,
-        "is_up": true,
-        "address_family": {
-          "ipv4": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          },
-          "ipv6": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          }
-        }
-      },
-      "2001:7f8::f10:0:2": {
-        "is_enabled": true,
-        "uptime": "...",
-        "remote_as": 65002,
-        "description": "",
-        "remote_id": "192.168.56.2",
-        "local_as": 65001,
-        "is_up": true,
-        "address_family": {
-          "ipv4": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          },
-          "ipv6": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          }
-        }
-      },
-      "2001:7f8::f10:0:3": {
-        "is_enabled": true,
-        "uptime": "...",
-        "remote_as": 65001,
-        "description": "",
-        "remote_id": "192.168.56.3",
-        "local_as": 65002,
-        "is_up": false,
-        "address_family": {
-          "ipv4": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          },
-          "ipv6": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue944/show_ip_bgp_neighbors_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_r.text b/test/eos/mocked_data/test_get_bgp_neighbors/issue944/show_ip_bgp_neighbors_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_r.text
deleted file mode 100644
index 577f118a..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue944/show_ip_bgp_neighbors_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_r.text
+++ /dev/null
@@ -1,12 +0,0 @@
-BGP neighbor is 192.168.56.2, remote AS 65002, external link
-  BGP version 4, remote router ID 192.168.56.2, VRF default
-  BGP state is Established, up for   32d16h
-    IPv4 Unicast:           0         0
-    IPv6 6PE:               0         0
-Local AS is 65001, local router ID 192.168.56.3
-BGP neighbor is 192.168.56.4, remote AS 65001, external link
-  BGP version 4, remote router ID 192.168.56.3, VRF default
-  BGP state is Established, up for   32d16h
-    IPv4 Unicast:           0         0
-    IPv6 6PE:               0         0
-Local AS is 65002, local router ID 192.168.56.2
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue944/show_ip_bgp_summary_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/issue944/show_ip_bgp_summary_vrf_all.json
deleted file mode 100644
index 850feca5..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue944/show_ip_bgp_summary_vrf_all.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-"vrfs": {
-"default": {
-"routerId": "192.168.56.3",
-"peers": {
-"192.168.56.2": {
-"msgSent": 6,
-"inMsgQueue": 0,
-"prefixReceived": 0,
-"upDownTime": 1452680643.198489,
-"version": 4,
-"msgReceived": 5,
-"prefixAccepted": 0,
-"peerState": "Established",
-"outMsgQueue": 0,
-"underMaintenance": false,
-"asn": 65002
-},
-"192.168.56.4": {
-"msgSent": 267,
-"inMsgQueue": 0,
-"prefixReceived": 0,
-"upDownTime": 1452696202.499104,
-"version": 4,
-"msgReceived": 263,
-"prefixAccepted": 0,
-"peerState": "Active",
-"outMsgQueue": 0,
-"underMaintenance": false,
-"asn": 65001
-}
-},
-"vrf": "default",
-"asn": 65001
-}
-}
-}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue944/show_ipv6_bgp_peers_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_rou.text b/test/eos/mocked_data/test_get_bgp_neighbors/issue944/show_ipv6_bgp_peers_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_rou.text
deleted file mode 100644
index 6643bdc0..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue944/show_ipv6_bgp_peers_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_rou.text
+++ /dev/null
@@ -1,12 +0,0 @@
-BGP neighbor is 2001:7f8::f10:0:2, remote AS 65002, external link
-  BGP version 4, remote router ID 192.168.56.2, VRF default
-  BGP state is Established, up for   32d16h
-    IPv4 Unicast:           0         0
-    IPv6 Unicast:           0         0
-Local AS is 65001, local router ID 192.168.56.3
-BGP neighbor is 2001:7f8::f10:0:3, remote AS 65001, external link
-  BGP version 4, remote router ID 192.168.56.3, VRF default
-  BGP state is Established, up for   32d16h
-    IPv4 Unicast:           0         0
-    IPv6 Unicast:           0         0
-Local AS is 65002, local router ID 192.168.56.2
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/issue944/show_ipv6_bgp_summary_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/issue944/show_ipv6_bgp_summary_vrf_all.json
deleted file mode 100644
index a68112c2..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/issue944/show_ipv6_bgp_summary_vrf_all.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-"vrfs": {
-"default": {
-"routerId": "192.168.56.3",
-"peers": {
-"2001:7f8::f10:0:2": {
-"msgSent": 5,
-"inMsgQueue": 0,
-"prefixReceived": 0,
-"upDownTime": 1452681618.167685,
-"version": 4,
-"msgReceived": 5,
-"prefixAccepted": 0,
-"peerState": "Established",
-"outMsgQueue": 0,
-"underMaintenance": false,
-"asn": 65002
-},
-"2001:7f8::f10:0:3": {
-"msgSent": 267,
-"inMsgQueue": 0,
-"prefixReceived": 0,
-"upDownTime": 1452696202.499104,
-"version": 4,
-"msgReceived": 263,
-"prefixAccepted": 0,
-"peerState": "Active",
-"outMsgQueue": 0,
-"underMaintenance": false,
-"asn": 65001
-}
-},
-"vrf": "default",
-"asn": 65001
-}
-}
-}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/nobgp/expected_result.json b/test/eos/mocked_data/test_get_bgp_neighbors/nobgp/expected_result.json
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/nobgp/expected_result.json
@@ -0,0 +1,1 @@
+{}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/nobgp/show_ip_bgp_neighbors_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/nobgp/show_ip_bgp_neighbors_vrf_all.json
new file mode 100644
index 00000000..796bb60a
--- /dev/null
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/nobgp/show_ip_bgp_neighbors_vrf_all.json
@@ -0,0 +1,3 @@
+{
+  "vrfs": {}
+}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/nobgp/show_ip_bgp_summary_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/nobgp/show_ip_bgp_summary_vrf_all.json
new file mode 100644
index 00000000..796bb60a
--- /dev/null
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/nobgp/show_ip_bgp_summary_vrf_all.json
@@ -0,0 +1,3 @@
+{
+  "vrfs": {}
+}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/nobgp/show_ipv6_bgp_peers_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/nobgp/show_ipv6_bgp_peers_vrf_all.json
new file mode 100644
index 00000000..796bb60a
--- /dev/null
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/nobgp/show_ipv6_bgp_peers_vrf_all.json
@@ -0,0 +1,3 @@
+{
+  "vrfs": {}
+}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/nobgp/show_ipv6_bgp_summary_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/nobgp/show_ipv6_bgp_summary_vrf_all.json
new file mode 100644
index 00000000..796bb60a
--- /dev/null
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/nobgp/show_ipv6_bgp_summary_vrf_all.json
@@ -0,0 +1,3 @@
+{
+  "vrfs": {}
+}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/nopeers/expected_result.json b/test/eos/mocked_data/test_get_bgp_neighbors/nopeers/expected_result.json
new file mode 100644
index 00000000..ab8854f5
--- /dev/null
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/nopeers/expected_result.json
@@ -0,0 +1,6 @@
+{
+  "global": {
+    "peers": {},
+    "router_id": "192.168.0.0"
+  }
+}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/nopeers/show_ip_bgp_neighbors_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/nopeers/show_ip_bgp_neighbors_vrf_all.json
new file mode 100644
index 00000000..3022e1ca
--- /dev/null
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/nopeers/show_ip_bgp_neighbors_vrf_all.json
@@ -0,0 +1,7 @@
+{
+  "vrfs": {
+    "default": {
+      "peerList": []
+    }
+  }
+}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/nopeers/show_ip_bgp_summary_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/nopeers/show_ip_bgp_summary_vrf_all.json
new file mode 100644
index 00000000..efacff37
--- /dev/null
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/nopeers/show_ip_bgp_summary_vrf_all.json
@@ -0,0 +1,10 @@
+{
+  "vrfs": {
+    "default": {
+      "vrf": "default",
+      "routerId": "192.168.0.0",
+      "asn": "65001",
+      "peers": {}
+    }
+  }
+}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/nopeers/show_ipv6_bgp_peers_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/nopeers/show_ipv6_bgp_peers_vrf_all.json
new file mode 100644
index 00000000..3022e1ca
--- /dev/null
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/nopeers/show_ipv6_bgp_peers_vrf_all.json
@@ -0,0 +1,7 @@
+{
+  "vrfs": {
+    "default": {
+      "peerList": []
+    }
+  }
+}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/nopeers/show_ipv6_bgp_summary_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/nopeers/show_ipv6_bgp_summary_vrf_all.json
new file mode 100644
index 00000000..efacff37
--- /dev/null
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/nopeers/show_ipv6_bgp_summary_vrf_all.json
@@ -0,0 +1,10 @@
+{
+  "vrfs": {
+    "default": {
+      "vrf": "default",
+      "routerId": "192.168.0.0",
+      "asn": "65001",
+      "peers": {}
+    }
+  }
+}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/normal/expected_result.json b/test/eos/mocked_data/test_get_bgp_neighbors/normal/expected_result.json
index a22cd863..d6e527de 100644
--- a/test/eos/mocked_data/test_get_bgp_neighbors/normal/expected_result.json
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/normal/expected_result.json
@@ -1,91 +1,91 @@
 {
   "global": {
-    "router_id": "192.168.56.3",
     "peers": {
-      "192.168.56.4": {
+      "10.0.0.1": {
+        "local_as": 65001,
+        "remote_as": 65002,
+        "remote_id": "192.168.0.1",
+        "is_up": true,
         "is_enabled": true,
-        "uptime": "...",
-        "remote_as": 65001,
         "description": "",
-        "remote_id": "192.168.56.3",
-        "local_as": 65002,
-        "is_up": false,
+        "uptime": 121,
         "address_family": {
           "ipv4": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
+            "received_prefixes": 3,
+            "accepted_prefixes": 3,
+            "sent_prefixes": 4
           },
           "ipv6": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
+            "received_prefixes": 0,
+            "accepted_prefixes": 0,
+            "sent_prefixes": 0
           }
         }
       },
-      "192.168.56.2": {
+      "10.0.0.3": {
+        "local_as": 65001,
+        "remote_as": 65003,
+        "remote_id": "0.0.0.0",
+        "is_up": false,
         "is_enabled": true,
-        "uptime": "...",
-        "remote_as": 65002,
         "description": "",
-        "remote_id": "192.168.56.2",
-        "local_as": 65001,
-        "is_up": true,
+        "uptime": -1,
         "address_family": {
           "ipv4": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
+            "received_prefixes": 0,
+            "accepted_prefixes": 0,
+            "sent_prefixes": 0
           },
           "ipv6": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
+            "received_prefixes": 0,
+            "accepted_prefixes": 0,
+            "sent_prefixes": 0
           }
         }
       },
-      "2001:7f8::f10:0:2": {
-        "is_enabled": true,
-        "uptime": "...",
-        "remote_as": 65002,
-        "description": "",
-        "remote_id": "192.168.56.2",
+      "2001:fb8:100::2": {
         "local_as": 65001,
+        "remote_as": 65002,
+        "remote_id": "192.168.0.1",
         "is_up": true,
+        "is_enabled": true,
+        "description": "",
+        "uptime": 165,
         "address_family": {
           "ipv4": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
+            "received_prefixes": 0,
+            "accepted_prefixes": 0,
+            "sent_prefixes": 0
           },
           "ipv6": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
+            "received_prefixes": 3,
+            "accepted_prefixes": 3,
+            "sent_prefixes": 4
           }
         }
       },
-      "2001:7f8::f10:0:3": {
+      "2001:fb8:200::2": {
+        "local_as": 65001,
+        "remote_as": 65003,
+        "remote_id": "192.168.0.2",
+        "is_up": true,
         "is_enabled": true,
-        "uptime": "...",
-        "remote_as": 65001,
         "description": "",
-        "remote_id": "192.168.56.3",
-        "local_as": 65002,
-        "is_up": false,
+        "uptime": 165,
         "address_family": {
           "ipv4": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
+            "received_prefixes": 0,
+            "accepted_prefixes": 0,
+            "sent_prefixes": 0
           },
           "ipv6": {
-            "sent_prefixes": 0,
-            "accepted_prefixes": -1,
-            "received_prefixes": 0
+            "received_prefixes": 0,
+            "accepted_prefixes": 0,
+            "sent_prefixes": 5
           }
         }
       }
-    }
+    },
+    "router_id": "192.168.0.0"
   }
 }
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ip_bgp_neighbors_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ip_bgp_neighbors_vrf_all.json
new file mode 100644
index 00000000..8dfc4ec7
--- /dev/null
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ip_bgp_neighbors_vrf_all.json
@@ -0,0 +1,362 @@
+{
+  "vrfs": {
+    "default": {
+      "peerList": [
+        {
+          "peerAddress": "10.0.0.1",
+          "asn": "65002",
+          "linkType": "external",
+          "routerId": "192.168.0.1",
+          "vrf": "default",
+          "version": 4,
+          "negotiatedVersion": 4,
+          "updateGroupIndex": -1,
+          "lastRcvd": 32,
+          "lastSent": 31,
+          "holdTime": 180,
+          "keepaliveTime": 60,
+          "configHoldTime": 180,
+          "configKeepaliveTime": 60,
+          "minHoldTime": 3,
+          "configMinHoldTime": 3,
+          "holdTimeLeft": 0,
+          "keepaliveTimeLeft": 0,
+          "state": "Established",
+          "establishedTime": 121,
+          "establishedTransitions": 1,
+          "lastState": "OpenConfirm",
+          "lastEvent": "ReapplyInboundPolicy",
+          "enRRefreshstalePathRemoval": false,
+          "outboundEnRRefreshEnabled": true,
+          "neighborCapabilities": {
+            "negotiationDisabled": false,
+            "unsupportedCapReceived": false,
+            "multiprotocolCaps": {
+              "ipv4Unicast": {
+                "advertised": true,
+                "received": true,
+                "enabled": true
+              }
+            },
+            "fourOctetAsnCap": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "routeRefreshCap": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "enhancedRouteRefreshCap": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "sendEorMessages": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "addPathsCaps": {
+              "ipv4Unicast": {
+                "receivingAddPaths": {
+                  "receiveCapabilityAdvertised": true,
+                  "sendCapabilityReceived": false,
+                  "enabled": false
+                },
+                "sendingAddPaths": {
+                  "sendCapabilityAdvertised": false,
+                  "receiveCapabilityReceived": true,
+                  "enabled": false
+                }
+              }
+            }
+          },
+          "endOfRibs": {
+            "incoming": {
+              "ipv4Unicast": {
+                "status": "received",
+                "eorReceivedTime": 1721080528.064628,
+                "stalePathsDeleted": 0
+              }
+            }
+          },
+          "nexthopLuOriginateIpv4Uni": false,
+          "thirdPartyNexthopLuOriginateIpv4Uni": false,
+          "nexthopLuOriginateLfibBackupIpForwardIpv4Uni": false,
+          "nexthopLuOriginateIpv6Uni": false,
+          "thirdPartyNexthopLuOriginateIpv6Uni": false,
+          "nexthopLuOriginateLfibBackupIpForwardIpv6Uni": false,
+          "aigpSessionIpv4Uni": false,
+          "aigpSessionIpv4LabeledUni": false,
+          "aigpSessionIpv6Uni": false,
+          "aigpSessionIpv6LabeledUni": false,
+          "fwdFailoverTriggerSessionIpv4Uni": false,
+          "fwdFailoverTriggerSessionIpv6Uni": false,
+          "outMessageStats": {
+            "opens": 1,
+            "notifications": 0,
+            "updates": 2,
+            "keepalives": 4,
+            "rtRefreshes": 0,
+            "beginOfRtRefreshes": 0,
+            "endOfRtRefreshes": 0
+          },
+          "inMessageStats": {
+            "opens": 1,
+            "notifications": 0,
+            "updates": 2,
+            "keepalives": 4,
+            "rtRefreshes": 0,
+            "beginOfRtRefreshes": 0,
+            "endOfRtRefreshes": 0
+          },
+          "sentMessages": 7,
+          "receivedMessages": 7,
+          "prefixesSent": 4,
+          "prefixesReceived": 3,
+          "v4BestPaths": 1,
+          "v4BestEcmpPaths": 0,
+          "v6PrefixesSent": 0,
+          "v6PrefixesReceived": 0,
+          "v6BestPaths": 0,
+          "v6BestEcmpPaths": 0,
+          "totalRoutesWarnLimit": 204800,
+          "maxTotalRoutes": 256000,
+          "dropStats": {
+            "inDropAsloop": 0,
+            "inDropClusterIdLoop": 0,
+            "inDropMalformedMpbgp": 0,
+            "inDropOrigId": 0,
+            "inDropNhLocal": 0,
+            "inDropNhAfV6": 0,
+            "prefixDroppedMartianV4": 0,
+            "prefixDroppedMartianV6": 0,
+            "prefixLuDroppedV4": 0,
+            "prefixLuDroppedMartianV4": 0,
+            "prefixLuDroppedV6": 0,
+            "prefixLuDroppedMartianV6": 0,
+            "prefixEvpnDroppedUnsupportedRouteType": 0,
+            "prefixBgpLsDroppedReceptionUnsupported": 0,
+            "outDropV4LocalAddr": 0,
+            "outDropV6LocalAddr": 0,
+            "prefixVpnIpv4DroppedImportMatchFailure": 0,
+            "prefixVpnIpv6DroppedImportMatchFailure": 0,
+            "prefixEvpnDroppedImportMatchFailure": 0,
+            "prefixRtMembershipDroppedLocalAsReject": 0
+          },
+          "peerInUpdateErrors": {
+            "inUpdErrWithdraw": 0,
+            "inUpdErrIgnore": 0,
+            "inUpdErrDisableAfiSafi": 0,
+            "disabledAfiSafi": "None",
+            "lastUpdErrTime": 0
+          },
+          "bgpSoftReconfigInbound": "Default",
+          "rpkiOriginValidationMethod": "disabled",
+          "rpkiOriginValidationSendExtComm": false,
+          "rpkiOriginValidationRouteMap": "",
+          "orrPosition": {},
+          "localAsn": "65001",
+          "localRouterId": "192.168.0.0",
+          "ttl": 1,
+          "maxTtlHops": 255,
+          "updateSource": "10.0.0.0",
+          "localPort": 179,
+          "remotePort": 41273,
+          "prependOwnDisabled": false,
+          "peerTcpInfo": {
+            "state": "ESTABLISHED",
+            "options": 7,
+            "sendWindowScale": 7,
+            "rcvWindowScale": 7,
+            "retransTimeout": 208000,
+            "delayedAckTimeout": 40000,
+            "maxSegmentSize": 1448,
+            "sndRtt": 4287,
+            "sndRttVariance": 8486,
+            "slowStartThreshold": 2147483647,
+            "congestionWindow": 10,
+            "rcvRtt": 0,
+            "rcvWindow": 14600,
+            "totalRetrans": 0,
+            "outputQueueLength": 0,
+            "outputMaxQueueLength": 87040,
+            "inputQueueLength": 0,
+            "inputMaxQueueLength": 32768,
+            "connectionOptions": {
+              "timestampsEnabled": true,
+              "selectiveAcknowledgementsEnabled": true,
+              "windowScaleEnabled": true,
+              "ecnEnabled": false
+            }
+          },
+          "ifName": "Ethernet1",
+          "afiSafiInfo": {
+            "ipv4Unicast": {
+              "localNexthop": "10.0.0.0"
+            }
+          }
+        },
+        {
+          "peerAddress": "10.0.0.3",
+          "asn": "65003",
+          "linkType": "external",
+          "routerId": "0.0.0.0",
+          "vrf": "default",
+          "version": 4,
+          "negotiatedVersion": 4,
+          "updateGroupIndex": -1,
+          "lastRcvd": 21,
+          "lastSent": 21,
+          "holdTime": 0,
+          "keepaliveTime": 0,
+          "configHoldTime": 180,
+          "configKeepaliveTime": 60,
+          "minHoldTime": 3,
+          "configMinHoldTime": 3,
+          "connectTimeLeft": 0,
+          "connectInterval": 64,
+          "connectFailed": 7,
+          "state": "Active",
+          "establishFailHint": "Cease/connection rejected",
+          "establishedTransitions": 0,
+          "lastState": "Idle",
+          "lastEvent": "Start",
+          "lastErrorRcvdCode": "Cease",
+          "lastErrorRcvdSubcode": "connection rejected",
+          "lastErrorRcvdTimeInfo": {
+            "time": 21,
+            "firstTime": 121,
+            "repeats": 6
+          },
+          "neighborCapabilities": {
+            "negotiationDisabled": false,
+            "unsupportedCapReceived": false,
+            "multiprotocolCaps": {
+              "ipv4Unicast": {
+                "advertised": true,
+                "received": false,
+                "enabled": false
+              }
+            },
+            "fourOctetAsnCap": {
+              "advertised": true,
+              "received": false,
+              "enabled": false
+            },
+            "routeRefreshCap": {
+              "advertised": true,
+              "received": false,
+              "enabled": false
+            },
+            "enhancedRouteRefreshCap": {
+              "advertised": true,
+              "received": false,
+              "enabled": false
+            },
+            "sendEorMessages": {
+              "advertised": true,
+              "received": false,
+              "enabled": false
+            },
+            "addPathsCaps": {
+              "ipv4Unicast": {
+                "receivingAddPaths": {
+                  "receiveCapabilityAdvertised": true,
+                  "sendCapabilityReceived": false,
+                  "enabled": false
+                }
+              }
+            }
+          },
+          "endOfRibs": {
+            "incoming": {}
+          },
+          "nexthopLuOriginateIpv4Uni": false,
+          "thirdPartyNexthopLuOriginateIpv4Uni": false,
+          "nexthopLuOriginateLfibBackupIpForwardIpv4Uni": false,
+          "nexthopLuOriginateIpv6Uni": false,
+          "thirdPartyNexthopLuOriginateIpv6Uni": false,
+          "nexthopLuOriginateLfibBackupIpForwardIpv6Uni": false,
+          "aigpSessionIpv4Uni": false,
+          "aigpSessionIpv4LabeledUni": false,
+          "aigpSessionIpv6Uni": false,
+          "aigpSessionIpv6LabeledUni": false,
+          "fwdFailoverTriggerSessionIpv4Uni": false,
+          "fwdFailoverTriggerSessionIpv6Uni": false,
+          "outMessageStats": {
+            "opens": 7,
+            "notifications": 0,
+            "updates": 0,
+            "keepalives": 0,
+            "rtRefreshes": 0
+          },
+          "inMessageStats": {
+            "opens": 0,
+            "notifications": 7,
+            "updates": 0,
+            "keepalives": 0,
+            "rtRefreshes": 0
+          },
+          "sentMessages": 7,
+          "receivedMessages": 7,
+          "prefixesSent": 0,
+          "prefixesReceived": 0,
+          "v4BestPaths": 0,
+          "v4BestEcmpPaths": 0,
+          "v6PrefixesSent": 0,
+          "v6PrefixesReceived": 0,
+          "v6BestPaths": 0,
+          "v6BestEcmpPaths": 0,
+          "totalRoutesWarnLimit": 204800,
+          "maxTotalRoutes": 256000,
+          "dropStats": {
+            "inDropAsloop": 0,
+            "inDropClusterIdLoop": 0,
+            "inDropMalformedMpbgp": 0,
+            "inDropOrigId": 0,
+            "inDropNhLocal": 0,
+            "inDropNhAfV6": 0,
+            "prefixDroppedMartianV4": 0,
+            "prefixDroppedMartianV6": 0,
+            "prefixLuDroppedV4": 0,
+            "prefixLuDroppedMartianV4": 0,
+            "prefixLuDroppedV6": 0,
+            "prefixLuDroppedMartianV6": 0,
+            "prefixEvpnDroppedUnsupportedRouteType": 0,
+            "prefixBgpLsDroppedReceptionUnsupported": 0,
+            "outDropV4LocalAddr": 0,
+            "outDropV6LocalAddr": 0,
+            "prefixVpnIpv4DroppedImportMatchFailure": 0,
+            "prefixVpnIpv6DroppedImportMatchFailure": 0,
+            "prefixEvpnDroppedImportMatchFailure": 0,
+            "prefixRtMembershipDroppedLocalAsReject": 0
+          },
+          "peerInUpdateErrors": {
+            "inUpdErrWithdraw": 0,
+            "inUpdErrIgnore": 0,
+            "inUpdErrDisableAfiSafi": 0,
+            "disabledAfiSafi": "None",
+            "lastUpdErrTime": 0
+          },
+          "bgpSoftReconfigInbound": "Default",
+          "rpkiOriginValidationMethod": "disabled",
+          "rpkiOriginValidationSendExtComm": false,
+          "rpkiOriginValidationRouteMap": "",
+          "orrPosition": {},
+          "localAsn": "65001",
+          "localRouterId": "192.168.0.0",
+          "ttl": 1,
+          "maxTtlHops": 255,
+          "updateSource": "10.0.0.2",
+          "localPort": 0,
+          "remotePort": 179,
+          "prependOwnDisabled": false,
+          "afiSafiInfo": {}
+        }
+      ]
+    }
+  }
+}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ip_bgp_neighbors_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_r.text b/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ip_bgp_neighbors_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_r.text
deleted file mode 100644
index 270822d7..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ip_bgp_neighbors_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_r.text
+++ /dev/null
@@ -1,12 +0,0 @@
-BGP neighbor is 192.168.56.2, remote AS 65002, external link
-  BGP version 4, remote router ID 192.168.56.2, VRF default
-  BGP state is Established, up for   32d16h
-    IPv4 Unicast:           0         0
-    IPv6 Unicast:           0         0
-Local AS is 65001, local router ID 192.168.56.3
-BGP neighbor is 192.168.56.4, remote AS 65001, external link
-  BGP version 4, remote router ID 192.168.56.3, VRF default
-  BGP state is Established, up for   32d16h
-    IPv4 Unicast:           0         0
-    IPv6 Unicast:           0         0
-Local AS is 65002, local router ID 192.168.56.2
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ip_bgp_summary_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ip_bgp_summary_vrf_all.json
index 850feca5..f1aeeb25 100644
--- a/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ip_bgp_summary_vrf_all.json
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ip_bgp_summary_vrf_all.json
@@ -1,37 +1,37 @@
 {
-"vrfs": {
-"default": {
-"routerId": "192.168.56.3",
-"peers": {
-"192.168.56.2": {
-"msgSent": 6,
-"inMsgQueue": 0,
-"prefixReceived": 0,
-"upDownTime": 1452680643.198489,
-"version": 4,
-"msgReceived": 5,
-"prefixAccepted": 0,
-"peerState": "Established",
-"outMsgQueue": 0,
-"underMaintenance": false,
-"asn": 65002
-},
-"192.168.56.4": {
-"msgSent": 267,
-"inMsgQueue": 0,
-"prefixReceived": 0,
-"upDownTime": 1452696202.499104,
-"version": 4,
-"msgReceived": 263,
-"prefixAccepted": 0,
-"peerState": "Active",
-"outMsgQueue": 0,
-"underMaintenance": false,
-"asn": 65001
-}
-},
-"vrf": "default",
-"asn": 65001
-}
-}
+  "vrfs": {
+    "default": {
+      "vrf": "default",
+      "routerId": "192.168.0.0",
+      "asn": "65001",
+      "peers": {
+        "10.0.0.1": {
+          "version": 4,
+          "msgReceived": 5,
+          "msgSent": 4,
+          "inMsgQueue": 0,
+          "outMsgQueue": 0,
+          "asn": "65002",
+          "prefixAccepted": 3,
+          "prefixReceived": 3,
+          "upDownTime": 1721080527.052693,
+          "underMaintenance": false,
+          "peerState": "Established"
+        },
+        "10.0.0.3": {
+          "version": 4,
+          "msgReceived": 6,
+          "msgSent": 6,
+          "inMsgQueue": 0,
+          "outMsgQueue": 0,
+          "asn": "65003",
+          "prefixAccepted": 0,
+          "prefixReceived": 0,
+          "upDownTime": 1721080524.898363,
+          "underMaintenance": false,
+          "peerState": "Active"
+        }
+      }
+    }
+  }
 }
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ipv6_bgp_peers_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ipv6_bgp_peers_vrf_all.json
new file mode 100644
index 00000000..db83671e
--- /dev/null
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ipv6_bgp_peers_vrf_all.json
@@ -0,0 +1,415 @@
+{
+  "vrfs": {
+    "default": {
+      "peerList": [
+        {
+          "peerAddress": "2001:fb8:100::2",
+          "asn": "65002",
+          "linkType": "external",
+          "routerId": "192.168.0.1",
+          "vrf": "default",
+          "version": 4,
+          "negotiatedVersion": 4,
+          "updateGroupIndex": -1,
+          "lastRcvd": 33,
+          "lastSent": 23,
+          "holdTime": 180,
+          "keepaliveTime": 60,
+          "configHoldTime": 180,
+          "configKeepaliveTime": 60,
+          "minHoldTime": 3,
+          "configMinHoldTime": 3,
+          "holdTimeLeft": 0,
+          "keepaliveTimeLeft": 0,
+          "state": "Established",
+          "establishedTime": 165,
+          "establishedTransitions": 1,
+          "lastState": "OpenConfirm",
+          "lastEvent": "Established",
+          "lastSocketOutErrorMsg": "Bind (Cannot assign requested address)",
+          "lastSocketOutErrorTimeInfo": {
+            "time": 166
+          },
+          "enRRefreshstalePathRemoval": false,
+          "outboundEnRRefreshEnabled": true,
+          "neighborCapabilities": {
+            "negotiationDisabled": false,
+            "unsupportedCapReceived": false,
+            "multiprotocolCaps": {
+              "ipv6Unicast": {
+                "advertised": true,
+                "received": true,
+                "enabled": true
+              }
+            },
+            "fourOctetAsnCap": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "routeRefreshCap": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "enhancedRouteRefreshCap": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "sendEorMessages": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "addPathsCaps": {
+              "ipv6Unicast": {
+                "receivingAddPaths": {
+                  "receiveCapabilityAdvertised": true,
+                  "sendCapabilityReceived": false,
+                  "enabled": false
+                },
+                "sendingAddPaths": {
+                  "sendCapabilityAdvertised": false,
+                  "receiveCapabilityReceived": true,
+                  "enabled": false
+                }
+              }
+            }
+          },
+          "endOfRibs": {
+            "incoming": {
+              "ipv6Unicast": {
+                "status": "received",
+                "eorReceivedTime": 1721080528.104721,
+                "stalePathsDeleted": 0
+              }
+            }
+          },
+          "nexthopLuOriginateIpv4Uni": false,
+          "thirdPartyNexthopLuOriginateIpv4Uni": false,
+          "nexthopLuOriginateLfibBackupIpForwardIpv4Uni": false,
+          "nexthopLuOriginateIpv6Uni": false,
+          "thirdPartyNexthopLuOriginateIpv6Uni": false,
+          "nexthopLuOriginateLfibBackupIpForwardIpv6Uni": false,
+          "aigpSessionIpv4Uni": false,
+          "aigpSessionIpv4LabeledUni": false,
+          "aigpSessionIpv6Uni": false,
+          "aigpSessionIpv6LabeledUni": false,
+          "fwdFailoverTriggerSessionIpv4Uni": false,
+          "fwdFailoverTriggerSessionIpv6Uni": false,
+          "outMessageStats": {
+            "opens": 1,
+            "notifications": 0,
+            "updates": 2,
+            "keepalives": 4,
+            "rtRefreshes": 0,
+            "beginOfRtRefreshes": 0,
+            "endOfRtRefreshes": 0
+          },
+          "inMessageStats": {
+            "opens": 1,
+            "notifications": 0,
+            "updates": 2,
+            "keepalives": 5,
+            "rtRefreshes": 0,
+            "beginOfRtRefreshes": 0,
+            "endOfRtRefreshes": 0
+          },
+          "sentMessages": 7,
+          "receivedMessages": 8,
+          "prefixesSent": 0,
+          "prefixesReceived": 0,
+          "v4BestPaths": 0,
+          "v4BestEcmpPaths": 0,
+          "v6PrefixesSent": 4,
+          "v6PrefixesReceived": 3,
+          "v6BestPaths": 1,
+          "v6BestEcmpPaths": 0,
+          "totalRoutesWarnLimit": 204800,
+          "maxTotalRoutes": 256000,
+          "dropStats": {
+            "inDropAsloop": 0,
+            "inDropClusterIdLoop": 0,
+            "inDropMalformedMpbgp": 0,
+            "inDropOrigId": 0,
+            "inDropNhLocal": 0,
+            "inDropNhAfV6": 0,
+            "prefixDroppedMartianV4": 0,
+            "prefixDroppedMartianV6": 0,
+            "prefixLuDroppedV4": 0,
+            "prefixLuDroppedMartianV4": 0,
+            "prefixLuDroppedV6": 0,
+            "prefixLuDroppedMartianV6": 0,
+            "prefixEvpnDroppedUnsupportedRouteType": 0,
+            "prefixBgpLsDroppedReceptionUnsupported": 0,
+            "outDropV4LocalAddr": 0,
+            "outDropV6LocalAddr": 0,
+            "prefixVpnIpv4DroppedImportMatchFailure": 0,
+            "prefixVpnIpv6DroppedImportMatchFailure": 0,
+            "prefixEvpnDroppedImportMatchFailure": 0,
+            "prefixRtMembershipDroppedLocalAsReject": 0
+          },
+          "peerInUpdateErrors": {
+            "inUpdErrWithdraw": 0,
+            "inUpdErrIgnore": 0,
+            "inUpdErrDisableAfiSafi": 0,
+            "disabledAfiSafi": "None",
+            "lastUpdErrTime": 0
+          },
+          "bgpSoftReconfigInbound": "Default",
+          "rpkiOriginValidationMethod": "disabled",
+          "rpkiOriginValidationSendExtComm": false,
+          "rpkiOriginValidationRouteMap": "",
+          "orrPosition": {},
+          "localAsn": "65001",
+          "localRouterId": "192.168.0.0",
+          "ttl": 1,
+          "maxTtlHops": 255,
+          "updateSource": "2001:fb8:100::1",
+          "localPort": 42927,
+          "remotePort": 179,
+          "prependOwnDisabled": false,
+          "peerTcpInfo": {
+            "state": "ESTABLISHED",
+            "options": 7,
+            "sendWindowScale": 7,
+            "rcvWindowScale": 7,
+            "retransTimeout": 220000,
+            "delayedAckTimeout": 40000,
+            "maxSegmentSize": 1428,
+            "sndRtt": 19886,
+            "sndRttVariance": 18189,
+            "slowStartThreshold": 2147483647,
+            "congestionWindow": 10,
+            "rcvRtt": 0,
+            "rcvWindow": 14280,
+            "totalRetrans": 0,
+            "outputQueueLength": 0,
+            "outputMaxQueueLength": 87040,
+            "inputQueueLength": 0,
+            "inputMaxQueueLength": 32768,
+            "connectionOptions": {
+              "timestampsEnabled": true,
+              "selectiveAcknowledgementsEnabled": true,
+              "windowScaleEnabled": true,
+              "ecnEnabled": false
+            }
+          },
+          "ifName": "Ethernet1",
+          "afiSafiInfo": {
+            "ipv6Unicast": {
+              "localNexthop": "2001:fb8:100::1"
+            }
+          }
+        },
+        {
+          "peerAddress": "2001:fb8:200::2",
+          "asn": "65003",
+          "linkType": "external",
+          "routerId": "192.168.0.2",
+          "vrf": "default",
+          "version": 4,
+          "negotiatedVersion": 4,
+          "updateGroupIndex": -1,
+          "lastRcvd": 27,
+          "lastSent": 33,
+          "holdTime": 180,
+          "keepaliveTime": 60,
+          "configHoldTime": 180,
+          "configKeepaliveTime": 60,
+          "minHoldTime": 3,
+          "configMinHoldTime": 3,
+          "holdTimeLeft": 0,
+          "keepaliveTimeLeft": 0,
+          "state": "Established",
+          "establishedTime": 165,
+          "establishedTransitions": 1,
+          "lastState": "OpenConfirm",
+          "lastEvent": "Established",
+          "lastErrorCode": "Cease",
+          "lastErrorSubcode": "connection collision resolution",
+          "lastErrorTimeInfo": {
+            "time": 165
+          },
+          "lastSocketOutErrorMsg": "Bind (Cannot assign requested address)",
+          "lastSocketOutErrorTimeInfo": {
+            "time": 166
+          },
+          "enRRefreshstalePathRemoval": false,
+          "outboundEnRRefreshEnabled": true,
+          "neighborCapabilities": {
+            "negotiationDisabled": false,
+            "unsupportedCapReceived": false,
+            "multiprotocolCaps": {
+              "ipv6Unicast": {
+                "advertised": true,
+                "received": true,
+                "enabled": true
+              }
+            },
+            "fourOctetAsnCap": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "routeRefreshCap": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "enhancedRouteRefreshCap": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "sendEorMessages": {
+              "advertised": true,
+              "received": true,
+              "enabled": true
+            },
+            "addPathsCaps": {
+              "ipv6Unicast": {
+                "receivingAddPaths": {
+                  "receiveCapabilityAdvertised": true,
+                  "sendCapabilityReceived": false,
+                  "enabled": false
+                },
+                "sendingAddPaths": {
+                  "sendCapabilityAdvertised": false,
+                  "receiveCapabilityReceived": true,
+                  "enabled": false
+                }
+              }
+            }
+          },
+          "endOfRibs": {
+            "incoming": {
+              "ipv6Unicast": {
+                "status": "received",
+                "eorReceivedTime": 1721080528.112453,
+                "stalePathsDeleted": 0
+              }
+            }
+          },
+          "nexthopLuOriginateIpv4Uni": false,
+          "thirdPartyNexthopLuOriginateIpv4Uni": false,
+          "nexthopLuOriginateLfibBackupIpForwardIpv4Uni": false,
+          "nexthopLuOriginateIpv6Uni": false,
+          "thirdPartyNexthopLuOriginateIpv6Uni": false,
+          "nexthopLuOriginateLfibBackupIpForwardIpv6Uni": false,
+          "aigpSessionIpv4Uni": false,
+          "aigpSessionIpv4LabeledUni": false,
+          "aigpSessionIpv6Uni": false,
+          "aigpSessionIpv6LabeledUni": false,
+          "fwdFailoverTriggerSessionIpv4Uni": false,
+          "fwdFailoverTriggerSessionIpv6Uni": false,
+          "outMessageStats": {
+            "opens": 2,
+            "notifications": 1,
+            "updates": 3,
+            "keepalives": 5,
+            "rtRefreshes": 0,
+            "beginOfRtRefreshes": 0,
+            "endOfRtRefreshes": 0
+          },
+          "inMessageStats": {
+            "opens": 1,
+            "notifications": 0,
+            "updates": 1,
+            "keepalives": 5,
+            "rtRefreshes": 0,
+            "beginOfRtRefreshes": 0,
+            "endOfRtRefreshes": 0
+          },
+          "sentMessages": 11,
+          "receivedMessages": 7,
+          "prefixesSent": 0,
+          "prefixesReceived": 0,
+          "v4BestPaths": 0,
+          "v4BestEcmpPaths": 0,
+          "v6PrefixesSent": 5,
+          "v6PrefixesReceived": 0,
+          "v6BestPaths": 0,
+          "v6BestEcmpPaths": 0,
+          "totalRoutesWarnLimit": 204800,
+          "maxTotalRoutes": 256000,
+          "dropStats": {
+            "inDropAsloop": 0,
+            "inDropClusterIdLoop": 0,
+            "inDropMalformedMpbgp": 0,
+            "inDropOrigId": 0,
+            "inDropNhLocal": 0,
+            "inDropNhAfV6": 0,
+            "prefixDroppedMartianV4": 0,
+            "prefixDroppedMartianV6": 0,
+            "prefixLuDroppedV4": 0,
+            "prefixLuDroppedMartianV4": 0,
+            "prefixLuDroppedV6": 0,
+            "prefixLuDroppedMartianV6": 0,
+            "prefixEvpnDroppedUnsupportedRouteType": 0,
+            "prefixBgpLsDroppedReceptionUnsupported": 0,
+            "outDropV4LocalAddr": 0,
+            "outDropV6LocalAddr": 0,
+            "prefixVpnIpv4DroppedImportMatchFailure": 0,
+            "prefixVpnIpv6DroppedImportMatchFailure": 0,
+            "prefixEvpnDroppedImportMatchFailure": 0,
+            "prefixRtMembershipDroppedLocalAsReject": 0
+          },
+          "peerInUpdateErrors": {
+            "inUpdErrWithdraw": 0,
+            "inUpdErrIgnore": 0,
+            "inUpdErrDisableAfiSafi": 0,
+            "disabledAfiSafi": "None",
+            "lastUpdErrTime": 0
+          },
+          "bgpSoftReconfigInbound": "Default",
+          "rpkiOriginValidationMethod": "disabled",
+          "rpkiOriginValidationSendExtComm": false,
+          "rpkiOriginValidationRouteMap": "",
+          "orrPosition": {},
+          "localAsn": "65001",
+          "localRouterId": "192.168.0.0",
+          "ttl": 1,
+          "maxTtlHops": 255,
+          "updateSource": "2001:fb8:200::1",
+          "localPort": 179,
+          "remotePort": 33055,
+          "prependOwnDisabled": false,
+          "peerTcpInfo": {
+            "state": "ESTABLISHED",
+            "options": 7,
+            "sendWindowScale": 7,
+            "rcvWindowScale": 7,
+            "retransTimeout": 532000,
+            "delayedAckTimeout": 40000,
+            "maxSegmentSize": 1428,
+            "sndRtt": 71654,
+            "sndRttVariance": 104009,
+            "slowStartThreshold": 2147483647,
+            "congestionWindow": 10,
+            "rcvRtt": 0,
+            "rcvWindow": 14400,
+            "totalRetrans": 0,
+            "outputQueueLength": 0,
+            "outputMaxQueueLength": 87040,
+            "inputQueueLength": 0,
+            "inputMaxQueueLength": 32768,
+            "connectionOptions": {
+              "timestampsEnabled": true,
+              "selectiveAcknowledgementsEnabled": true,
+              "windowScaleEnabled": true,
+              "ecnEnabled": false
+            }
+          },
+          "ifName": "Ethernet2",
+          "afiSafiInfo": {
+            "ipv6Unicast": {
+              "localNexthop": "2001:fb8:200::1"
+            }
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ipv6_bgp_peers_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_rou.text b/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ipv6_bgp_peers_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_rou.text
deleted file mode 100644
index 6643bdc0..00000000
--- a/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ipv6_bgp_peers_vrf_all___include_IPv_46___Unicast_6PE_____0_9_____grep__v___IPv_46__Unicast_______remote_AS___Local_AS_Desc_BGP_state__remote_rou.text
+++ /dev/null
@@ -1,12 +0,0 @@
-BGP neighbor is 2001:7f8::f10:0:2, remote AS 65002, external link
-  BGP version 4, remote router ID 192.168.56.2, VRF default
-  BGP state is Established, up for   32d16h
-    IPv4 Unicast:           0         0
-    IPv6 Unicast:           0         0
-Local AS is 65001, local router ID 192.168.56.3
-BGP neighbor is 2001:7f8::f10:0:3, remote AS 65001, external link
-  BGP version 4, remote router ID 192.168.56.3, VRF default
-  BGP state is Established, up for   32d16h
-    IPv4 Unicast:           0         0
-    IPv6 Unicast:           0         0
-Local AS is 65002, local router ID 192.168.56.2
diff --git a/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ipv6_bgp_summary_vrf_all.json b/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ipv6_bgp_summary_vrf_all.json
index a68112c2..c86d7bcd 100644
--- a/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ipv6_bgp_summary_vrf_all.json
+++ b/test/eos/mocked_data/test_get_bgp_neighbors/normal/show_ipv6_bgp_summary_vrf_all.json
@@ -1,37 +1,37 @@
 {
-"vrfs": {
-"default": {
-"routerId": "192.168.56.3",
-"peers": {
-"2001:7f8::f10:0:2": {
-"msgSent": 5,
-"inMsgQueue": 0,
-"prefixReceived": 0,
-"upDownTime": 1452681618.167685,
-"version": 4,
-"msgReceived": 5,
-"prefixAccepted": 0,
-"peerState": "Established",
-"outMsgQueue": 0,
-"underMaintenance": false,
-"asn": 65002
-},
-"2001:7f8::f10:0:3": {
-"msgSent": 267,
-"inMsgQueue": 0,
-"prefixReceived": 0,
-"upDownTime": 1452696202.499104,
-"version": 4,
-"msgReceived": 263,
-"prefixAccepted": 0,
-"peerState": "Active",
-"outMsgQueue": 0,
-"underMaintenance": false,
-"asn": 65001
-}
-},
-"vrf": "default",
-"asn": 65001
-}
-}
+  "vrfs": {
+    "default": {
+      "vrf": "default",
+      "routerId": "192.168.0.0",
+      "asn": "65001",
+      "peers": {
+        "2001:fb8:100::2": {
+          "version": 4,
+          "msgReceived": 7,
+          "msgSent": 5,
+          "inMsgQueue": 0,
+          "outMsgQueue": 0,
+          "asn": "65002",
+          "prefixAccepted": 3,
+          "prefixReceived": 3,
+          "upDownTime": 1721080528.062069,
+          "underMaintenance": false,
+          "peerState": "Established"
+        },
+        "2001:fb8:200::2": {
+          "version": 4,
+          "msgReceived": 5,
+          "msgSent": 8,
+          "inMsgQueue": 0,
+          "outMsgQueue": 0,
+          "asn": "65003",
+          "prefixAccepted": 0,
+          "prefixReceived": 0,
+          "upDownTime": 1721080528.069422,
+          "underMaintenance": false,
+          "peerState": "Established"
+        }
+      }
+    }
+  }
 }