Fix: install flow rules to corresponding GW by listening fip events
Change-Id: Iece92a37181b1c4bf71a55ffd00b8bb080ae2fa9
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
index dda949f..6493fc8 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
@@ -188,7 +188,6 @@
throw new IllegalStateException(error);
}
-
ExternalPeerRouter externalPeerRouter = externalPeerRouter(osNet);
if (externalPeerRouter == null) {
final String errorFormat = ERR_FLOW + "no external peer router found";
@@ -221,33 +220,42 @@
Set<OpenstackNode> finalGws = Sets.newConcurrentHashSet();
finalGws.addAll(ImmutableSet.copyOf(completedGws));
- if (install) {
- if (completedGws.contains(gateway)) {
- if (completedGws.size() > 1) {
- finalGws.remove(gateway);
- if (fip.getPortId() != null) {
- setDownstreamExternalRulesHelper(fip, osNet, instPort, router,
- ImmutableSet.copyOf(finalGws), false);
- finalGws.add(gateway);
- }
- }
- if (fip.getPortId() != null) {
- setDownstreamExternalRulesHelper(fip, osNet, instPort, router,
- ImmutableSet.copyOf(finalGws), true);
- }
- } else {
- log.warn("Detected node should be included in completed gateway set");
- }
+
+ if (gateway == null) {
+ // these are floating IP related cases...
+ setDownstreamExternalRulesHelper(fip, osNet, instPort, router,
+ ImmutableSet.copyOf(finalGws), install);
+
} else {
- if (!completedGws.contains(gateway)) {
- if (completedGws.size() >= 1) {
+ // these are openstack node related cases...
+ if (install) {
+ if (completedGws.contains(gateway)) {
+ if (completedGws.size() > 1) {
+ finalGws.remove(gateway);
+ if (fip.getPortId() != null) {
+ setDownstreamExternalRulesHelper(fip, osNet, instPort, router,
+ ImmutableSet.copyOf(finalGws), false);
+ finalGws.add(gateway);
+ }
+ }
if (fip.getPortId() != null) {
setDownstreamExternalRulesHelper(fip, osNet, instPort, router,
ImmutableSet.copyOf(finalGws), true);
}
+ } else {
+ log.warn("Detected node should be included in completed gateway set");
}
} else {
- log.warn("Detected node should NOT be included in completed gateway set");
+ if (!completedGws.contains(gateway)) {
+ if (completedGws.size() >= 1) {
+ if (fip.getPortId() != null) {
+ setDownstreamExternalRulesHelper(fip, osNet, instPort, router,
+ ImmutableSet.copyOf(finalGws), true);
+ }
+ }
+ } else {
+ log.warn("Detected node should NOT be included in completed gateway set");
+ }
}
}
}
@@ -634,15 +642,6 @@
osFip.getFloatingIpAddress(), osFip.getFixedIpAddress());
});
break;
- case OPENSTACK_FLOATING_IP_REMOVED:
- eventExecutor.execute(() -> {
- NetFloatingIP osFip = event.floatingIp();
- if (!Strings.isNullOrEmpty(osFip.getPortId())) {
- disassociateFloatingIp(osFip, osFip.getPortId());
- }
- log.info("Removed floating IP {}", osFip.getFloatingIpAddress());
- });
- break;
case OPENSTACK_FLOATING_IP_CREATED:
eventExecutor.execute(() -> {
NetFloatingIP osFip = event.floatingIp();
@@ -652,6 +651,15 @@
log.info("Created floating IP {}", osFip.getFloatingIpAddress());
});
break;
+ case OPENSTACK_FLOATING_IP_REMOVED:
+ eventExecutor.execute(() -> {
+ NetFloatingIP osFip = event.floatingIp();
+ if (!Strings.isNullOrEmpty(osFip.getPortId())) {
+ disassociateFloatingIp(osFip, osFip.getPortId());
+ }
+ log.info("Removed floating IP {}", osFip.getFloatingIpAddress());
+ });
+ break;
case OPENSTACK_FLOATING_IP_UPDATED:
case OPENSTACK_ROUTER_CREATED:
case OPENSTACK_ROUTER_UPDATED: