ONOS-2551 Added parameter for remove intent timeout to .params in FUNCintent. Also used taht value in FUNCintent dependency functions
Change-Id: Ibf8fb4cccecc8b1dfa723b3098d14f7c382dfd83
diff --git a/TestON/tests/FUNCintent/Dependency/FuncIntentFunction.py b/TestON/tests/FUNCintent/Dependency/FuncIntentFunction.py
index 58d5f34..d8af7ea 100644
--- a/TestON/tests/FUNCintent/Dependency/FuncIntentFunction.py
+++ b/TestON/tests/FUNCintent/Dependency/FuncIntentFunction.py
@@ -1269,7 +1269,7 @@
for intent in intentsId:
main.CLIs[ 0 ].removeIntent( intentId=intent, purge=True )
- time.sleep( 5 )
+ time.sleep( main.removeIntentSleep )
# If there is remianing intents then remove intents should fail
for i in range( main.numCtrls ):
diff --git a/TestON/tests/FUNCintent/FUNCintent.params b/TestON/tests/FUNCintent/FUNCintent.params
index 745426f..0be9ac9 100644
--- a/TestON/tests/FUNCintent/FUNCintent.params
+++ b/TestON/tests/FUNCintent/FUNCintent.params
@@ -38,6 +38,7 @@
<SLEEP>
<startup>15</startup>
<reroute>5</reroute>
+ <removeintent>5</removeintent>
<checkintent>5</checkintent>
<fwd>10</fwd>
</SLEEP>
diff --git a/TestON/tests/FUNCintent/FUNCintent.py b/TestON/tests/FUNCintent/FUNCintent.py
index 116d678..21bc886 100644
--- a/TestON/tests/FUNCintent/FUNCintent.py
+++ b/TestON/tests/FUNCintent/FUNCintent.py
@@ -46,6 +46,7 @@
wrapperFile3 = main.params[ 'DEPENDENCY' ][ 'wrapper3' ]
main.startUpSleep = int( main.params[ 'SLEEP' ][ 'startup' ] )
main.checkIntentSleep = int( main.params[ 'SLEEP' ][ 'checkintent' ] )
+ main.removeIntentSleep = int( main.params[ 'SLEEP' ][ 'removeintent' ] )
main.rerouteSleep = int( main.params[ 'SLEEP' ][ 'reroute' ] )
main.fwdSleep = int( main.params[ 'SLEEP' ][ 'fwd' ] )
gitPull = main.params[ 'GIT' ][ 'pull' ]