Check if BGP has Loopback0 IP as its router ID

tests/common/fixtures/advanced_reboot.py

@@ -221,6 +221,24 @@ def __buildTestbedData(self, tbinfo):
                 self.rebootData['lo_v6_prefix'] = str(ipaddress.ip_interface(intf['addr'] + '/64').network)
                 break
 
+    def __checkBgpRouterId(self, error_list):
+        """
+        Check bgp router ID is same as Loopback0
+        """
+        check_bgp_router_id_cmd = r'vtysh -c "show ip bgp summary json"'
+        bgp_summary = self.duthost.shell(check_bgp_router_id_cmd, module_ignore_errors=True)
+        bgp_summary_json = json.loads(bgp_summary['stdout'])
+        router_id = str(bgp_summary_json['ipv4Unicast']['routerId'])
+        loopback0 = str(self.mgFacts['minigraph_lo_interfaces'][0]['addr'])
+        if router_id == loopback0:
+            logger.info("BGP router identifier: %s == Loopback0 address %s" % (router_id, loopback0))
+            return True
+        else:
+            logger.info("BGP router identifier %s != Loopback0 address %s" % (router_id, loopback0))
+            error_list.append("Failed to verify BGP router identifier is Loopback0 address on %s" %
+                              self.duthost.hostname)
+            return False
+
     def __updateNextHopIps(self):
         """
         Update next hop IPs
@@ -553,6 +571,7 @@ def runRebootTest(self):
             try:
                 if self.preboot_setup:
                     self.preboot_setup()
+                self.__checkBgpRouterId(test_results[test_case_name])
                 if self.advanceboot_loganalyzer:
                     pre_reboot_analysis, post_reboot_analysis = self.advanceboot_loganalyzer
                     marker = pre_reboot_analysis()

tests/common/plugins/sanity_check/checks.py

@@ -146,7 +146,7 @@ def _check_interfaces_on_dut(*args, **kwargs):
 
 
 @pytest.fixture(scope="module")
-def check_bgp(duthosts):
+def check_bgp(duthosts, tbinfo):
     init_result = {"failed": False, "check_item": "bgp"}
 
     def _check(*args, **kwargs):
@@ -206,6 +206,21 @@ def _check_bgp_status_helper():
                 check_result['failed'] = False
             return not check_result['failed']
 
+        def _check_bgp_router_id(tbinfo):
+            duthost = kwargs['node']
+            mgFacts = duthost.get_extended_minigraph_facts(tbinfo)
+            check_bgp_router_id_cmd = r'vtysh -c "show ip bgp summary json"'
+            bgp_summary = duthost.shell(check_bgp_router_id_cmd, module_ignore_errors=True)
+            bgp_summary_json = json.loads(bgp_summary['stdout'])
+            router_id = str(bgp_summary_json['ipv4Unicast']['routerId'])
+            loopback0 = str(mgFacts['minigraph_lo_interfaces'][0]['addr'])
+            if router_id == loopback0:
+                logger.info("BGP router identifier: %s == Loopback0 address %s" % (router_id, loopback0))
+                return True
+            else:
+                logger.info("BGP router identifier %s != Loopback0 address %s" % (router_id, loopback0))
+                return False
+
         logger.info("Checking bgp status on host %s ..." % dut.hostname)
         check_result = {"failed": False, "check_item": "bgp", "host": dut.hostname}
 
@@ -230,6 +245,10 @@ def _check_bgp_status_helper():
         else:
             logger.info('No BGP neighbors are down on %s' % dut.hostname)
 
+        if not wait_until(timeout, interval, 0, _check_bgp_router_id, tbinfo):
+            check_result['failed'] = True
+            logger.info("Failed to verify BGP router identifier is Loopback0 address on %s" % dut.hostname)
+
         logger.info("Done checking bgp status on %s" % dut.hostname)
         results[dut.hostname] = check_result