commit 74c7ff253580c3c2f45a5fa5a26ccb4eefadd78b
author Andreas Pantelopoulos <andreas@opennetworking.org> Tue May 01 15:42:02 2018 -0700
committer Andreas Pantelopoulos <andreas@opennetworking.org> Fri May 04 16:08:40 2018 -0700
tree 4f6947d28642e9c93c196239247248081d219922
parent 112a4771e05c7e06738a72d994b4b974cc770845

[WIP] Added test 604/605 for routing tests.

Further added functionality for re-discovering hosts after a
switch failure.

Change-Id: I266918bb7286328af52ac90c9588b5c2078c2009

TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
index 298eb35..44055d3 100644
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
@@ -650,7 +650,7 @@
                                  onfail="Failed to kill switch?" )
 
     @staticmethod
-    def recoverSwitch( main, switch, switches, links ):
+    def recoverSwitch( main, switch, switches, links, rediscoverHosts=False ):
         """
         Params: switches, links: number of expected switches and links after SwitchUp, ex.: '4', '6'
         Recover a switch and verify ONOS can see the proper change
@@ -664,6 +664,13 @@
         main.log.info( "Waiting %s seconds for switch up to be discovered" % (
             main.switchSleep ) )
         time.sleep( main.switchSleep )
+        if rediscoverHosts:
+            main.Network.discoverIpv4Hosts( main.internalIpv4Hosts )
+            main.Network.discoverIpv6Hosts( main.internalIpv6Hosts )
+            main.log.info( "Waiting %s seconds for hosts to get re-discovered" % (
+                           main.switchSleep ) )
+            time.sleep( main.switchSleep )
+
         topology = utilities.retry( main.Cluster.active( 0 ).CLI.checkStatus,
                                     main.FALSE,
                                     kwargs={ 'numoswitch': switches,