홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
4ccc7d3e 1 parent 2cb7e805

Reorganizing the stc specific tools. 

Change-Id: I5c2b84cc1125935d385a462c7ba727c1996c0245
Inline Side-by-side
Showing 7 changed files with 14 additions and 24 deletions
...@@ -23,7 +23,8 @@ export KARAF_ROOT=${KARAF_ROOT:-~/Applications/apache-karaf-$KARAF_VERSION} ...@@ -23,7 +23,8 @@ export KARAF_ROOT=${KARAF_ROOT:-~/Applications/apache-karaf-$KARAF_VERSION}
23 export KARAF_LOG=$KARAF_ROOT/data/log/karaf.log 23 export KARAF_LOG=$KARAF_ROOT/data/log/karaf.log
24 24
25 # Setup a path 25 # Setup a path
26 -export PATH="$PATH:$ONOS_ROOT/tools/dev/bin:$ONOS_ROOT/tools/test/bin" 26 +export PATH="$PATH:$ONOS_ROOT/tools/dev/bin"
27 +export PATH="$PATH:$ONOS_ROOT/tools/test/bin:$ONOS_ROOT/tools/test/scenarios/bin"
27 export PATH="$PATH:$ONOS_ROOT/tools/build" 28 export PATH="$PATH:$ONOS_ROOT/tools/build"
28 export PATH="$PATH:$MAVEN/bin:$KARAF_ROOT/bin" 29 export PATH="$PATH:$MAVEN/bin:$KARAF_ROOT/bin"
29 30
......
...@@ -32,8 +32,7 @@ ...@@ -32,8 +32,7 @@
32 32
33 <!-- Verify some links using the REST API --> 33 <!-- Verify some links using the REST API -->
34 <step name="Net-REST.Query-Link-1" requires="Net-REST.Find-Host-2" 34 <step name="Net-REST.Query-Link-1" requires="Net-REST.Find-Host-2"
35 - exec="${ONOS_ROOT}/tools/test/scenarios/net-rest/find-link.py 35 + exec="find-link.py ${OC1} link1 of:0000000000000001 5 of:0000000000000006 4"/>
36 - ${OC1} link1 of:0000000000000001 5 of:0000000000000006 4"/>
37 <step name="Net-REST.Validate-Link-1-State" requires="^" 36 <step name="Net-REST.Validate-Link-1-State" requires="^"
38 exec="test '${link1State}' == 'ACTIVE'"/> 37 exec="test '${link1State}' == 'ACTIVE'"/>
39 <step name="Net-REST.Validate-Link-1-Type" requires="^" 38 <step name="Net-REST.Validate-Link-1-Type" requires="^"
...@@ -48,8 +47,7 @@ ...@@ -48,8 +47,7 @@
48 exec="test '${link1DstPort}' == '4'"/> 47 exec="test '${link1DstPort}' == '4'"/>
49 48
50 <step name="Net-REST.Query-Link-2" requires="Net-REST.Find-Host-2" 49 <step name="Net-REST.Query-Link-2" requires="Net-REST.Find-Host-2"
51 - exec="${ONOS_ROOT}/tools/test/scenarios/net-rest/find-link.py 50 + exec="find-link.py ${OC1} link2 of:0000000000000019 7 of:0000000000000006 3"/>
52 - ${OC1} link2 of:0000000000000019 7 of:0000000000000006 3"/>
53 <step name="Net-REST.Validate-Link-2-State" requires="^" 51 <step name="Net-REST.Validate-Link-2-State" requires="^"
54 exec="test '${link2State}' == 'ACTIVE'"/> 52 exec="test '${link2State}' == 'ACTIVE'"/>
55 <step name="Net-REST.Validate-Link-2-Type" requires="^" 53 <step name="Net-REST.Validate-Link-2-Type" requires="^"
...@@ -65,8 +63,7 @@ ...@@ -65,8 +63,7 @@
65 63
66 <!-- Verify the hosts using the REST API --> 64 <!-- Verify the hosts using the REST API -->
67 <step name="Net-REST.Query-Host-1" requires="Net-REST.Find-Host-2" 65 <step name="Net-REST.Query-Host-1" requires="Net-REST.Find-Host-2"
68 - exec="${ONOS_ROOT}/tools/test/scenarios/net-rest/find-host.py 66 + exec="find-host.py ${OC1} host1 00:00:00:00:00:01/-1"/>
69 - ${OC1} host1 00:00:00:00:00:01/-1"/>
70 <step name="Net-REST.Validate-Host-1-Id" requires="^" 67 <step name="Net-REST.Validate-Host-1-Id" requires="^"
71 exec="test '${host1Id}' == '00:00:00:00:00:01/-1'"/> 68 exec="test '${host1Id}' == '00:00:00:00:00:01/-1'"/>
72 <step name="Net-REST.Validate-Host-1-Mac" requires="^" 69 <step name="Net-REST.Validate-Host-1-Mac" requires="^"
...@@ -75,8 +72,7 @@ ...@@ -75,8 +72,7 @@
75 exec="test '${host1IpAddress}' == '10.0.0.1'"/> 72 exec="test '${host1IpAddress}' == '10.0.0.1'"/>
76 73
77 <step name="Net-REST.Query-Host-2" requires="Net-REST.Find-Host-2" 74 <step name="Net-REST.Query-Host-2" requires="Net-REST.Find-Host-2"
78 - exec="${ONOS_ROOT}/tools/test/scenarios/net-rest/find-host.py 75 + exec="find-host.py ${OC1} host2 00:00:00:00:00:04/-1"/>
79 - ${OC1} host2 00:00:00:00:00:04/-1"/>
80 <step name="Net-REST.Validate-Host-2-Id" requires="^" 76 <step name="Net-REST.Validate-Host-2-Id" requires="^"
81 exec="test '${host2Id}' == '00:00:00:00:00:04/-1'"/> 77 exec="test '${host2Id}' == '00:00:00:00:00:04/-1'"/>
82 <step name="Net-REST.Validate-Host-2-Mac" requires="^" 78 <step name="Net-REST.Validate-Host-2-Mac" requires="^"
...@@ -86,8 +82,7 @@ ...@@ -86,8 +82,7 @@
86 82
87 <!-- Verify a switch using the REST API --> 83 <!-- Verify a switch using the REST API -->
88 <step name="Net-REST.Query-Dev-1" requires="Net-REST.Find-Host-2" 84 <step name="Net-REST.Query-Dev-1" requires="Net-REST.Find-Host-2"
89 - exec="${ONOS_ROOT}/tools/test/scenarios/net-rest/find-device.py 85 + exec="find-device.py ${OC1} dev1 of:0000000000000014"/>
90 - ${OC1} dev1 of:0000000000000014"/>
91 <step name="Net-REST.Validate-Dev1-Id" requires="^" 86 <step name="Net-REST.Validate-Dev1-Id" requires="^"
92 exec="test '${dev1Id}' == 'of:0000000000000014'"/> 87 exec="test '${dev1Id}' == 'of:0000000000000014'"/>
93 <step name="Net-REST.Validate-Dev1-Type" requires="^" 88 <step name="Net-REST.Validate-Dev1-Type" requires="^"
...@@ -95,15 +90,13 @@ ...@@ -95,15 +90,13 @@
95 <step name="Net-REST.Validate-Dev1-Available" requires="^" 90 <step name="Net-REST.Validate-Dev1-Available" requires="^"
96 exec="test '${dev1Available}' == 'True'"/> 91 exec="test '${dev1Available}' == 'True'"/>
97 <step name="Net-REST.Validate-Dev1-ChannelId" requires="^" 92 <step name="Net-REST.Validate-Dev1-ChannelId" requires="^"
98 - exec="test '${dev1IpAddress}' == '192.168.56.102'"/> 93 + exec="test '${dev1IpAddress}' == '${OCN}'"/>
99 94
100 <!-- Use REST API to create a point to point intent in each direction --> 95 <!-- Use REST API to create a point to point intent in each direction -->
101 <step name="Net-REST.Create-Intent-XY" requires="Net-REST.Find-Host-2" 96 <step name="Net-REST.Create-Intent-XY" requires="Net-REST.Find-Host-2"
102 - exec="${ONOS_ROOT}/tools/test/scenarios/net-rest/create-intent.py 97 + exec="create-intent.py ${OC1} xy of:0000000000000001 1 of:0000000000000004 1"/>
103 - ${OC1} xy of:0000000000000001 1 of:0000000000000004 1"/>
104 <step name="Net-REST.Create-Intent-YX" requires="^" 98 <step name="Net-REST.Create-Intent-YX" requires="^"
105 - exec="${ONOS_ROOT}/tools/test/scenarios/net-rest/create-intent.py 99 + exec="create-intent.py ${OC1} yx of:0000000000000004 1 of:0000000000000001 1"/>
106 - ${OC1} yx of:0000000000000004 1 of:0000000000000001 1"/>
107 100
108 <!-- Check that the intents can be fetched via the REST API --> 101 <!-- Check that the intents can be fetched via the REST API -->
109 <step name="Net-REST.Validate-Intent-XY-Installed" 102 <step name="Net-REST.Validate-Intent-XY-Installed"
...@@ -116,16 +109,14 @@ ...@@ -116,16 +109,14 @@
116 <!-- Use REST API to query flows created by the intents --> 109 <!-- Use REST API to query flows created by the intents -->
117 <step name="Net-REST.Validate-Intent-XY-Flow-Installed" 110 <step name="Net-REST.Validate-Intent-XY-Flow-Installed"
118 requires="Net-REST.Create-Intent-YX" 111 requires="Net-REST.Create-Intent-YX"
119 - exec="${ONOS_ROOT}/tools/test/scenarios/net-rest/find-flow.py 112 + exec="find-flow.py ${OC1} dev1out of:0000000000000001"/>
120 - ${OC1} dev1out of:0000000000000001"/>
121 <step name="Net-REST.Validate-XY-Flow-State" requires="^" 113 <step name="Net-REST.Validate-XY-Flow-State" requires="^"
122 exec="test '${dev1outFlowState}' == 'ADDED' -o '${dev1outFlowState}' == 'PENDING_ADD'"/> 114 exec="test '${dev1outFlowState}' == 'ADDED' -o '${dev1outFlowState}' == 'PENDING_ADD'"/>
123 <step name="Net-REST.Validate-XY-Flow-Port" requires="^" 115 <step name="Net-REST.Validate-XY-Flow-Port" requires="^"
124 exec="test ${dev1outFlowPort} -ge 1 -a ${dev1outFlowPort} -le 5"/> 116 exec="test ${dev1outFlowPort} -ge 1 -a ${dev1outFlowPort} -le 5"/>
125 117
126 <step name="Net-REST.Validate-Intent-YX-Flow-Installed" requires="Net-REST.Create-Intent-YX" 118 <step name="Net-REST.Validate-Intent-YX-Flow-Installed" requires="Net-REST.Create-Intent-YX"
127 - exec="${ONOS_ROOT}/tools/test/scenarios/net-rest/find-flow.py 119 + exec="find-flow.py ${OC1} dev4out of:0000000000000004"/>
128 - ${OC1} dev4out of:0000000000000004"/>
129 <step name="Net-REST.Validate-YX-Flow-State" requires="^" 120 <step name="Net-REST.Validate-YX-Flow-State" requires="^"
130 exec="test '${dev4outFlowState}' == 'ADDED' -o '${dev4outFlowState}' == 'PENDING_ADD'"/> 121 exec="test '${dev4outFlowState}' == 'ADDED' -o '${dev4outFlowState}' == 'PENDING_ADD'"/>
131 <step name="Net-REST.Validate-YX-Flow-Port" requires="^" 122 <step name="Net-REST.Validate-YX-Flow-Port" requires="^"
...@@ -151,12 +142,10 @@ ...@@ -151,12 +142,10 @@
151 142
152 <!-- Use REST API to be sure that flows are no longer installed --> 143 <!-- Use REST API to be sure that flows are no longer installed -->
153 <step name="Net-REST.Validate-XY-Flows-Removed" requires="Net-REST.Delete-Intent-XY" 144 <step name="Net-REST.Validate-XY-Flows-Removed" requires="Net-REST.Delete-Intent-XY"
154 - exec="${ONOS_ROOT}/tools/test/scenarios/net-rest/find-flow.py 145 + exec="find-flow.py ${OC1} dev1out of:0000000000000001"
155 - ${OC1} dev1out of:0000000000000001"
156 env="!"/> 146 env="!"/>
157 <step name="Net-REST.Validate-YX-Flows-Removed" requires="Net-REST.Delete-Intent-YX" 147 <step name="Net-REST.Validate-YX-Flows-Removed" requires="Net-REST.Delete-Intent-YX"
158 - exec="${ONOS_ROOT}/tools/test/scenarios/net-rest/find-flow.py 148 + exec="find-flow.py ${OC1} dev4out of:0000000000000004"
159 - ${OC1} dev4out of:0000000000000004"
160 env="!"/> 149 env="!"/>
161 150
162 <!-- Check that the deleted intents no longer appear in the REST API --> 151 <!-- Check that the deleted intents no longer appear in the REST API -->
......