Add VLAN Treatment Intent Tests to FUNCintent for Host, Point,
MPSP, and SPMP intents.
Change-Id: I49ca2814e6597740e4d2c37ee5451d2a5e147a35
diff --git a/TestON/tests/FUNC/FUNCintent/dependencies/FuncIntentFunction.py b/TestON/tests/FUNC/FUNCintent/dependencies/FuncIntentFunction.py
index dede2c8..ee0492d 100644
--- a/TestON/tests/FUNC/FUNCintent/dependencies/FuncIntentFunction.py
+++ b/TestON/tests/FUNC/FUNCintent/dependencies/FuncIntentFunction.py
@@ -22,7 +22,8 @@
ipAddresses="",
tcp="",
sw1="",
- sw2="" ):
+ sw2="",
+ setVlan="" ):
"""
Installs a Host Intent
@@ -78,7 +79,8 @@
vlanId = host1.get( "vlan" )
intentId = main.CLIs[ onosNode ].addHostIntent( hostIdOne=host1.get( "id" ),
hostIdTwo=host2.get( "id" ),
- vlanId=vlanId )
+ vlanId=vlanId,
+ setVlan=setVlan )
except (KeyError, TypeError):
errorMsg = "There was a problem loading the hosts data."
if intentId:
@@ -296,7 +298,8 @@
ipSrc="",
ipDst="",
tcpSrc="",
- tcpDst=""):
+ tcpDst="",
+ setVlan=""):
"""
Installs a Single to Single Point Intent
@@ -384,7 +387,8 @@
ipDst=ipDst,
tcpSrc=tcpSrc,
tcpDst=tcpDst,
- vlanId=vlanId )
+ vlanId=vlanId,
+ setVlan=setVlan )
except (KeyError, TypeError):
errorMsg = "There was a problem loading the hosts data."
if intentId:
@@ -694,7 +698,8 @@
ipAddresses="",
tcp="",
sw1="",
- sw2=""):
+ sw2="",
+ setVlan=""):
"""
Installs a Single to Multi Point Intent
@@ -781,7 +786,8 @@
ipDst="",
tcpSrc="",
tcpDst="",
- vlanId=vlanId )
+ vlanId=vlanId,
+ setVlan=setVlan )
except (KeyError, TypeError):
errorMsg = "There was a problem loading the hosts data."
if intentId:
@@ -808,7 +814,8 @@
ipAddresses="",
tcp="",
sw1="",
- sw2=""):
+ sw2="",
+ setVlan=""):
"""
Installs a Multi to Single Point Intent
@@ -894,7 +901,8 @@
ipDst="",
tcpSrc="",
tcpDst="",
- vlanId=vlanId )
+ vlanId=vlanId,
+ setVlan=setVlan )
except (KeyError, TypeError):
errorMsg = "There was a problem loading the hosts data."
if intentId:
@@ -1592,7 +1600,7 @@
def checkFlowsState( main ):
main.log.info( itemName + ": Check flows state" )
- checkFlowsResult = main.CLIs[ 0 ].checkFlowsState()
+ checkFlowsResult = main.CLIs[ 0 ].checkFlowsState( isPENDING=False )
return checkFlowsResult
def link( main, sw1, sw2, option):