From 812c91cc9e9c0acfa80d15e288a76b738b6d3b29 Mon Sep 17 00:00:00 2001
From: Rich Lane <rlane@bigswitch.com>
Date: Thu, 27 Jun 2013 14:49:19 -0700
Subject: [PATCH] test_hifi: use SWITCH to pick the switch class
---
mininet/test/test_hifi.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/mininet/test/test_hifi.py b/mininet/test/test_hifi.py
index ace7bb51..5ef8599f 100755
--- a/mininet/test/test_hifi.py
+++ b/mininet/test/test_hifi.py
@@ -39,7 +39,7 @@ def runOptionsTopoTest( self, n, hopts=None, lopts=None ):
"Generic topology-with-options test runner."
mn = Mininet( topo=SingleSwitchOptionsTopo( n=n, hopts=hopts,
lopts=lopts ),
- host=CPULimitedHost, link=TCLink )
+ host=CPULimitedHost, link=TCLink, switch=SWITCH )
dropped = mn.run( mn.ping )
self.assertEqual( dropped, 0 )
@@ -58,7 +58,7 @@ def testCPULimits( self ):
#self.runOptionsTopoTest( N, hopts=hopts )
mn = Mininet( SingleSwitchOptionsTopo( n=N, hopts=hopts ),
- host=CPULimitedHost )
+ host=CPULimitedHost, switch=SWITCH )
mn.start()
results = mn.runCpuLimitTest( cpu=CPU_FRACTION )
mn.stop()
@@ -73,7 +73,7 @@ def testLinkBandwidth( self ):
lopts = { 'bw': BW, 'use_htb': True }
# Also verify correctness of limit limitng within a bound.
mn = Mininet( SingleSwitchOptionsTopo( n=N, lopts=lopts ),
- link=TCLink )
+ link=TCLink, switch=SWITCH )
bw_strs = mn.run( mn.iperf )
for bw_str in bw_strs:
bw = float( bw_str.split(' ')[0] )
@@ -85,7 +85,7 @@ def testLinkDelay( self ):
DELAY_TOLERANCE = 0.8 # Delay fraction below which test should fail
lopts = { 'delay': '%sms' % DELAY_MS, 'use_htb': True }
mn = Mininet( SingleSwitchOptionsTopo( n=N, lopts=lopts ),
- link=TCLink )
+ link=TCLink, switch=SWITCH )
ping_delays = mn.run( mn.pingFull )
test_outputs = ping_delays[0]
# Ignore unused variables below
@@ -105,7 +105,7 @@ def testLinkLoss( self ):
REPS = 1
lopts = { 'loss': LOSS_PERCENT, 'use_htb': True }
mn = Mininet( topo=SingleSwitchOptionsTopo( n=N, lopts=lopts ),
- host=CPULimitedHost, link=TCLink )
+ host=CPULimitedHost, link=TCLink, switch=SWITCH )
# Drops are probabilistic, but the chance of no dropped packets is
# 1 in 100 million with 4 hops for a link w/99% loss.
dropped_total = 0
--
GitLab