홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
jskim
Committed by Gerrit Code Review
3d66aca4 1 parent a67f8f25

Fixed to add the subNetCidr of flow when deleted. 

Change-Id: I2eb10b3222e63c1f53a4bb52d35bebc2de81a992
Inline Side-by-side
Showing 2 changed files with 11 additions and 6 deletions
......@@ -137,7 +137,11 @@ public class OpenstackRoutingManager extends AbstractVmHandler implements Openst
openstackService.ports().stream()
.filter(osPort -> osPort.deviceOwner().equals(DEVICE_OWNER_ROUTER_INTERFACE) &&
osPort.deviceId().equals(osRouter.id()))
.forEach(osPort -> unsetExternalConnection(osRouter, osPort.networkId()));
.forEach(osPort -> {
String subnetId = osPort.fixedIps().keySet().stream().findFirst().get();
OpenstackSubnet osSubNet = openstackService.subnet(subnetId);
unsetExternalConnection(osRouter, osPort.networkId(), osSubNet.cidr());
});
log.info("Disconnected external gateway from router {}",
osRouter.name());
......@@ -184,7 +188,7 @@ public class OpenstackRoutingManager extends AbstractVmHandler implements Openst
unsetRoutes(osRouter, osSubnet);
if (osRouter.gatewayExternalInfo().externalFixedIps().size() > 0) {
unsetExternalConnection(osRouter, osNet.id());
unsetExternalConnection(osRouter, osNet.id(), osSubnet.cidr());
}
log.info("Disconnected {} from router {}", osSubnet.cidr(), osRouter.name());
}
......@@ -250,7 +254,7 @@ public class OpenstackRoutingManager extends AbstractVmHandler implements Openst
populateExternalRules(osNet, osSubNet);
}
private void unsetExternalConnection(OpenstackRouter osRouter, String osNetId) {
private void unsetExternalConnection(OpenstackRouter osRouter, String osNetId, String subNetCidr) {
if (!osRouter.gatewayExternalInfo().isEnablePnat()) {
log.debug("Source NAT is disabled");
return;
......@@ -258,7 +262,7 @@ public class OpenstackRoutingManager extends AbstractVmHandler implements Openst
// FIXME router interface is subnet specific, not network
OpenstackNetwork osNet = openstackService.network(osNetId);
removeExternalRules(osNet);
removeExternalRules(osNet, subNetCidr);
}
private void setRoutes(OpenstackRouter osRouter, Optional<Host> host) {
......@@ -324,10 +328,11 @@ public class OpenstackRoutingManager extends AbstractVmHandler implements Openst
populateGatewayToController(Long.valueOf(osNet.segmentId()), osSubNet.cidr());
}
private void removeExternalRules(OpenstackNetwork osNet) {
private void removeExternalRules(OpenstackNetwork osNet, String subNetCidr) {
TrafficSelector.Builder sBuilder = DefaultTrafficSelector.builder();
sBuilder.matchEthType(Ethernet.TYPE_IPV4)
.matchTunnelId(Long.valueOf(osNet.segmentId()))
.matchIPSrc(IpPrefix.valueOf(subNetCidr))
.matchEthDst(Constants.DEFAULT_GATEWAY_MAC);
nodeService.completeNodes().forEach(node -> {
......
......@@ -57,7 +57,7 @@ public class OpenstackPortWebResource extends AbstractWebResource {
@Path("{portUUID}")
@DELETE
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public Response deletePorts(@PathParam("portUUID") String id) {
return Response.noContent().build();
}
......