Rewrote assignSwController function in mininetclidriver
diff --git a/TestON/tests/FuncTopo/Dependency/FuncTopoFunction.py b/TestON/tests/FuncTopo/Dependency/FuncTopoFunction.py
index ad30942..a953640 100644
--- a/TestON/tests/FuncTopo/Dependency/FuncTopoFunction.py
+++ b/TestON/tests/FuncTopo/Dependency/FuncTopoFunction.py
@@ -45,16 +45,19 @@
# Starts topology
startResult = startNewTopology( main, topoFile, args, mnCmd )
+ # Gets list of switches in mininet
+ assignSwitch( main )
+
+ # This function activates fwd app then does pingall as well as store
+ # hosts data in a variable main.hostsData
+ getHostsResult = getHostsData( main )
+
# Create topology object using sts
topoObjectResult = createTopoObject( main )
# Compare Topology
compareTopoResult = compareTopo( main )
- # This function activates fwd app then does pingall as well as store
- # hosts data in a variable main.hostsData
- getHostsResult = getHostsData( main )
-
testTopoResult = startResult and topoObjectResult and \
compareTopoResult and getHostsResult
@@ -224,6 +227,14 @@
return compareTopoResult
+def assignSwitch( main ):
+ """
+ Returns switch list using getSwitch in Mininet driver
+ """
+ switchList = main.Mininet1.getSwitch()
+ print switchList
+ return switchList
+
def getHostsData( main ):
"""
Use fwd app and pingall to discover all the hosts