홍길동 / 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 57 additions and 66 deletions
......@@ -269,42 +269,39 @@ public class TenantNetworkWebResource extends AbstractWebResource {
TenantNetwork network = null;
ConcurrentMap<TenantNetworkId, TenantNetwork> networksMap = Maps
.newConcurrentMap();
if (node != null) {
checkArgument(node.get("admin_state_up").isBoolean(), "admin_state_up should be boolean");
checkArgument(node.get("shared").isBoolean(), "shared should be boolean");
checkArgument(node.get("router:external").isBoolean(), "router:external should be boolean");
String name = node.get("name").asText();
boolean adminStateUp = node.get("admin_state_up").asBoolean();
String state = node.get("status").asText();
boolean shared = node.get("shared").asBoolean();
String tenantId = node.get("tenant_id").asText();
boolean routerExternal = node.get("router:external").asBoolean();
String type = node.get("provider:network_type").asText();
String physicalNetwork = node.get("provider:physical_network")
.asText();
String segmentationId = node.get("provider:segmentation_id")
.asText();
TenantNetworkId id = null;
if (flag == CREATE_NETWORK) {
id = TenantNetworkId.networkId(node.get("id").asText());
} else if (flag == UPDATE_NETWORK) {
id = networkId;
}
network = new DefaultTenantNetwork(
id,
name,
adminStateUp,
isState(state),
shared,
TenantId.tenantId(tenantId),
routerExternal,
isType(type),
PhysicalNetwork
.physicalNetwork(physicalNetwork),
SegmentationId
.segmentationId(segmentationId));
networksMap.putIfAbsent(id, network);
checkArgument(node.get("admin_state_up").isBoolean(), "admin_state_up should be boolean");
checkArgument(node.get("shared").isBoolean(), "shared should be boolean");
checkArgument(node.get("router:external").isBoolean(), "router:external should be boolean");
String name = node.get("name").asText();
boolean adminStateUp = node.get("admin_state_up").asBoolean();
String state = node.get("status").asText();
boolean shared = node.get("shared").asBoolean();
String tenantId = node.get("tenant_id").asText();
boolean routerExternal = node.get("router:external").asBoolean();
String type = node.get("provider:network_type").asText();
String physicalNetwork = node.get("provider:physical_network").asText();
String segmentationId = node.get("provider:segmentation_id").asText();
TenantNetworkId id = null;
if (flag.equals(CREATE_NETWORK)) {
id = TenantNetworkId.networkId(node.get("id").asText());
} else if (flag.equals(UPDATE_NETWORK)) {
id = networkId;
}
network = new DefaultTenantNetwork(
id,
name,
adminStateUp,
isState(state),
shared,
TenantId.tenantId(tenantId),
routerExternal,
isType(type),
PhysicalNetwork
.physicalNetwork(physicalNetwork),
SegmentationId
.segmentationId(segmentationId));
networksMap.putIfAbsent(id, network);
return Collections.unmodifiableCollection(networksMap.values());
}
......@@ -319,38 +316,32 @@ public class TenantNetworkWebResource extends AbstractWebResource {
TenantNetwork network = null;
ConcurrentMap<TenantNetworkId, TenantNetwork> networksMap = Maps
.newConcurrentMap();
if (nodes != null) {
for (JsonNode node : nodes) {
String id = node.get("id").asText();
String name = node.get("name").asText();
boolean adminStateUp = node.get("admin_state_up").asBoolean();
String state = node.get("status").asText();
boolean shared = node.get("shared").asBoolean();
String tenantId = node.get("tenant_id").asText();
boolean routerExternal = node.get("router:external")
.asBoolean();
String type = node.get("provider:network_type").asText();
String physicalNetwork = node.get("provider:physical_network")
.asText();
String segmentationId = node.get("provider:segmentation_id")
.asText();
network = new DefaultTenantNetwork(
TenantNetworkId
.networkId(id),
name,
adminStateUp,
isState(state),
shared,
TenantId.tenantId(tenantId),
routerExternal,
isType(type),
PhysicalNetwork
.physicalNetwork(physicalNetwork),
SegmentationId
.segmentationId(segmentationId));
networksMap.putIfAbsent(TenantNetworkId.networkId(id), network);
}
for (JsonNode node : nodes) {
String id = node.get("id").asText();
String name = node.get("name").asText();
boolean adminStateUp = node.get("admin_state_up").asBoolean();
String state = node.get("status").asText();
boolean shared = node.get("shared").asBoolean();
String tenantId = node.get("tenant_id").asText();
boolean routerExternal = node.get("router:external")
.asBoolean();
String type = node.get("provider:network_type").asText();
String physicalNetwork = node.get("provider:physical_network").asText();
String segmentationId = node.get("provider:segmentation_id").asText();
network = new DefaultTenantNetwork(
TenantNetworkId.networkId(id),
name,
adminStateUp,
isState(state),
shared,
TenantId.tenantId(tenantId),
routerExternal,
isType(type),
PhysicalNetwork.physicalNetwork(physicalNetwork),
SegmentationId.segmentationId(segmentationId));
networksMap.putIfAbsent(TenantNetworkId.networkId(id), network);
}
return Collections.unmodifiableCollection(networksMap.values());
}
......