Add VLAN Encapsulation test for point to point intents to FUNCintent
Change-Id: Ia8b7195022502a0c6e2cd6e30d729dba533e999c
diff --git a/TestON/tests/FUNC/FUNCintent/dependencies/FuncIntentFunction.py b/TestON/tests/FUNC/FUNCintent/dependencies/FuncIntentFunction.py
index 5b4bee1..cbf783f 100755
--- a/TestON/tests/FUNC/FUNCintent/dependencies/FuncIntentFunction.py
+++ b/TestON/tests/FUNC/FUNCintent/dependencies/FuncIntentFunction.py
@@ -23,7 +23,8 @@
tcp="",
sw1="",
sw2="",
- setVlan="" ):
+ setVlan="",
+ encap="" ):
"""
Installs a Host Intent
@@ -80,7 +81,8 @@
intentId = main.CLIs[ onosNode ].addHostIntent( hostIdOne=host1.get( "id" ),
hostIdTwo=host2.get( "id" ),
vlanId=vlanId,
- setVlan=setVlan )
+ setVlan=setVlan,
+ encap=encap )
except (KeyError, TypeError):
errorMsg = "There was a problem loading the hosts data."
if intentId:
@@ -299,7 +301,8 @@
ipDst="",
tcpSrc="",
tcpDst="",
- setVlan=""):
+ setVlan="",
+ encap="" ):
"""
Installs a Single to Single Point Intent
@@ -388,7 +391,8 @@
tcpSrc=tcpSrc,
tcpDst=tcpDst,
vlanId=vlanId,
- setVlan=setVlan )
+ setVlan=setVlan,
+ encap=encap )
except (KeyError, TypeError):
errorMsg = "There was a problem loading the hosts data."
if intentId:
@@ -700,7 +704,8 @@
sw1="",
sw2="",
setVlan="",
- partial=False ):
+ partial=False,
+ encap="" ):
"""
Installs a Single to Multi Point Intent
@@ -789,7 +794,8 @@
tcpDst="",
vlanId=vlanId,
setVlan=setVlan,
- partial=partial )
+ partial=partial,
+ encap=encap )
except (KeyError, TypeError):
errorMsg = "There was a problem loading the hosts data."
if intentId:
@@ -818,7 +824,8 @@
sw1="",
sw2="",
setVlan="",
- partial=False ):
+ partial=False,
+ encap="" ):
"""
Installs a Multi to Single Point Intent
@@ -906,7 +913,8 @@
tcpDst="",
vlanId=vlanId,
setVlan=setVlan,
- partial=partial )
+ partial=partial,
+ encap=encap )
except (KeyError, TypeError):
errorMsg = "There was a problem loading the hosts data."
if intentId:
@@ -1079,7 +1087,7 @@
testResult = main.FALSE
# Check flows count in each node
- if utilities.retry( f=checkFlowsCount, retValue=main.FALSE, args=[ main ], sleep=20, attempts=3 ) and utilities.retry( f=checkFlowsState, retValue=main.FALSE, args=[ main ], sleep=20, attempts=3 ):
+ if utilities.retry( f=checkFlowsCount, retValue=main.FALSE, args=[ main ], sleep=20, attempts=5 ) and utilities.retry( f=checkFlowsState, retValue=main.FALSE, args=[ main ], sleep=20, attempts=5 ):
main.assertReturnString += 'Link Down Flow State Passed\n'
else:
main.assertReturnString += 'Link Down Flow State Failed\n'