lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add tests for OVS user switch (skipping hifi test for now)

Browse Source 
test_hifi.py currently fails for OVS when datapath=user -
we should look at this and fix it.
This commit is contained in:
Bob Lantz
2013-09-11 12:00:13 -07:00
committed by Brian O'Connor
parent 45d365f98b
commit 5493212578
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/test/test_hifi.py
+8 -2
View File
@@ -4,9 +4,10 @@
Test creation and pings for topologies with link and/or CPU options.""" Test creation and pings for topologies with link and/or CPU options."""
import unittest import unittest
from functools import partial
from mininet.net import Mininet from mininet.net import Mininet
from mininet.node import OVSKernelSwitch, UserSwitch, IVSSwitch from mininet.node import OVSSwitch, UserSwitch, IVSSwitch
from mininet.node import CPULimitedHost from mininet.node import CPULimitedHost
from mininet.link import TCLink from mininet.link import TCLink
from mininet.topo import Topo from mininet.topo import Topo
@@ -124,7 +125,12 @@ class testOptionsTopoCommon( object ):
class testOptionsTopoOVSKernel( testOptionsTopoCommon, unittest.TestCase ): class testOptionsTopoOVSKernel( testOptionsTopoCommon, unittest.TestCase ):
"Verify ability to create networks with host and link options (OVS kernel switch)." "Verify ability to create networks with host and link options (OVS kernel switch)."
switchClass = OVSKernelSwitch switchClass = OVSSwitch
@unittest.skip( 'Skipping OVS user switch test for now' )
class testOptionsTopoOVSUser( testOptionsTopoCommon, unittest.TestCase ):
"Verify ability to create networks with host and link options (OVS user switch)."
switchClass = partial( OVSSwitch, datapath='user' )
@unittest.skipUnless( quietRun( 'which ivs-ctl' ), 'IVS is not installed' ) @unittest.skipUnless( quietRun( 'which ivs-ctl' ), 'IVS is not installed' )
class testOptionsTopoIVS( testOptionsTopoCommon, unittest.TestCase ): class testOptionsTopoIVS( testOptionsTopoCommon, unittest.TestCase ):
mininet/test/test_nets.py
+11 -3
View File
@@ -4,10 +4,11 @@
Test creation and all-pairs ping for each included mininet topo type.""" Test creation and all-pairs ping for each included mininet topo type."""
import unittest import unittest
from functools import partial
from mininet.net import Mininet from mininet.net import Mininet
from mininet.node import Host, Controller from mininet.node import Host, Controller
from mininet.node import UserSwitch, OVSKernelSwitch, IVSSwitch from mininet.node import UserSwitch, OVSSwitch, IVSSwitch
from mininet.topo import SingleSwitchTopo, LinearTopo from mininet.topo import SingleSwitchTopo, LinearTopo
from mininet.log import setLogLevel from mininet.log import setLogLevel
from mininet.util import quietRun from mininet.util import quietRun
@@ -32,8 +33,11 @@ class testSingleSwitchCommon( object ):
class testSingleSwitchOVSKernel( testSingleSwitchCommon, unittest.TestCase ): class testSingleSwitchOVSKernel( testSingleSwitchCommon, unittest.TestCase ):
"Test ping with single switch topology (OVS kernel switch)." "Test ping with single switch topology (OVS kernel switch)."
switchClass = OVSKernelSwitch switchClass = OVSSwitch
class testSingleSwitchOVSUser( testSingleSwitchCommon, unittest.TestCase ):
"Test ping with single switch topology (OVS user switch)."
switchClass = partial( OVSSwitch, datapath='user' )
@unittest.skipUnless( quietRun( 'which ivs-ctl' ), 'IVS is not installed' ) @unittest.skipUnless( quietRun( 'which ivs-ctl' ), 'IVS is not installed' )
class testSingleSwitchIVS( testSingleSwitchCommon, unittest.TestCase ): class testSingleSwitchIVS( testSingleSwitchCommon, unittest.TestCase ):
@@ -61,7 +65,11 @@ class testLinearCommon( object ):
class testLinearOVSKernel( testLinearCommon, unittest.TestCase ): class testLinearOVSKernel( testLinearCommon, unittest.TestCase ):
"Test all-pairs ping with LinearNet (OVS kernel switch)." "Test all-pairs ping with LinearNet (OVS kernel switch)."
switchClass = OVSKernelSwitch switchClass = OVSSwitch
class testLinearOVSUser( testLinearCommon, unittest.TestCase ):
"Test all-pairs ping with LinearNet (OVS user switch)."
switchClass = partial( OVSSwitch, datapath='user' )
@unittest.skipUnless( quietRun( 'which ivs-ctl' ), 'IVS is not installed' ) @unittest.skipUnless( quietRun( 'which ivs-ctl' ), 'IVS is not installed' )
class testLinearIVS( testLinearCommon, unittest.TestCase ): class testLinearIVS( testLinearCommon, unittest.TestCase ):