홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
Committed by Gerrit Code Review
90289b0c 1 parent b98d97ed

STC fixes 

Hosts without a VLAN are now represented as /None rather than /-1
Flow ID in location returned by POST operation was hex rather than decimal

Change-Id: Ibb403f696399012b2b90f2954112265a6e230815
Inline Side-by-side
Showing 3 changed files with 9 additions and 9 deletions
...@@ -32,18 +32,18 @@ ...@@ -32,18 +32,18 @@
32 32
33 <!-- Verify the hosts using the REST API --> 33 <!-- Verify the hosts using the REST API -->
34 <step name="Net-Flow-Objectives.Query-Host-1" requires="Net-Flow-Objectives.Find-Host-1" 34 <step name="Net-Flow-Objectives.Query-Host-1" requires="Net-Flow-Objectives.Find-Host-1"
35 - exec="find-host.py ${OC1} host1 00:00:00:00:00:01/-1"/> 35 + exec="find-host.py ${OC1} host1 00:00:00:00:00:01/None"/>
36 <step name="Net-Flow-Objectives.Validate-Host-1-Id" requires="^" 36 <step name="Net-Flow-Objectives.Validate-Host-1-Id" requires="^"
37 - exec="test '${host1Id}' == '00:00:00:00:00:01/-1'"/> 37 + exec="test '${host1Id}' == '00:00:00:00:00:01/None'"/>
38 <step name="Net-Flow-Objectives.Validate-Host-1-Mac" requires="^" 38 <step name="Net-Flow-Objectives.Validate-Host-1-Mac" requires="^"
39 exec="test '${host1Mac}' == '00:00:00:00:00:01'"/> 39 exec="test '${host1Mac}' == '00:00:00:00:00:01'"/>
40 <step name="Net-Flow-Objectives.Validate-Host-1-Ip" requires="^" 40 <step name="Net-Flow-Objectives.Validate-Host-1-Ip" requires="^"
41 exec="test '${host1IpAddress}' == '10.0.0.1'"/> 41 exec="test '${host1IpAddress}' == '10.0.0.1'"/>
42 42
43 <step name="Net-Flow-Objectives.Query-Host-2" requires="Net-Flow-Objectives.Find-Host-2" 43 <step name="Net-Flow-Objectives.Query-Host-2" requires="Net-Flow-Objectives.Find-Host-2"
44 - exec="find-host.py ${OC1} host2 00:00:00:00:00:04/-1"/> 44 + exec="find-host.py ${OC1} host2 00:00:00:00:00:04/None"/>
45 <step name="Net-Flow-Objectives.Validate-Host-2-Id" requires="^" 45 <step name="Net-Flow-Objectives.Validate-Host-2-Id" requires="^"
46 - exec="test '${host2Id}' == '00:00:00:00:00:04/-1'"/> 46 + exec="test '${host2Id}' == '00:00:00:00:00:04/None'"/>
47 <step name="Net-Flow-Objectives.Validate-Host-2-Mac" requires="^" 47 <step name="Net-Flow-Objectives.Validate-Host-2-Mac" requires="^"
48 exec="test '${host2Mac}' == '00:00:00:00:00:04'"/> 48 exec="test '${host2Mac}' == '00:00:00:00:00:04'"/>
49 <step name="Net-Flow-Objectives.Validate-Host-2-Ip" requires="^" 49 <step name="Net-Flow-Objectives.Validate-Host-2-Ip" requires="^"
......
...@@ -63,18 +63,18 @@ ...@@ -63,18 +63,18 @@
63 63
64 <!-- Verify the hosts using the REST API --> 64 <!-- Verify the hosts using the REST API -->
65 <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"
66 - exec="find-host.py ${OC1} host1 00:00:00:00:00:01/-1"/> 66 + exec="find-host.py ${OC1} host1 00:00:00:00:00:01/None"/>
67 <step name="Net-REST.Validate-Host-1-Id" requires="^" 67 <step name="Net-REST.Validate-Host-1-Id" requires="^"
68 - exec="test '${host1Id}' == '00:00:00:00:00:01/-1'"/> 68 + exec="test '${host1Id}' == '00:00:00:00:00:01/None'"/>
69 <step name="Net-REST.Validate-Host-1-Mac" requires="^" 69 <step name="Net-REST.Validate-Host-1-Mac" requires="^"
70 exec="test '${host1Mac}' == '00:00:00:00:00:01'"/> 70 exec="test '${host1Mac}' == '00:00:00:00:00:01'"/>
71 <step name="Net-REST.Validate-Host-1-Ip" requires="^" 71 <step name="Net-REST.Validate-Host-1-Ip" requires="^"
72 exec="test '${host1IpAddress}' == '10.0.0.1'"/> 72 exec="test '${host1IpAddress}' == '10.0.0.1'"/>
73 73
74 <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"
75 - exec="find-host.py ${OC1} host2 00:00:00:00:00:04/-1"/> 75 + exec="find-host.py ${OC1} host2 00:00:00:00:00:04/None"/>
76 <step name="Net-REST.Validate-Host-2-Id" requires="^" 76 <step name="Net-REST.Validate-Host-2-Id" requires="^"
77 - exec="test '${host2Id}' == '00:00:00:00:00:04/-1'"/> 77 + exec="test '${host2Id}' == '00:00:00:00:00:04/None'"/>
78 <step name="Net-REST.Validate-Host-2-Mac" requires="^" 78 <step name="Net-REST.Validate-Host-2-Mac" requires="^"
79 exec="test '${host2Mac}' == '00:00:00:00:00:04'"/> 79 exec="test '${host2Mac}' == '00:00:00:00:00:04'"/>
80 <step name="Net-REST.Validate-Host-2-Ip" requires="^" 80 <step name="Net-REST.Validate-Host-2-Ip" requires="^"
......
...@@ -195,7 +195,7 @@ public class FlowsWebResource extends AbstractWebResource { ...@@ -195,7 +195,7 @@ public class FlowsWebResource extends AbstractWebResource {
195 UriBuilder locationBuilder = uriInfo.getBaseUriBuilder() 195 UriBuilder locationBuilder = uriInfo.getBaseUriBuilder()
196 .path("flows") 196 .path("flows")
197 .path(deviceId) 197 .path(deviceId)
198 - .path(rule.id().toString()); 198 + .path(Long.toString(rule.id().value()));
199 199
200 return Response 200 return Response
201 .created(locationBuilder.build()) 201 .created(locationBuilder.build())
......