commit fdb8d87c90854506ce4cd0ab67cea7554f4499cd
author Jian Li <pyguni@gmail.com> Mon Apr 08 10:38:58 2019 +0900
committer Jian Li <pyguni@gmail.com> Mon Apr 08 14:30:30 2019 +0000
tree 2f4f7cf5044736741795a2f56dd3981b6c9cefcb
parent dc5d5018adca129a8b6de89abad54491131494ab

Fix: process ICMP packets in controller

Change-Id: I03ccd687cc524fa442ad322c8d8c5ba202ffede4

apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java
index 55b1a41..d74e276 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java
@@ -17,6 +17,7 @@
 
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import org.onlab.packet.Ethernet;
@@ -111,6 +112,7 @@
 import static org.onosproject.openstacknetworking.api.Constants.PRIORITY_SNAT_RULE;
 import static org.onosproject.openstacknetworking.api.Constants.PRIORITY_STATEFUL_SNAT_RULE;
 import static org.onosproject.openstacknetworking.api.Constants.ROUTING_TABLE;
+import static org.onosproject.openstacknetworking.api.InstancePort.State.ACTIVE;
 import static org.onosproject.openstacknetworking.api.OpenstackNetwork.Type.FLAT;
 import static org.onosproject.openstacknetworking.api.OpenstackNetwork.Type.VLAN;
 import static org.onosproject.openstacknetworking.impl.OsgiPropertyConstants.USE_STATEFUL_SNAT;
@@ -831,10 +833,17 @@
             return;
         }
 
+        String netId = osNetworkAdminService.subnet(routerIface.getSubnetId()).getNetworkId();
+
         Map<OpenstackNode, PortRange> gwPortRangeMap = getAssignedPortsForGateway(
                 ImmutableList.copyOf(osNodeService.nodes(GATEWAY)));
 
         osNodeService.completeNodes(GATEWAY).forEach(gwNode -> {
+            instancePortService.instancePorts(netId)
+                    .stream()
+                    .filter(port -> port.state() == ACTIVE)
+                    .forEach(port -> setGatewayToInstanceDownstreamRule(
+                            gwNode, port, install));
             if (install) {
                 PortRange gwPortRange = gwPortRangeMap.get(gwNode);
 
@@ -1005,10 +1014,18 @@
                                                IpPrefix gatewayIp,
                                                boolean install) {
 
-        TrafficSelector selector = DefaultTrafficSelector.builder()
-                .matchEthType(Ethernet.TYPE_IPV4)
-                .matchIPDst(gatewayIp)
-                .build();
+        Set<TrafficSelector> selectors = Sets.newConcurrentHashSet();
+
+        ImmutableSet<Byte> ipv4Proto = ImmutableSet.of(IPv4.PROTOCOL_TCP, IPv4.PROTOCOL_UDP);
+
+        ipv4Proto.forEach(proto -> {
+            TrafficSelector.Builder sBuilder = DefaultTrafficSelector.builder();
+            sBuilder.matchEthType(Ethernet.TYPE_IPV4)
+                    .matchIPDst(gatewayIp)
+                    .matchIPProtocol(proto);
+            selectors.add(sBuilder.build());
+        });
+
 
         ExtensionTreatment natTreatment = RulePopulatorUtil
                 .niciraConnTrackTreatmentBuilder(driverService, deviceId)
@@ -1021,14 +1038,16 @@
                 .extension(natTreatment, deviceId)
                 .build();
 
-        osFlowRuleService.setRule(
-                appId,
-                deviceId,
-                selector,
-                treatment,
-                PRIORITY_STATEFUL_SNAT_RULE,
-                GW_COMMON_TABLE,
-                install);
+        selectors.forEach(s -> {
+            osFlowRuleService.setRule(
+                    appId,
+                    deviceId,
+                    s,
+                    treatment,
+                    PRIORITY_STATEFUL_SNAT_RULE,
+                    GW_COMMON_TABLE,
+                    install);
+        });
     }
 
     private void setStatefulSnatUpstreamRule(OpenstackNode gwNode,