Revision 812c91cc

View differences:

mininet/test/test_hifi.py
39 39
        "Generic topology-with-options test runner."
40 40
        mn = Mininet( topo=SingleSwitchOptionsTopo( n=n, hopts=hopts,
41 41
                                                    lopts=lopts ),
42
                      host=CPULimitedHost, link=TCLink )
42
                      host=CPULimitedHost, link=TCLink, switch=SWITCH )
43 43
        dropped = mn.run( mn.ping )
44 44
        self.assertEqual( dropped, 0 )
45 45

  
......
58 58
        #self.runOptionsTopoTest( N, hopts=hopts )
59 59

  
60 60
        mn = Mininet( SingleSwitchOptionsTopo( n=N, hopts=hopts ),
61
                      host=CPULimitedHost )
61
                      host=CPULimitedHost, switch=SWITCH )
62 62
        mn.start()
63 63
        results = mn.runCpuLimitTest( cpu=CPU_FRACTION )
64 64
        mn.stop()
......
73 73
        lopts = { 'bw': BW, 'use_htb': True }
74 74
        # Also verify correctness of limit limitng within a bound.
75 75
        mn = Mininet( SingleSwitchOptionsTopo( n=N, lopts=lopts ),
76
                      link=TCLink )
76
                      link=TCLink, switch=SWITCH )
77 77
        bw_strs = mn.run( mn.iperf )
78 78
        for bw_str in bw_strs:
79 79
            bw = float( bw_str.split(' ')[0] )
......
85 85
        DELAY_TOLERANCE = 0.8  # Delay fraction below which test should fail
86 86
        lopts = { 'delay': '%sms' % DELAY_MS, 'use_htb': True }
87 87
        mn = Mininet( SingleSwitchOptionsTopo( n=N, lopts=lopts ),
88
                      link=TCLink )
88
                      link=TCLink, switch=SWITCH )
89 89
        ping_delays = mn.run( mn.pingFull )
90 90
        test_outputs = ping_delays[0]
91 91
        # Ignore unused variables below
......
105 105
        REPS = 1
106 106
        lopts = { 'loss': LOSS_PERCENT, 'use_htb': True }
107 107
        mn = Mininet( topo=SingleSwitchOptionsTopo( n=N, lopts=lopts ),
108
                      host=CPULimitedHost, link=TCLink )
108
                      host=CPULimitedHost, link=TCLink, switch=SWITCH )
109 109
        # Drops are probabilistic, but the chance of no dropped packets is
110 110
        # 1 in 100 million with 4 hops for a link w/99% loss.
111 111
        dropped_total = 0

Also available in: Unified diff