[ONOS-6060] Merge scalablegateway app to openstacknode app
Change-Id: I8e152a943f575c2fc0305ae572b5e0150a699d30
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingArpHandler.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingArpHandler.java
index 03810c3..f99d2ae 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingArpHandler.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingArpHandler.java
@@ -33,8 +33,8 @@
import org.onosproject.net.packet.PacketProcessor;
import org.onosproject.net.packet.PacketService;
import org.onosproject.openstacknetworking.api.OpenstackNetworkService;
-import org.onosproject.scalablegateway.api.ScalableGatewayService;
import org.onosproject.openstacknetworking.api.Constants;
+import org.onosproject.openstacknode.OpenstackNodeService;
import org.slf4j.Logger;
import java.nio.ByteBuffer;
@@ -60,10 +60,10 @@
protected PacketService packetService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected ScalableGatewayService gatewayService;
+ protected OpenstackNetworkService osNetworkService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected OpenstackNetworkService osNetworkService;
+ protected OpenstackNodeService osNodeService;
private final ExecutorService eventExecutor = newSingleThreadExecutor(
groupedThreads(this.getClass().getSimpleName(), "event-handler", log));
@@ -123,7 +123,7 @@
public void process(PacketContext context) {
if (context.isHandled()) {
return;
- } else if (!gatewayService.getGatewayDeviceIds().contains(
+ } else if (!osNodeService.gatewayDeviceIds().contains(
context.inPacket().receivedFrom().deviceId())) {
// return if the packet is not from gateway nodes
return;
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
index 8594aea..dcb6555 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
@@ -48,7 +48,6 @@
import org.onosproject.openstacknode.OpenstackNodeEvent;
import org.onosproject.openstacknode.OpenstackNodeListener;
import org.onosproject.openstacknode.OpenstackNodeService;
-import org.onosproject.scalablegateway.api.ScalableGatewayService;
import org.openstack4j.model.network.NetFloatingIP;
import org.openstack4j.model.network.Network;
import org.openstack4j.model.network.Port;
@@ -102,9 +101,6 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected OpenstackNetworkService osNetworkService;
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected ScalableGatewayService gatewayService;
-
private final ExecutorService eventExecutor = newSingleThreadExecutor(
groupedThreads(this.getClass().getSimpleName(), "event-handler", log));
private final OpenstackRouterListener floatingIpLisener = new InternalFloatingIpLisener();
@@ -193,7 +189,7 @@
.matchIPDst(floating.toIpPrefix())
.build();
- gatewayService.getGatewayDeviceIds().forEach(gnodeId -> {
+ osNodeService.gatewayDeviceIds().forEach(gnodeId -> {
TrafficTreatment externalTreatment = DefaultTrafficTreatment.builder()
.setEthSrc(Constants.DEFAULT_GATEWAY_MAC)
.setEthDst(instPort.macAddress())
@@ -258,12 +254,12 @@
.matchIPSrc(instPort.ipAddress().toIpPrefix())
.build();
- gatewayService.getGatewayDeviceIds().forEach(gnodeId -> {
+ osNodeService.gatewayDeviceIds().forEach(gnodeId -> {
TrafficTreatment treatment = DefaultTrafficTreatment.builder()
.setIpSrc(floating.getIp4Address())
.setEthSrc(Constants.DEFAULT_GATEWAY_MAC)
.setEthDst(Constants.DEFAULT_EXTERNAL_ROUTER_MAC)
- .setOutput(gatewayService.getUplinkPort(gnodeId))
+ .setOutput(osNodeService.externalPort(gnodeId).get())
.build();
RulePopulatorUtil.setRule(
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingHandler.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingHandler.java
index 7d722ec..4cace0f 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingHandler.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingHandler.java
@@ -49,7 +49,6 @@
import org.onosproject.openstacknode.OpenstackNodeEvent;
import org.onosproject.openstacknode.OpenstackNodeListener;
import org.onosproject.openstacknode.OpenstackNodeService;
-import org.onosproject.scalablegateway.api.ScalableGatewayService;
import org.openstack4j.model.network.ExternalGateway;
import org.openstack4j.model.network.Network;
import org.openstack4j.model.network.Router;
@@ -96,9 +95,6 @@
protected OpenstackNodeService osNodeService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected ScalableGatewayService gatewayService;
-
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected OpenstackNetworkService osNetworkService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
@@ -195,14 +191,14 @@
.forEach(osNode -> {
setRulesToGateway(
osNode.intBridge(),
- gatewayService.getGatewayGroupId(osNode.intBridge()),
+ osNodeService.gatewayGroupId(osNode.intBridge()),
Long.valueOf(osNet.getProviderSegID()),
IpPrefix.valueOf(osSubnet.getCidr()),
install);
});
// take the first outgoing packet to controller for source NAT
- gatewayService.getGatewayDeviceIds()
+ osNodeService.gatewayDeviceIds()
.forEach(gwDeviceId -> setRulesToController(
gwDeviceId,
Long.valueOf(osNet.getProviderSegID()),
@@ -225,13 +221,13 @@
.filter(osNode -> osNode.type() == COMPUTE)
.forEach(osNode -> setRulesToGatewayWithDstIp(
osNode.intBridge(),
- gatewayService.getGatewayGroupId(osNode.intBridge()),
+ osNodeService.gatewayGroupId(osNode.intBridge()),
Long.valueOf(network.getProviderSegID()),
IpAddress.valueOf(osSubnet.getGateway()),
install));
IpAddress gatewayIp = IpAddress.valueOf(osSubnet.getGateway());
- gatewayService.getGatewayDeviceIds()
+ osNodeService.gatewayDeviceIds()
.forEach(gwDeviceId -> setGatewayIcmpRule(
gatewayIp,
gwDeviceId,
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java
index 3f5adee..ea716db 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java
@@ -51,8 +51,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.openstack4j.model.network.ExternalGateway;
import org.openstack4j.model.network.IP;
import org.openstack4j.model.network.Port;
@@ -100,9 +98,6 @@
protected MastershipService mastershipService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected ScalableGatewayService gatewayService;
-
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected OpenstackNodeService osNodeService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
@@ -147,7 +142,7 @@
.matchIPProtocol(IPv4.PROTOCOL_ICMP)
.build();
- gatewayService.getGatewayDeviceIds().forEach(gateway -> {
+ osNodeService.gatewayDeviceIds().forEach(gateway -> {
packetService.requestPackets(
icmpSelector,
PacketPriority.CONTROL,
@@ -335,7 +330,7 @@
.setPayload(ipPacket);
TrafficTreatment treatment = DefaultTrafficTreatment.builder()
- .setOutput(gatewayService.getUplinkPort(srcDevice))
+ .setOutput(osNodeService.externalPort(srcDevice).get())
.build();
OutboundPacket packet = new DefaultOutboundPacket(
@@ -386,7 +381,7 @@
public void process(PacketContext context) {
if (context.isHandled()) {
return;
- } else if (!gatewayService.getGatewayDeviceIds().contains(
+ } else if (!osNodeService.gatewayDeviceIds().contains(
context.inPacket().receivedFrom().deviceId())) {
// return if the packet is not from gateway nodes
return;
@@ -423,14 +418,6 @@
if (osNode.type() == GATEWAY) {
log.info("GATEWAY node {} detected", osNode.hostname());
eventExecutor.execute(() -> {
- // TODO add events to scalable gateway so that we
- // don't need to add gateway here and there
- GatewayNode gnode = GatewayNode.builder()
- .gatewayDeviceId(osNode.intBridge())
- .dataIpAddress(osNode.dataIp().get().getIp4Address())
- .uplinkIntf(osNode.externalPortName().get())
- .build();
- gatewayService.addGatewayNode(gnode);
requestPacket(appId);
});
}
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java
index a1a1899..eb08cc3 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java
@@ -50,7 +50,6 @@
import org.onosproject.openstacknetworking.api.OpenstackRouterService;
import org.onosproject.openstacknetworking.api.OpenstackNetworkService;
import org.onosproject.openstacknode.OpenstackNodeService;
-import org.onosproject.scalablegateway.api.ScalableGatewayService;
import org.onosproject.store.serializers.KryoNamespaces;
import org.onosproject.store.service.ConsistentMap;
import org.onosproject.store.service.DistributedSet;
@@ -118,9 +117,6 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected OpenstackRouterService osRouterService;
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected ScalableGatewayService gatewayService;
-
private final ExecutorService eventExecutor = newSingleThreadExecutor(
groupedThreads(this.getClass().getSimpleName(), "event-handler", log));
private final InternalPacketProcessor packetProcessor = new InternalPacketProcessor();
@@ -311,7 +307,7 @@
break;
}
- gatewayService.getGatewayDeviceIds().forEach(deviceId -> {
+ osNodeService.gatewayDeviceIds().forEach(deviceId -> {
DeviceId srcDeviceId = srcInstPort.deviceId();
TrafficTreatment.Builder tmpBuilder =
DefaultTrafficTreatment.builder(tBuilder.build());
@@ -367,10 +363,10 @@
}
tBuilder.setIpSrc(externalIp);
- gatewayService.getGatewayDeviceIds().forEach(deviceId -> {
+ osNodeService.gatewayDeviceIds().forEach(deviceId -> {
TrafficTreatment.Builder tmpBuilder =
DefaultTrafficTreatment.builder(tBuilder.build());
- tmpBuilder.setOutput(gatewayService.getUplinkPort(deviceId));
+ tmpBuilder.setOutput(osNodeService.externalPort(deviceId).get());
ForwardingObjective fo = DefaultForwardingObjective.builder()
.withSelector(sBuilder.build())
.withTreatment(tmpBuilder.build())
@@ -415,7 +411,7 @@
ethPacketIn.setPayload(iPacket);
TrafficTreatment treatment = DefaultTrafficTreatment.builder()
- .setOutput(gatewayService.getUplinkPort(srcDevice))
+ .setOutput(osNodeService.externalPort(srcDevice).get())
.build();
ethPacketIn.resetChecksum();
packetService.emit(new DefaultOutboundPacket(
@@ -459,7 +455,7 @@
public void process(PacketContext context) {
if (context.isHandled()) {
return;
- } else if (!gatewayService.getGatewayDeviceIds().contains(
+ } else if (!osNodeService.gatewayDeviceIds().contains(
context.inPacket().receivedFrom().deviceId())) {
// return if the packet is not from gateway nodes
return;