Revision 54932125

View differences:

mininet/test/test_hifi.py
4 4
   Test creation and pings for topologies with link and/or CPU options."""
5 5

  
6 6
import unittest
7
from functools import partial
7 8

  
8 9
from mininet.net import Mininet
9
from mininet.node import OVSKernelSwitch, UserSwitch, IVSSwitch
10
from mininet.node import OVSSwitch, UserSwitch, IVSSwitch
10 11
from mininet.node import CPULimitedHost
11 12
from mininet.link import TCLink
12 13
from mininet.topo import Topo
......
124 125

  
125 126
class testOptionsTopoOVSKernel( testOptionsTopoCommon, unittest.TestCase ):
126 127
    "Verify ability to create networks with host and link options (OVS kernel switch)."
127
    switchClass = OVSKernelSwitch
128
    switchClass = OVSSwitch
129

  
130
@unittest.skip( 'Skipping OVS user switch test for now' )
131
class testOptionsTopoOVSUser( testOptionsTopoCommon, unittest.TestCase ):
132
    "Verify ability to create networks with host and link options (OVS user switch)."
133
    switchClass = partial( OVSSwitch, datapath='user' )
128 134

  
129 135
@unittest.skipUnless( quietRun( 'which ivs-ctl' ), 'IVS is not installed' )
130 136
class testOptionsTopoIVS( testOptionsTopoCommon, unittest.TestCase ):
mininet/test/test_nets.py
4 4
   Test creation and all-pairs ping for each included mininet topo type."""
5 5

  
6 6
import unittest
7
from functools import partial
7 8

  
8 9
from mininet.net import Mininet
9 10
from mininet.node import Host, Controller
10
from mininet.node import UserSwitch, OVSKernelSwitch, IVSSwitch
11
from mininet.node import UserSwitch, OVSSwitch, IVSSwitch
11 12
from mininet.topo import SingleSwitchTopo, LinearTopo
12 13
from mininet.log import setLogLevel
13 14
from mininet.util import quietRun
......
32 33

  
33 34
class testSingleSwitchOVSKernel( testSingleSwitchCommon, unittest.TestCase ):
34 35
    "Test ping with single switch topology (OVS kernel switch)."
35
    switchClass = OVSKernelSwitch
36
    switchClass = OVSSwitch
36 37

  
38
class testSingleSwitchOVSUser( testSingleSwitchCommon, unittest.TestCase ):
39
    "Test ping with single switch topology (OVS user switch)."
40
    switchClass = partial( OVSSwitch, datapath='user' )
37 41

  
38 42
@unittest.skipUnless( quietRun( 'which ivs-ctl' ), 'IVS is not installed' )
39 43
class testSingleSwitchIVS( testSingleSwitchCommon, unittest.TestCase ):
......
61 65

  
62 66
class testLinearOVSKernel( testLinearCommon, unittest.TestCase ):
63 67
    "Test all-pairs ping with LinearNet (OVS kernel switch)."
64
    switchClass = OVSKernelSwitch
68
    switchClass = OVSSwitch
69

  
70
class testLinearOVSUser( testLinearCommon, unittest.TestCase ):
71
    "Test all-pairs ping with LinearNet (OVS user switch)."
72
    switchClass = partial( OVSSwitch, datapath='user' )
65 73

  
66 74
@unittest.skipUnless( quietRun( 'which ivs-ctl' ), 'IVS is not installed' )
67 75
class testLinearIVS( testLinearCommon, unittest.TestCase ):

Also available in: Unified diff