Updated old functionality test before snapshot
diff --git a/TestON/tests/IpOptical/IpOptical.py b/TestON/tests/IpOptical/IpOptical.py
index 91926b9..c4a4eb6 100644
--- a/TestON/tests/IpOptical/IpOptical.py
+++ b/TestON/tests/IpOptical/IpOptical.py
@@ -335,11 +335,13 @@
"ping the hosts" )
main.step( "Adding point intents" )
+ checkFlowResult = main.TRUE
step1Result = main.TRUE
main.pIntentsId = []
pIntent1 = main.ONOS3.addPointIntent(
"of:0000ffffffff0001/1",
"of:0000ffffffff0005/1" )
+ time.sleep( 10 )
pIntent2 = main.ONOS3.addPointIntent(
"of:0000ffffffff0005/1",
"of:0000ffffffff0001/1" )
@@ -364,6 +366,8 @@
onpass="Successfully added point intents",
onfail="Failed to add point intents")
+ print main.ONOS3.intents()
+
main.step( "Ping h1 and h5" )
step2Result = main.TRUE
main.log.info( "\n\nh1 is Pinging h5" )
@@ -444,7 +448,7 @@
"Links state is not inactive as expected" )
linksStateResult = main.FALSE
time.sleep( 10 )
- checkFlowsState = main.ONOS3.checkFlowsState()
+ #checkFlowsState = main.ONOS3.checkFlowsState()
step2Result = linksStateResult
utilities.assert_equals(
expect=main.TRUE,
@@ -469,6 +473,7 @@
linksNonjson = main.ONOS3.links( jsonFormat=False )
main.log.info( "links = " + linksNonjson )
linkInactiveCount = linksNonjson.count( "state=INACTIVE" )
+ time.sleep( 30 )
main.log.info( "linkInactiveCount = " + str( linkInactiveCount ))
if linkInactiveCount == 0:
main.log.info(
@@ -571,15 +576,17 @@
intent1 = main.ONOS3.addHostIntent( hostIdOne = host1,
hostIdTwo = host2 )
intentsId.append( intent1 )
- time.sleep( 5 )
+ """
intent2 = main.ONOS3.addHostIntent( hostIdOne = host2,
hostIdTwo = host1 )
intentsId.append( intent2 )
+ """
# Checking intents state before pinging
main.log.info( "Checking intents state" )
time.sleep( 15 )
intentResult = main.ONOS3.checkIntentState( intentsId = intentsId )
#check intent state again if intents are not in installed state
+ print main.ONOS3.intents()
if not intentResult:
intentResult = main.ONOS3.checkIntentState( intentsId = intentsId )
step2Result = intentResult
@@ -608,7 +615,7 @@
# Check remaining intents
intentsJson = json.loads( main.ONOS3.intents() )
main.ONOS3.removeIntent( intentId=intent1, purge=True )
- main.ONOS3.removeIntent( intentId=intent2, purge=True )
+ #main.ONOS3.removeIntent( intentId=intent2, purge=True )
for intents in intentsJson:
main.ONOS3.removeIntent( intentId=intents.get( 'id' ),
app='org.onosproject.optical',
diff --git a/TestON/tests/MultiProd/MultiProd.py b/TestON/tests/MultiProd/MultiProd.py
index 2abd94c..44a828c 100644
--- a/TestON/tests/MultiProd/MultiProd.py
+++ b/TestON/tests/MultiProd/MultiProd.py
@@ -380,7 +380,6 @@
onpass="ONOS3 Switches view is correct",
onfail="ONOS3 Switches view is incorrect" )
- """
portsResults1 = main.Mininet1.comparePorts( MNTopo,
json.loads( ports1 ) )
utilities.assertEquals( expect=main.TRUE, actual=portsResults1,
@@ -398,7 +397,7 @@
utilities.assertEquals( expect=main.TRUE, actual=portsResults3,
onpass="ONOS3 Ports view is correct",
onfail="ONOS3 Ports view is incorrect" )
- """
+
linksResults1 = main.Mininet1.compareLinks(
MNTopo,
json.loads( links1 ) )
@@ -1210,7 +1209,7 @@
"________________________________" )
flowHandle = main.ONOScli1.flows()
- # print "flowHandle = ", flowHandle
+ print "flowHandle = ", flowHandle
main.log.info( "flows :" + flowHandle )
count = 1
@@ -1940,8 +1939,8 @@
main.log.info( "Point to point intent install successful" )
time.sleep( 30 )
- flowHandle = main.ONOScli1.flows()
- main.log.info( "flows :" + flowHandle )
+ #flowHandle = main.ONOScli1.flows()
+ #main.log.info( "flows :" + flowHandle )
# Sleep for 30 seconds to provide time for the intent state to change
time.sleep( 60 )
@@ -2055,8 +2054,8 @@
print "links_state_result = ", linksStateResult
time.sleep( 10 )
- flowHandle = main.ONOScli3.flows()
- main.log.info( "flows :" + flowHandle )
+ #flowHandle = main.ONOScli3.flows()
+ #main.log.info( "flows :" + flowHandle )
main.step( "Verify Rerouting by a ping test" )
PingResult = main.TRUE
diff --git a/TestON/tests/MultiProd13/MultiProd13.py b/TestON/tests/MultiProd13/MultiProd13.py
index 1a4e2e8..93df4c2 100644
--- a/TestON/tests/MultiProd13/MultiProd13.py
+++ b/TestON/tests/MultiProd13/MultiProd13.py
@@ -380,7 +380,6 @@
onpass="ONOS3 Switches view is correct",
onfail="ONOS3 Switches view is incorrect" )
- """
portsResults1 = main.Mininet1.comparePorts( MNTopo,
json.loads( ports1 ) )
utilities.assertEquals( expect=main.TRUE, actual=portsResults1,
@@ -398,7 +397,7 @@
utilities.assertEquals( expect=main.TRUE, actual=portsResults3,
onpass="ONOS3 Ports view is correct",
onfail="ONOS3 Ports view is incorrect" )
- """
+
linksResults1 = main.Mininet1.compareLinks(
MNTopo,
json.loads( links1 ) )
@@ -1210,7 +1209,7 @@
"________________________________" )
flowHandle = main.ONOScli1.flows()
- # print "flowHandle = ", flowHandle
+ print "flowHandle = ", flowHandle
main.log.info( "flows :" + flowHandle )
count = 1
@@ -1940,8 +1939,8 @@
main.log.info( "Point to point intent install successful" )
time.sleep( 30 )
- flowHandle = main.ONOScli1.flows()
- main.log.info( "flows :" + flowHandle )
+ #flowHandle = main.ONOScli1.flows()
+ #main.log.info( "flows :" + flowHandle )
# Sleep for 30 seconds to provide time for the intent state to change
time.sleep( 60 )
@@ -2055,8 +2054,8 @@
print "links_state_result = ", linksStateResult
time.sleep( 10 )
- flowHandle = main.ONOScli3.flows()
- main.log.info( "flows :" + flowHandle )
+ #flowHandle = main.ONOScli3.flows()
+ #main.log.info( "flows :" + flowHandle )
main.step( "Verify Rerouting by a ping test" )
PingResult = main.TRUE
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
diff --git a/TestON/tests/ProdFunc13/ProdFunc13.py b/TestON/tests/ProdFunc13/ProdFunc13.py
index 79a0b3a..b3e456b 100644
--- a/TestON/tests/ProdFunc13/ProdFunc13.py
+++ b/TestON/tests/ProdFunc13/ProdFunc13.py
@@ -432,6 +432,7 @@
"ping the hosts" )
main.step( "Adding point intents" )
+ checkFlowResult = main.TRUE
step1Result = main.TRUE
main.pIntentsId = []
pIntent1 = main.ONOS3.addPointIntent(
@@ -1192,7 +1193,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,8 +1201,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
@@ -1345,8 +1345,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