commit 279c5ff9f73008a48848bea672b17ec2376800a2
author Ray Milkey <ray@onlab.us> Thu May 11 10:30:40 2017 -0700
committer Thomas Vachuska <tom@onlab.us> Thu May 11 17:55:55 2017 +0000
tree 9a737b19f68ad25c01c795a8de016e26a61ff152
parent 4546217cde03cb9bd9bc9e4f2884fb9c31db1241

STC fixes for NoSuchPath exceptions

Suppress intent exceptions until after the links are
known to be back up and the intent reinstalled.

Change-Id: I801cecb98600b4b844750aa8d7c2157d6d36f6e9

tools/test/scenarios/net-host-intent.xml

diff --git a/tools/test/scenarios/net-host-intent.xml b/tools/test/scenarios/net-host-intent.xml
index 5dc6cee..d4f7a0b 100644
--- a/tools/test/scenarios/net-host-intent.xml
+++ b/tools/test/scenarios/net-host-intent.xml
@@ -44,15 +44,15 @@
         <step name="Host-Intent.Validate-Intent-Failed" requires="Host-Intent.Link-2-Down"
               exec="onos-check-intent ${OC1} h2h FAILED"/>
 
-        <dependency name="Host-Intent.ExpectExceptionMarkEnd"
-                    requires="~Host-Intent.Validate-Intent-Failed"/>
-
         <dependency name="Host-Intent.Link-1-Up"
-                    requires="~Host-Intent.ExpectExceptionMarkEnd" />
+                    requires="~Host-Intent.Validate-Intent-Failed" />
 
         <step name="Host-Intent.Validate-Intent-Installed-Again" requires="Host-Intent.Link-1-Up"
               exec="onos-check-intent ${OC1} h2h INSTALLED"/>
 
+        <dependency name="Host-Intent.ExpectExceptionMarkEnd"
+                    requires="~Host-Intent.Validate-Intent-Installed-Again"/>
+
         <dependency name="Host-Intent.Ping-4"
                     requires="~Host-Intent.Validate-Intent-Installed-Again" />
 

tools/test/scenarios/net-point-intent.xml

diff --git a/tools/test/scenarios/net-point-intent.xml b/tools/test/scenarios/net-point-intent.xml
index 3b3134d..3800f43 100644
--- a/tools/test/scenarios/net-point-intent.xml
+++ b/tools/test/scenarios/net-point-intent.xml
@@ -55,22 +55,21 @@
         <step name="P2P-Intent.Validate-Intent-YX-Failed" requires="P2P-Intent.Link-2-Down"
               exec="onos-check-intent ${OC1} yx FAILED"/>
 
-        <dependency name="P2P-Intent.ExpectExceptionMarkEnd"
-                    requires="~P2P-Intent.Validate-Intent-XY-Failed,
-                              ~P2P-Intent.Validate-Intent-YX-Failed"/>
-
         <dependency name="P2P-Intent.Link-1-Up"
-                    requires="~P2P-Intent.ExpectExceptionMarkEnd" />
+                    requires="~P2P-Intent.Validate-Intent-XY-Failed, ~P2P-Intent.Validate-Intent-YX-Failed" />
 
         <step name="P2P-Intent.Validate-Intent-XY-Installed-Again" requires="P2P-Intent.Link-1-Up"
               exec="onos-check-intent ${OC1} xy INSTALLED"/>
         <step name="P2P-Intent.Validate-Intent-YX-Installed-Again" requires="P2P-Intent.Link-1-Up"
               exec="onos-check-intent ${OC1} yx INSTALLED"/>
 
-        <dependency name="P2P-Intent.Ping-4"
+        <dependency name="P2P-Intent.ExpectExceptionMarkEnd"
                     requires="~P2P-Intent.Validate-Intent-XY-Installed-Again,
                               ~P2P-Intent.Validate-Intent-YX-Installed-Again"/>
 
+        <dependency name="P2P-Intent.Ping-4"
+                    requires="~P2P-Intent.ExpectExceptionMarkEnd"/>
+
         <step name="P2P-Intent.Remove-Intent-XY" requires="~P2P-Intent.Net-Link-Down-Up"
               exec="onos -f ${OC1} remove-intent -p org.onosproject.cli xy"/>
         <step name="P2P-Intent.Remove-Intent-YX" requires="~P2P-Intent.Net-Link-Down-Up"