Merge "Enforce code style for groovy files"
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index dee2be5..c341d59 100755
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -6494,6 +6494,8 @@
if sHost and dHost:
break
assert sHost, "Not able to find host with IP {}".format( sAddr )
+ if simple:
+ assert dHost, "Not able to find host with IP {}".format( dAddr )
cmdStr = "t3-troubleshoot"
if simple:
cmdStr += "-simple"
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.py b/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.py
index 8a8ba08..e27d820 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/SRMulticast.py
@@ -309,8 +309,10 @@
verifyMcastRoutes( main )
verifySwitchDown( main, "leaf2", 10,
{ "ipv4": False, "ipv6": False },
- [ "h4v4" ],
- { "h4v4": ["of:0000000000000002/10", "of:0000000000000003/10"] } )
+ [ "h3v4", "h3v6", "h4v4" ],
+ { "h3v4": "of:0000000000000002/9",
+ "h3v6": "of:0000000000000002/6",
+ "h4v4": ["of:0000000000000002/10", "of:0000000000000003/10"] } )
verifyMcastRemoval( main, removeDHT1=False )
lib.cleanup( main, copyKarafLog=False )
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.py b/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.py
index 8bfade8..b9e2b8e 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/SRRouting.py
@@ -93,7 +93,7 @@
from tests.USECASE.SegmentRouting.dependencies.Testcaselib import Testcaselib as lib
main.case( "Ping between from ipv6 hosts to external host configured with route-add command" )
setupTest( main, test_idx=8, onosNodes=3, ipv4=False, external=False )
- verify( main, ipv6=False, internal=False, disconnected=False )
+ verify( main, ipv4=False, internal=False, disconnected=False )
lib.cleanup( main, copyKarafLog=False, removeHostComponent=True )
def CASE9( self, main ):
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/trellis_fabric.py b/TestON/tests/USECASE/SegmentRouting/dependencies/trellis_fabric.py
index d1058ab..73bfda3 100644
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/trellis_fabric.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/trellis_fabric.py
@@ -165,7 +165,7 @@
self.addLink(cs0, nat)
# Internal Quagga bgp1
- intfs = {'bgp1-eth0': {'ipAddrs': ['10.0.1.2/24', '2000::102/120'], 'mac': '00:88:00:00:00:02'},
+ intfs = {'bgp1-eth0': {'ipAddrs': ['10.0.1.2/24', '2000::102/120'], 'mac': '00:88:00:00:00:03'},
'bgp1-eth1': {'ipAddrs': ['172.16.0.2/12']}}
bgp1 = self.addHost('bgp1', cls=BgpRouter,
interfaces=intfs,