Test : Renamed file and directory for mininet to
mini as import of mininet.net and mininet test directory name mixes up.
This fix integrates 25 new test scenarios based on topology creation,
iperf, and mininet as a emulator tool.
Change-Id: I2bba9e126ff5690565670c11e12144e7c26e639a
(cherry picked from commit 7604423e5b35628088302f24c5fc2a719e0b7d20)
diff --git a/src/test/mininet/__init__.py b/src/test/mini/__init__.py
similarity index 100%
rename from src/test/mininet/__init__.py
rename to src/test/mini/__init__.py
diff --git a/src/test/mininet/mininetTest.py b/src/test/mini/miniTest.py
similarity index 99%
rename from src/test/mininet/mininetTest.py
rename to src/test/mini/miniTest.py
index cdac3f0..5caadc7 100644
--- a/src/test/mininet/mininetTest.py
+++ b/src/test/mini/miniTest.py
@@ -37,7 +37,7 @@
from mininet.net import Mininet
from mininet.topo import SingleSwitchTopo,LinearTopo,Topo
from mininet.topolib import TreeTopo
-from mininet.clean import Cleanup
+#from mininet.clean import Cleanup
from mininet.node import Controller, RemoteController, Switch
from mininet.cli import CLI
from mininet.log import setLogLevel, info
diff --git a/src/test/setup/cord-test.py b/src/test/setup/cord-test.py
index bfa87d0..369de0a 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -51,7 +51,7 @@
IMAGE = 'cord-test/nose'
ALL_TESTS = ('tls', 'dhcp', 'dhcprelay','igmp', 'subscriber',
'cordSubscriber', 'vrouter', 'flows', 'proxyarp', 'acl', 'xos', 'fabric',
- 'cbench', 'cluster', 'netCondition', 'cordvtn', 'iperf')
+ 'cbench', 'cluster', 'netCondition', 'cordvtn', 'iperf', 'mini')
def __init__(self, tests, instance = 0, num_instances = 1, ctlr_ip = None,
name = '', image = IMAGE, prefix = '', tag = 'candidate',