Updated old functionality test before snapshot
diff --git a/TestON/tests/ProdFunc/ProdFunc.py b/TestON/tests/ProdFunc/ProdFunc.py
index 71c60fe..9c2c271 100644
--- a/TestON/tests/ProdFunc/ProdFunc.py
+++ b/TestON/tests/ProdFunc/ProdFunc.py
@@ -67,6 +67,7 @@
else:
main.log.report( "Uninstalling ONOS package failed" )
+ time.sleep( 20 )
main.step( "Installing ONOS package" )
onosInstallResult = main.ONOSbench.onosInstall( ONOS1Ip )
print onosInstallResult
@@ -75,6 +76,7 @@
else:
main.log.report( "Installing ONOS package failed" )
+ time.sleep( 20 )
onos1Isup = main.ONOSbench.isup()
if onos1Isup == main.TRUE:
main.log.report( "ONOS instance is up and ready" )
@@ -432,6 +434,7 @@
"ping the hosts" )
main.step( "Adding point intents" )
+ checkFlowResult = main.TRUE
step1Result = main.TRUE
main.pIntentsId = []
pIntent1 = main.ONOS3.addPointIntent(
@@ -1192,7 +1195,7 @@
main.step( "Compare ONOS Topology to MN Topology" )
devicesJson = main.ONOS2.devices()
linksJson = main.ONOS2.links()
- # portsJson = main.ONOS2.ports()
+ portsJson = main.ONOS2.ports()
result1 = main.Mininet1.compareSwitches(
MNTopo,
@@ -1200,9 +1203,8 @@
result2 = main.Mininet1.compareLinks(
MNTopo,
json.loads( linksJson ) )
- # result3 = main.Mininet1.comparePorts(
- # MNTopo, json.loads( portsJson ) )
+ result3 = main.Mininet1.comparePorts( MNTopo, json.loads( portsJson ) )
# result = result1 and result2 and result3
result = result1 and result2
@@ -1345,8 +1347,7 @@
result2 = main.Mininet1.compareLinks(
MNTopo,
json.loads( linksJson ) )
- # result3 = main.Mininet1.comparePorts(
- # MNTopo, json.loads( portsJson ) )
+ result3 = main.Mininet1.comparePorts( MNTopo, json.loads( portsJson ) )
# result = result1 and result2 and result3
result = result1 and result2