Stability fixes for SR Tests and small fixes for running ONOS in docker
- move checkOptions to component driver
- use karafTimeout for SR tests
- Fix some docker options
- Make sure mn docker can resolve own hostname
- Fix config file ip format for DHCP relay app
Change-Id: I85e8c52384e0fb478462fa9bbaf0b31a599b632b
(cherry picked from commit 521ecde3f8d28288303ea11129faa0cfd86b9bcd)
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/SRDhcprelay.params.stratum b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/SRDhcprelay.params.stratum
index e7e1564..15abde5 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/SRDhcprelay.params.stratum
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/SRDhcprelay.params.stratum
@@ -25,7 +25,7 @@
</DEPENDENCY>
<MN_DOCKER>
- <args>--privileged --net host --rm -v topo:/topo -v ~/mininet/custom:/home/root/mininet/custom -v /var/run/openvswitch/:/var/run/openvswitch/ -v /tmp/mn-stratum:/tmp -v /tmp/mn_conf/:/home/root --hostname mn-stratum -v /etc/network/interfaces:/etc/network/interfaces -v /lib/modules:/lib/modules -it -d</args>
+ <args>--privileged --net host --rm -v topo:/topo -v ~/mininet/custom/:/home/root/mininet/custom/ -v /var/run/openvswitch/:/var/run/openvswitch/ -v /tmp/mn-stratum/:/tmp/ -v /tmp/mn_conf/:/home/root/config/ -v /etc/network/interfaces:/etc/network/interfaces -v /lib/modules/:/lib/modules/ -it -d --hostname mn-stratum </args>
<name>trellis_mininet</name>
<home>/home/root/</home>
</MN_DOCKER>
@@ -44,7 +44,7 @@
<ENV>
<cellName>productionCell</cellName>
- <cellApps>drivers,fpm,dhcprelay,netcfghostprovider,routeradvertisement,drivers.bmv2,pipelines.fabric</cellApps>
+ <cellApps>drivers,lldpprovider,hostprovider,fpm,dhcprelay,netcfghostprovider,routeradvertisement,drivers.bmv2,pipelines.fabric,segmentrouting</cellApps>
</ENV>
<GIT>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/SRDhcprelayTest.py b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/SRDhcprelayTest.py
index a2ceb25..15e33a3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/SRDhcprelayTest.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/SRDhcprelayTest.py
@@ -29,59 +29,63 @@
@staticmethod
def runTest( main, testIndex, onosNodes, description, dhcpRelay=False, remoteServer=False, multipleServer=False, ipv6=False, vlan=[], dualHomed=False ):
- skipPackage = False
- init = False
- if not hasattr( main, 'apps' ):
- init = True
- run.initTest( main )
- # Skip onos packaging if the clusrer size stays the same
- if not init and onosNodes == main.Cluster.numCtrls:
- skipPackage = True
+ try:
+ skipPackage = False
+ init = False
+ if not hasattr( main, 'apps' ):
+ init = True
+ run.initTest( main )
+ # Skip onos packaging if the clusrer size stays the same
+ if not init and onosNodes == main.Cluster.numCtrls:
+ skipPackage = True
- main.case( '%s, with %d ONOS instance%s' %
- ( description, onosNodes, 's' if onosNodes > 1 else '' ) )
+ main.case( '%s, with %d ONOS instance%s' %
+ ( description, onosNodes, 's' if onosNodes > 1 else '' ) )
- main.cfgName = 'CASE%02d' % testIndex
- main.resultFileName = 'CASE%02d' % testIndex
- main.Cluster.setRunningNode( onosNodes )
- run.installOnos( main, skipPackage=skipPackage, cliSleep=5 )
- if main.useBmv2:
- # Translate configuration file from OVS-OFDPA to BMv2 driver
- translator.bmv2ToOfdpa( main ) # Try to cleanup if switching between switch types
- switchPrefix = main.params[ 'DEPENDENCY' ].get( 'switchPrefix', "bmv2" )
- translator.ofdpaToBmv2( main, switchPrefix=switchPrefix )
- else:
- translator.bmv2ToOfdpa( main )
- run.loadJson( main )
- run.loadHost( main )
- if hasattr( main, 'Mininet1' ):
- run.mnDockerSetup( main )
- # Run the test with Mininet
- if dualHomed:
- mininet_args = ' --spine=2 --leaf=4 --dual-homed'
- else:
- mininet_args = ' --spine=2 --leaf=2'
- mininet_args += ' --dhcp-client'
- if dhcpRelay:
- mininet_args += ' --dhcp-relay'
- if multipleServer:
- mininet_args += ' --multiple-dhcp-server'
- if remoteServer:
- mininet_args += ' --remote-dhcp-server'
- if ipv6:
- mininet_args += ' --ipv6'
- if len( vlan ) > 0 :
- mininet_args += ' --vlan=%s' % ( ','.join( ['%d' % vlanId for vlanId in vlan ] ) )
+ main.cfgName = 'CASE%02d' % testIndex
+ main.resultFileName = 'CASE%02d' % testIndex
+ main.Cluster.setRunningNode( onosNodes )
+ run.installOnos( main, skipPackage=skipPackage, cliSleep=5 )
if main.useBmv2:
- mininet_args += ' --switch %s' % main.switchType
- main.log.info( "Using %s switch" % main.switchType )
+ # Translate configuration file from OVS-OFDPA to BMv2 driver
+ translator.bmv2ToOfdpa( main ) # Try to cleanup if switching between switch types
+ switchPrefix = main.params[ 'DEPENDENCY' ].get( 'switchPrefix', "bmv2" )
+ translator.ofdpaToBmv2( main, switchPrefix=switchPrefix )
+ else:
+ translator.bmv2ToOfdpa( main )
+ run.loadJson( main )
+ run.loadHost( main )
+ if hasattr( main, 'Mininet1' ):
+ run.mnDockerSetup( main )
+ # Run the test with Mininet
+ if dualHomed:
+ mininet_args = ' --spine=2 --leaf=4 --dual-homed'
+ else:
+ mininet_args = ' --spine=2 --leaf=2'
+ mininet_args += ' --dhcp-client'
+ if dhcpRelay:
+ mininet_args += ' --dhcp-relay'
+ if multipleServer:
+ mininet_args += ' --multiple-dhcp-server'
+ if remoteServer:
+ mininet_args += ' --remote-dhcp-server'
+ if ipv6:
+ mininet_args += ' --ipv6'
+ if len( vlan ) > 0 :
+ mininet_args += ' --vlan=%s' % ( ','.join( ['%d' % vlanId for vlanId in vlan ] ) )
+ if main.useBmv2:
+ mininet_args += ' --switch %s' % main.switchType
+ main.log.info( "Using %s switch" % main.switchType )
- run.startMininet( main, 'trellis_fabric.py', args=mininet_args )
- else:
- # Run the test with physical devices
- # TODO: connect TestON to the physical network
- pass
- run.verifyOnosHostIp( main )
- run.verifyNetworkHostIp( main )
+ run.startMininet( main, 'trellis_fabric.py', args=mininet_args )
+ else:
+ # Run the test with physical devices
+ # TODO: connect TestON to the physical network
+ pass
+ run.verifyOnosHostIp( main, skipOnFail=False )
+ run.verifyNetworkHostIp( main )
+ except Exception as e:
+ main.log.exception( "Error in runTest" )
+ main.skipCase( result="FAIL", msg=e )
run.cleanup( main )
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE12.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE12.json
index 028848c..3517e1d 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE12.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE12.json
@@ -113,7 +113,7 @@
{
"dhcpServerConnectPoint": "of:0000000000000002/7",
"serverIps": ["10.0.99.3", "2000::99fd"],
- "gatewayIps": ["10.0.1.1", "2000::101/120"]
+ "gatewayIps": ["10.0.1.1", "2000::101"]
}
]
}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE14.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE14.json
index 028848c..3517e1d 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE14.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE14.json
@@ -113,7 +113,7 @@
{
"dhcpServerConnectPoint": "of:0000000000000002/7",
"serverIps": ["10.0.99.3", "2000::99fd"],
- "gatewayIps": ["10.0.1.1", "2000::101/120"]
+ "gatewayIps": ["10.0.1.1", "2000::101"]
}
]
}