[ONOS-5776] Floating IP flow rule initialization process
Moves the floating IP flow rule initialization process from OpenstackRoutingManager to OpenstackFloatingIpManager.
Removes gateway initialization process because it is also being done in OpenstackRoutingManager.
(The change is compatible with SONA pipeline refactoring change)
Change-Id: I6482cc44eed62bde8d50a850a8e9248545a6071e
diff --git a/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackFloatingIpManager.java b/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackFloatingIpManager.java
index 7b7f778..702248f 100644
--- a/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackFloatingIpManager.java
+++ b/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackFloatingIpManager.java
@@ -50,7 +50,6 @@
import org.onosproject.openstacknode.OpenstackNodeEvent;
import org.onosproject.openstacknode.OpenstackNodeListener;
import org.onosproject.openstacknode.OpenstackNodeService;
-import org.onosproject.scalablegateway.api.GatewayNode;
import org.onosproject.scalablegateway.api.ScalableGatewayService;
import org.onosproject.store.serializers.KryoNamespaces;
import org.onosproject.store.service.ConsistentMap;
@@ -68,7 +67,6 @@
import static org.onlab.util.Tools.groupedThreads;
import static org.onosproject.openstacknetworking.Constants.*;
import static org.onosproject.openstacknetworking.RulePopulatorUtil.buildExtension;
-import static org.onosproject.openstacknode.OpenstackNodeService.NodeType.GATEWAY;
@Service
@@ -395,17 +393,7 @@
switch (event.type()) {
case COMPLETE:
- if (node.type() == GATEWAY) {
- log.info("GATEWAY node {} detected", node.hostname());
- eventExecutor.execute(() -> {
- GatewayNode gnode = GatewayNode.builder()
- .gatewayDeviceId(node.intBridge())
- .dataIpAddress(node.dataIp().getIp4Address())
- .uplinkIntf(node.externalPortName().get())
- .build();
- gatewayService.addGatewayNode(gnode);
- });
- }
+ reinstallVmFlow(null);
break;
case INIT:
case DEVICE_CREATED: