Changes required by new host probing implementation
Change-Id: Ic85e86f012c13aa32aee7591fdbad1292781a025
diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index 9c2f2e8..15bde0d 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -594,18 +594,21 @@
hostList = hosts.keys()
discoveryResult = main.TRUE
for host in hostList:
+ flushCmd = ""
cmd = ""
if self.getIPAddress( host ):
+ flushCmd = "{} ip neigh flush all".format( host )
cmd = "{} ping -c 1 -i 1 -W {} {}".format( host, wait, dstIp )
main.log.debug( "Sending IPv4 probe ping from host {}".format( host ) )
elif self.getIPAddress( host, proto='IPV6' ):
+ flushCmd = "{} ip -6 neigh flush all".format( host )
cmd = "{} ping6 -c 1 -i 1 -W {} {}".format( host, wait, dstIp6 )
main.log.debug( "Sending IPv6 probe ping from host {}".format( host ) )
else:
main.log.warn( "No IP addresses configured on host {}, skipping discovery".format( host ) )
discoveryResult = main.FALSE
if cmd:
- self.handle.sendline( "{} ip neigh flush all".format( host ) )
+ self.handle.sendline( flushCmd )
self.handle.expect( "mininet>" )
self.handle.sendline( cmd )
self.handle.expect( "mininet>", timeout=wait + 5 )
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.params b/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.params
index 4c7946e..73b1578 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.params
@@ -21,7 +21,7 @@
<ENV>
<cellName>productionCell</cellName>
- <cellApps>drivers,segmentrouting,openflow,fpm,dhcprelay,netcfghostprovider,routeradvertisement,t3,mcast</cellApps>
+ <cellApps>drivers,segmentrouting,openflow,fpm,dhcprelay,netcfghostprovider,routeradvertisement,t3,mcast,hostprobingprovider</cellApps>
</ENV>
<GIT>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params b/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params
index 0658e5f..ff85620 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.params
@@ -21,7 +21,7 @@
<ENV>
<cellName>productionCell</cellName>
- <cellApps>drivers,openflow,segmentrouting,fpm,dhcprelay,netcfghostprovider,routeradvertisement,t3</cellApps>
+ <cellApps>drivers,openflow,segmentrouting,fpm,dhcprelay,netcfghostprovider,routeradvertisement,t3,hostprobingprovider</cellApps>
</ENV>
<GIT>