홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Satish K
Committed by Gerrit Code Review
ab54ffa1 1 parent 7dc63d9a

Wrong Check and invalid check fix 

Change-Id: I99e55295c68c073f4aa4c4d5c3218e5bc460e6cc
Inline Side-by-side
Showing 1 changed file with 11 additions and 20 deletions
...@@ -269,7 +269,6 @@ public class TenantNetworkWebResource extends AbstractWebResource { ...@@ -269,7 +269,6 @@ public class TenantNetworkWebResource extends AbstractWebResource {
269 TenantNetwork network = null; 269 TenantNetwork network = null;
270 ConcurrentMap<TenantNetworkId, TenantNetwork> networksMap = Maps 270 ConcurrentMap<TenantNetworkId, TenantNetwork> networksMap = Maps
271 .newConcurrentMap(); 271 .newConcurrentMap();
272 - if (node != null) {
273 checkArgument(node.get("admin_state_up").isBoolean(), "admin_state_up should be boolean"); 272 checkArgument(node.get("admin_state_up").isBoolean(), "admin_state_up should be boolean");
274 checkArgument(node.get("shared").isBoolean(), "shared should be boolean"); 273 checkArgument(node.get("shared").isBoolean(), "shared should be boolean");
275 checkArgument(node.get("router:external").isBoolean(), "router:external should be boolean"); 274 checkArgument(node.get("router:external").isBoolean(), "router:external should be boolean");
...@@ -280,14 +279,12 @@ public class TenantNetworkWebResource extends AbstractWebResource { ...@@ -280,14 +279,12 @@ public class TenantNetworkWebResource extends AbstractWebResource {
280 String tenantId = node.get("tenant_id").asText(); 279 String tenantId = node.get("tenant_id").asText();
281 boolean routerExternal = node.get("router:external").asBoolean(); 280 boolean routerExternal = node.get("router:external").asBoolean();
282 String type = node.get("provider:network_type").asText(); 281 String type = node.get("provider:network_type").asText();
283 - String physicalNetwork = node.get("provider:physical_network") 282 + String physicalNetwork = node.get("provider:physical_network").asText();
284 - .asText(); 283 + String segmentationId = node.get("provider:segmentation_id").asText();
285 - String segmentationId = node.get("provider:segmentation_id")
286 - .asText();
287 TenantNetworkId id = null; 284 TenantNetworkId id = null;
288 - if (flag == CREATE_NETWORK) { 285 + if (flag.equals(CREATE_NETWORK)) {
289 id = TenantNetworkId.networkId(node.get("id").asText()); 286 id = TenantNetworkId.networkId(node.get("id").asText());
290 - } else if (flag == UPDATE_NETWORK) { 287 + } else if (flag.equals(UPDATE_NETWORK)) {
291 id = networkId; 288 id = networkId;
292 } 289 }
293 network = new DefaultTenantNetwork( 290 network = new DefaultTenantNetwork(
...@@ -304,7 +301,7 @@ public class TenantNetworkWebResource extends AbstractWebResource { ...@@ -304,7 +301,7 @@ public class TenantNetworkWebResource extends AbstractWebResource {
304 SegmentationId 301 SegmentationId
305 .segmentationId(segmentationId)); 302 .segmentationId(segmentationId));
306 networksMap.putIfAbsent(id, network); 303 networksMap.putIfAbsent(id, network);
307 - } 304 +
308 return Collections.unmodifiableCollection(networksMap.values()); 305 return Collections.unmodifiableCollection(networksMap.values());
309 } 306 }
310 307
...@@ -319,7 +316,6 @@ public class TenantNetworkWebResource extends AbstractWebResource { ...@@ -319,7 +316,6 @@ public class TenantNetworkWebResource extends AbstractWebResource {
319 TenantNetwork network = null; 316 TenantNetwork network = null;
320 ConcurrentMap<TenantNetworkId, TenantNetwork> networksMap = Maps 317 ConcurrentMap<TenantNetworkId, TenantNetwork> networksMap = Maps
321 .newConcurrentMap(); 318 .newConcurrentMap();
322 - if (nodes != null) {
323 for (JsonNode node : nodes) { 319 for (JsonNode node : nodes) {
324 String id = node.get("id").asText(); 320 String id = node.get("id").asText();
325 String name = node.get("name").asText(); 321 String name = node.get("name").asText();
...@@ -330,13 +326,10 @@ public class TenantNetworkWebResource extends AbstractWebResource { ...@@ -330,13 +326,10 @@ public class TenantNetworkWebResource extends AbstractWebResource {
330 boolean routerExternal = node.get("router:external") 326 boolean routerExternal = node.get("router:external")
331 .asBoolean(); 327 .asBoolean();
332 String type = node.get("provider:network_type").asText(); 328 String type = node.get("provider:network_type").asText();
333 - String physicalNetwork = node.get("provider:physical_network") 329 + String physicalNetwork = node.get("provider:physical_network").asText();
334 - .asText(); 330 + String segmentationId = node.get("provider:segmentation_id").asText();
335 - String segmentationId = node.get("provider:segmentation_id")
336 - .asText();
337 network = new DefaultTenantNetwork( 331 network = new DefaultTenantNetwork(
338 - TenantNetworkId 332 + TenantNetworkId.networkId(id),
339 - .networkId(id),
340 name, 333 name,
341 adminStateUp, 334 adminStateUp,
342 isState(state), 335 isState(state),
...@@ -344,13 +337,11 @@ public class TenantNetworkWebResource extends AbstractWebResource { ...@@ -344,13 +337,11 @@ public class TenantNetworkWebResource extends AbstractWebResource {
344 TenantId.tenantId(tenantId), 337 TenantId.tenantId(tenantId),
345 routerExternal, 338 routerExternal,
346 isType(type), 339 isType(type),
347 - PhysicalNetwork 340 + PhysicalNetwork.physicalNetwork(physicalNetwork),
348 - .physicalNetwork(physicalNetwork), 341 + SegmentationId.segmentationId(segmentationId));
349 - SegmentationId
350 - .segmentationId(segmentationId));
351 networksMap.putIfAbsent(TenantNetworkId.networkId(id), network); 342 networksMap.putIfAbsent(TenantNetworkId.networkId(id), network);
352 } 343 }
353 - } 344 +
354 return Collections.unmodifiableCollection(networksMap.values()); 345 return Collections.unmodifiableCollection(networksMap.values());
355 } 346 }
356 347
......