홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
Committed by Gerrit Code Review
9ce9e259 1 parent e9121640

Make sure only one onos-mininet operation is going at a time. This script is not mutlithread safe. 

Change-Id: I066e9e6ad6405cb32c037502095a2a470eb7c9d5
Inline Side-by-side
Showing 3 changed files with 19 additions and 31 deletions
...@@ -31,34 +31,28 @@ ...@@ -31,34 +31,28 @@
31 exec="onos-create-intent ${OC1} back single-to-multi of:0000000000000011/1 of:0000000000000014/1 of:0000000000000002/1 of:000000000000000E/1"/> 31 exec="onos-create-intent ${OC1} back single-to-multi of:0000000000000011/1 of:0000000000000014/1 of:0000000000000002/1 of:000000000000000E/1"/>
32 32
33 <!-- Make sure intents installed properly --> 33 <!-- Make sure intents installed properly -->
34 - <step name="M2S-Intent.Validate-Intent-forward-Installed" requires="M2S-Intent.Create-Intent-forward" 34 + <step name="M2S-Intent.Validate-Intent-forward-Installed" requires="^"
35 exec="onos-check-intent ${OC1} forward INSTALLED"/> 35 exec="onos-check-intent ${OC1} forward INSTALLED"/>
36 - <step name="M2S-Intent.Validate-Intent-back1-Installed" requires="M2S-Intent.Create-Intent-back1" 36 + <step name="M2S-Intent.Validate-Intent-back1-Installed" requires="^"
37 exec="onos-check-intent ${OC1} back INSTALLED"/> 37 exec="onos-check-intent ${OC1} back INSTALLED"/>
38 38
39 <!-- Check the connectivity of the 11 <-> 14 intent --> 39 <!-- Check the connectivity of the 11 <-> 14 intent -->
40 <step name="M2S-Intent.Ping-1-forward" 40 <step name="M2S-Intent.Ping-1-forward"
41 - exec="onos-mininet sendAndExpect h17 ping -c1 h20 --expect \ 0% packet loss" requires="M2S-Intent.Create-Intent-forward, 41 + exec="onos-mininet sendAndExpect h17 ping -c1 h20 --expect \ 0% packet loss" requires="^" />
42 - M2S-Intent.Create-Intent-back1" />
43 <step name="M2S-Intent.Ping-1-back" 42 <step name="M2S-Intent.Ping-1-back"
44 - exec="onos-mininet sendAndExpect h20 ping -c1 h17 --expect \ 0% packet loss" requires="M2S-Intent.Create-Intent-forward, 43 + exec="onos-mininet sendAndExpect h20 ping -c1 h17 --expect \ 0% packet loss" requires="^" />
45 - M2S-Intent.Create-Intent-back1" />
46 44
47 <!-- Check the connectivity of the 11 <-> 2 intent --> 45 <!-- Check the connectivity of the 11 <-> 2 intent -->
48 <step name="M2S-Intent.Ping-2-forward" 46 <step name="M2S-Intent.Ping-2-forward"
49 - exec="onos-mininet sendAndExpect h17 ping -c1 h2 --expect \ 0% packet loss" requires="M2S-Intent.Create-Intent-forward, 47 + exec="onos-mininet sendAndExpect h17 ping -c1 h2 --expect \ 0% packet loss" requires="^" />
50 - M2S-Intent.Create-Intent-back1" />
51 <step name="M2S-Intent.Ping-2-back" 48 <step name="M2S-Intent.Ping-2-back"
52 - exec="onos-mininet sendAndExpect h2 ping -c1 h17 --expect \ 0% packet loss" requires="M2S-Intent.Create-Intent-forward, 49 + exec="onos-mininet sendAndExpect h2 ping -c1 h17 --expect \ 0% packet loss" requires="^" />
53 - M2S-Intent.Create-Intent-back1" />
54 50
55 <!-- Check the connectivity of the 11 <-> E intent --> 51 <!-- Check the connectivity of the 11 <-> E intent -->
56 <step name="M2S-Intent.Ping-3-forward" 52 <step name="M2S-Intent.Ping-3-forward"
57 - exec="onos-mininet sendAndExpect h17 ping -c1 h14 --expect \ 0% packet loss" requires="M2S-Intent.Create-Intent-forward, 53 + exec="onos-mininet sendAndExpect h17 ping -c1 h14 --expect \ 0% packet loss" requires="^" />
58 - M2S-Intent.Create-Intent-back2" />
59 <step name="M2S-Intent.Ping-3-back" 54 <step name="M2S-Intent.Ping-3-back"
60 - exec="onos-mininet sendAndExpect h14 ping -c1 h17 --expect \ 0% packet loss" requires="M2S-Intent.Create-Intent-forward, 55 + exec="onos-mininet sendAndExpect h14 ping -c1 h17 --expect \ 0% packet loss" requires="^" />
61 - M2S-Intent.Create-Intent-back3" />
62 56
63 <!-- Clean up intents --> 57 <!-- Clean up intents -->
64 <step name="M2S-Intent.Remove-Intent-forward" requires="~M2S-Intent.Ping-3-back" 58 <step name="M2S-Intent.Remove-Intent-forward" requires="~M2S-Intent.Ping-3-back"
......
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
123 exec="test ${dev4outFlowPort} -ge 1 -a ${dev4outFlowPort} -le 5"/> 123 exec="test ${dev4outFlowPort} -ge 1 -a ${dev4outFlowPort} -le 5"/>
124 124
125 <!-- Check that connectivity was established --> 125 <!-- Check that connectivity was established -->
126 - <step name="Net-REST.Ping-XY" requires="Net-REST.Create-Intent-XY,Net-REST.Create-Intent-YX" 126 + <step name="Net-REST.Ping-XY" requires="^"
127 exec="onos-mininet sendAndExpect h1 ping -c1 h4 --expect \ 0% packet loss"/> 127 exec="onos-mininet sendAndExpect h1 ping -c1 h4 --expect \ 0% packet loss"/>
128 <step name="Net-REST.Ping-YX" requires="^" 128 <step name="Net-REST.Ping-YX" requires="^"
129 exec="onos-mininet sendAndExpect h4 ping -c1 h1 --expect \ 0% packet loss"/> 129 exec="onos-mininet sendAndExpect h4 ping -c1 h1 --expect \ 0% packet loss"/>
......
...@@ -35,38 +35,32 @@ ...@@ -35,38 +35,32 @@
35 exec="onos-create-intent ${OC1} back3 point of:000000000000000E/1 of:0000000000000011/1"/> 35 exec="onos-create-intent ${OC1} back3 point of:000000000000000E/1 of:0000000000000011/1"/>
36 36
37 <!-- Make sure intents installed properly --> 37 <!-- Make sure intents installed properly -->
38 - <step name="S2M-Intent.Validate-Intent-forward-Installed" requires="S2M-Intent.Create-Intent-forward" 38 + <step name="S2M-Intent.Validate-Intent-forward-Installed" requires="^"
39 exec="onos-check-intent ${OC1} forward INSTALLED"/> 39 exec="onos-check-intent ${OC1} forward INSTALLED"/>
40 - <step name="S2M-Intent.Validate-Intent-back1-Installed" requires="S2M-Intent.Create-Intent-back1" 40 + <step name="S2M-Intent.Validate-Intent-back1-Installed" requires="^"
41 exec="onos-check-intent ${OC1} back1 INSTALLED"/> 41 exec="onos-check-intent ${OC1} back1 INSTALLED"/>
42 - <step name="S2M-Intent.Validate-Intent-back2-Installed" requires="S2M-Intent.Create-Intent-back2" 42 + <step name="S2M-Intent.Validate-Intent-back2-Installed" requires="^"
43 exec="onos-check-intent ${OC1} back2 INSTALLED"/> 43 exec="onos-check-intent ${OC1} back2 INSTALLED"/>
44 - <step name="S2M-Intent.Validate-Intent-back3-Installed" requires="S2M-Intent.Create-Intent-back3" 44 + <step name="S2M-Intent.Validate-Intent-back3-Installed" requires="^"
45 exec="onos-check-intent ${OC1} back3 INSTALLED"/> 45 exec="onos-check-intent ${OC1} back3 INSTALLED"/>
46 46
47 <!-- Check the connectivity of the 11 <-> 14 intent --> 47 <!-- Check the connectivity of the 11 <-> 14 intent -->
48 <step name="S2M-Intent.Ping-1-forward" 48 <step name="S2M-Intent.Ping-1-forward"
49 - exec="onos-mininet sendAndExpect h17 ping -c1 h20 --expect \ 0% packet loss" requires="S2M-Intent.Create-Intent-forward, 49 + exec="onos-mininet sendAndExpect h17 ping -c1 h20 --expect \ 0% packet loss" requires="^" />
50 - S2M-Intent.Create-Intent-back1" />
51 <step name="S2M-Intent.Ping-1-back" 50 <step name="S2M-Intent.Ping-1-back"
52 - exec="onos-mininet sendAndExpect h20 ping -c1 h17 --expect \ 0% packet loss" requires="S2M-Intent.Create-Intent-forward, 51 + exec="onos-mininet sendAndExpect h20 ping -c1 h17 --expect \ 0% packet loss" requires="^" />
53 - S2M-Intent.Create-Intent-back1" />
54 52
55 <!-- Check the connectivity of the 11 <-> 2 intent --> 53 <!-- Check the connectivity of the 11 <-> 2 intent -->
56 <step name="S2M-Intent.Ping-2-forward" 54 <step name="S2M-Intent.Ping-2-forward"
57 - exec="onos-mininet sendAndExpect h17 ping -c1 h2 --expect \ 0% packet loss" requires="S2M-Intent.Create-Intent-forward, 55 + exec="onos-mininet sendAndExpect h17 ping -c1 h2 --expect \ 0% packet loss" requires="^" />
58 - S2M-Intent.Create-Intent-back1" />
59 <step name="S2M-Intent.Ping-2-back" 56 <step name="S2M-Intent.Ping-2-back"
60 - exec="onos-mininet sendAndExpect h2 ping -c1 h17 --expect \ 0% packet loss" requires="S2M-Intent.Create-Intent-forward, 57 + exec="onos-mininet sendAndExpect h2 ping -c1 h17 --expect \ 0% packet loss" requires="^" />
61 - S2M-Intent.Create-Intent-back1" />
62 58
63 <!-- Check the connectivity of the 11 <-> E intent --> 59 <!-- Check the connectivity of the 11 <-> E intent -->
64 <step name="S2M-Intent.Ping-3-forward" 60 <step name="S2M-Intent.Ping-3-forward"
65 - exec="onos-mininet sendAndExpect h17 ping -c1 h14 --expect \ 0% packet loss" requires="S2M-Intent.Create-Intent-forward, 61 + exec="onos-mininet sendAndExpect h17 ping -c1 h14 --expect \ 0% packet loss" requires="^" />
66 - S2M-Intent.Create-Intent-back2" />
67 <step name="S2M-Intent.Ping-3-back" 62 <step name="S2M-Intent.Ping-3-back"
68 - exec="onos-mininet sendAndExpect h14 ping -c1 h17 --expect \ 0% packet loss" requires="S2M-Intent.Create-Intent-forward, 63 + exec="onos-mininet sendAndExpect h14 ping -c1 h17 --expect \ 0% packet loss" requires="^" />
69 - S2M-Intent.Create-Intent-back3" />
70 64
71 <!-- Clean up intents --> 65 <!-- Clean up intents -->
72 <step name="S2M-Intent.Remove-Intent-forward" requires="~S2M-Intent.Ping-3-back" 66 <step name="S2M-Intent.Remove-Intent-forward" requires="~S2M-Intent.Ping-3-back"
......