ONOS-6034 Added purge and sync flow rules CLIs
Also removed unnecessary boxing from RoutingSnatHandler
Change-Id: Ibb0a1e5dc6465bbf378bf7d105e162f429f6c02a
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 eb08cc3..bd6eeb2 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
@@ -24,7 +24,6 @@
import org.onlab.packet.IPv4;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
-import org.onlab.packet.MacAddress;
import org.onlab.packet.TCP;
import org.onlab.packet.TpPort;
import org.onlab.packet.UDP;
@@ -149,8 +148,8 @@
private void initializeUnusedPortNumSet() {
for (int i = TP_PORT_MINIMUM_NUM; i < TP_PORT_MAXIMUM_NUM; i++) {
- if (!allocatedPortNumMap.containsKey(Integer.valueOf(i))) {
- unUsedPortNumSet.add(Integer.valueOf(i));
+ if (!allocatedPortNumMap.containsKey(i)) {
+ unUsedPortNumSet.add(i);
}
}
@@ -168,26 +167,25 @@
IPv4 iPacket = (IPv4) eth.getPayload();
InboundPacket packetIn = context.inPacket();
- int patPort = getPortNum(eth.getSourceMAC(),
- iPacket.getDestinationAddress());
+ int patPort = getPortNum();
+ if (patPort == 0) {
+ log.error("There's no unused port for PAT. Drop this packet");
+ return;
+ }
InstancePort srcInstPort = instancePortService.instancePort(eth.getSourceMAC());
if (srcInstPort == null) {
- log.trace(ERR_PACKETIN + "source host(MAC:{}) does not exist",
+ log.error(ERR_PACKETIN + "source host(MAC:{}) does not exist",
eth.getSourceMAC());
return;
}
+
IpAddress srcIp = IpAddress.valueOf(iPacket.getSourceAddress());
Subnet srcSubnet = getSourceSubnet(srcInstPort, srcIp);
IpAddress externalGatewayIp = getExternalIp(srcSubnet);
if (externalGatewayIp == null) {
return;
}
- if (patPort == 0) {
- log.error("There's no unused port for external ip {}... Drop this packet",
- getExternalIp(srcSubnet));
- return;
- }
populateSnatFlowRules(context.inPacket(),
srcInstPort,
@@ -420,29 +418,27 @@
ByteBuffer.wrap(ethPacketIn.serialize())));
}
- private int getPortNum(MacAddress sourceMac, int destinationAddress) {
+ private int getPortNum() {
if (unUsedPortNumSet.isEmpty()) {
clearPortNumMap();
}
int portNum = findUnusedPortNum();
-
if (portNum != 0) {
- unUsedPortNumSet.remove(Integer.valueOf(portNum));
- allocatedPortNumMap
- .put(Integer.valueOf(portNum), Long.valueOf(System.currentTimeMillis()));
+ unUsedPortNumSet.remove(portNum);
+ allocatedPortNumMap.put(portNum, System.currentTimeMillis());
}
return portNum;
}
private int findUnusedPortNum() {
- return unUsedPortNumSet.stream().findAny().orElse(Integer.valueOf(0)).intValue();
+ return unUsedPortNumSet.stream().findAny().orElse(0);
}
private void clearPortNumMap() {
allocatedPortNumMap.entrySet().forEach(e -> {
- if (System.currentTimeMillis() - e.getValue().value().longValue() > TIME_OUT_SNAT_PORT_MS) {
+ if (System.currentTimeMillis() - e.getValue().value() > TIME_OUT_SNAT_PORT_MS) {
allocatedPortNumMap.remove(e.getKey());
unUsedPortNumSet.add(e.getKey());
}