mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-16 18:02:05 +02:00
Code Issues Projects Releases Wiki Activity

[ONOS-4926] floating Ip flow rules handling when restarting ONOS

Browse Source 
Change-Id: I844ebf8c0ef48289675124c79c96edd886bbff16
This commit is contained in:
sangho 2016-08-10 17:08:17 +09:00 committed by Gerrit Code Review
parent 788797ef87
commit a2d9f49bd4
1 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackFloatingIpManager.java
View File

@ -40,6 +40,8 @@ import org.onosproject.net.flowobjective.FlowObjectiveService;
import org.onosproject.net.flowobjective.ForwardingObjective;
import org.onosproject.net.host.HostService;
import org.onosproject.openstackinterface.OpenstackFloatingIP;
import org.onosproject.openstackinterface.OpenstackInterfaceService;
import org.onosproject.openstacknetworking.AbstractVmHandler;
import org.onosproject.openstacknetworking.Constants;
import org.onosproject.openstacknetworking.OpenstackFloatingIpService;
import org.onosproject.openstacknetworking.RulePopulatorUtil;
@ -70,7 +72,7 @@ import static org.onosproject.openstacknode.OpenstackNodeService.NodeType.GATEWA
@Service
@Component(immediate = true)
public class OpenstackFloatingIpManager implements OpenstackFloatingIpService {
public class OpenstackFloatingIpManager extends AbstractVmHandler implements OpenstackFloatingIpService {
private final Logger log = LoggerFactory.getLogger(getClass());
@ -95,6 +97,9 @@ public class OpenstackFloatingIpManager implements OpenstackFloatingIpService {
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected ScalableGatewayService gatewayService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected OpenstackInterfaceService openstackService;
private static final String NOT_ASSOCIATED = "null";
private static final KryoNamespace.Builder FLOATING_IP_SERIALIZER =
KryoNamespace.newBuilder().register(KryoNamespaces.API);
@ -108,6 +113,7 @@ public class OpenstackFloatingIpManager implements OpenstackFloatingIpService {
@Activate
protected void activate() {
super.activate();
appId = coreService.registerApplication(ROUTING_APP_ID);
nodeService.addListener(nodeListener);
floatingIpMap = storageService.<IpAddress, Host>consistentMapBuilder()
@ -121,10 +127,33 @@ public class OpenstackFloatingIpManager implements OpenstackFloatingIpService {
@Deactivate
protected void deactivate() {
super.deactivate();
nodeService.removeListener(nodeListener);
log.info("Stopped");
}
@Override
protected void hostDetected(Host host) {
IpAddress hostIp = host.ipAddresses().stream().findFirst().get();
Optional<OpenstackFloatingIP> floatingIp = openstackService.floatingIps().stream()
.filter(fip -> fip.fixedIpAddress() != null && fip.fixedIpAddress().equals(hostIp))
.findFirst();
if (floatingIp.isPresent()) {
eventExecutor.execute(() -> associateFloatingIp(floatingIp.get()));
}
}
@Override
protected void hostRemoved(Host host) {
IpAddress hostIp = host.ipAddresses().stream().findFirst().get();
Optional<OpenstackFloatingIP> floatingIp = openstackService.floatingIps().stream()
.filter(fip -> fip.fixedIpAddress() != null && fip.fixedIpAddress().equals(hostIp))
.findFirst();
if (floatingIp.isPresent()) {
eventExecutor.execute(() -> disassociateFloatingIp(floatingIp.get()));
}
}
@Override
public void createFloatingIp(OpenstackFloatingIP floatingIp) {
}
@ -285,18 +314,6 @@ public class OpenstackFloatingIpManager implements OpenstackFloatingIpService {
});
}
private void reloadFloatingIpRules() {
floatingIpMap.entrySet().stream().forEach(entry -> {
IpAddress floatingIp = entry.getKey();
Host associatedVm = entry.getValue().value();
populateFloatingIpRules(floatingIp, associatedVm);
log.debug("Reload floating IP {} mapped to {}",
floatingIp, associatedVm.ipAddresses());
});
}
// TODO apply existing floating IPs on service start-up by handling host event
// TODO consider the case that port with associated floating IP is attached to a VM
private class InternalNodeListener implements OpenstackNodeListener {
@ -316,7 +333,6 @@ public class OpenstackFloatingIpManager implements OpenstackFloatingIpService {
.uplinkIntf(node.externalPortName().get())
.build();
gatewayService.addGatewayNode(gnode);
reloadFloatingIpRules();
});
}
break;