commit 1099d14c95fdc36243b96de5a1ca93989961fbe7
author Daniel Park <dan.mcpark84@gmail.com> Mon Feb 18 17:39:56 2019 +0900
committer Jian Li <pyguni@gmail.com> Wed Mar 06 01:58:38 2019 +0000
tree 2444e5d596dfe619a6464e96156ac322f573f232
parent 1bf5435ea476c6497ac1b142f34a68aee0a1a138

Moves flat jump rules from OpenstackSwitchingHandler to OpenstackFlowRuleManager.

Change-Id: I88059fa5f2868bd5e9f08f2fafd5e3bd57d6f8f4

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

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackFlowRuleManager.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackFlowRuleManager.java
index 1858ab9..5608bce 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackFlowRuleManager.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackFlowRuleManager.java
@@ -16,12 +16,15 @@
 
 package org.onosproject.openstacknetworking.impl;
 
+import org.onlab.packet.Ethernet;
 import org.onosproject.cluster.ClusterService;
 import org.onosproject.cluster.LeadershipService;
 import org.onosproject.cluster.NodeId;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
 import org.onosproject.net.DeviceId;
+import org.onosproject.net.Port;
+import org.onosproject.net.device.DeviceService;
 import org.onosproject.net.flow.DefaultFlowRule;
 import org.onosproject.net.flow.DefaultTrafficSelector;
 import org.onosproject.net.flow.DefaultTrafficTreatment;
@@ -42,14 +45,20 @@
 import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.onosproject.openstacknode.api.OpenstackPhyInterface;
 import org.slf4j.Logger;
 
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import static org.onlab.util.Tools.groupedThreads;
+import static org.onosproject.net.AnnotationKeys.PORT_NAME;
+import static org.onosproject.openstacknetworking.api.Constants.DHCP_TABLE;
 import static org.onosproject.openstacknetworking.api.Constants.OPENSTACK_NETWORKING_APP_ID;
+import static org.onosproject.openstacknetworking.api.Constants.PRIORITY_FLAT_JUMP_UPSTREAM_RULE;
+import static org.onosproject.openstacknetworking.api.Constants.STAT_FLAT_OUTBOUND_TABLE;
 import static org.onosproject.openstacknode.api.OpenstackNode.NodeType.COMPUTE;
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -80,6 +89,9 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY)
     protected OpenstackNodeService osNodeService;
 
+    @Reference(cardinality = ReferenceCardinality.MANDATORY)
+    protected DeviceService deviceService;
+
     private final ExecutorService deviceEventExecutor =
             Executors.newSingleThreadExecutor(groupedThreads(
                     getClass().getSimpleName(), "device-event"));
@@ -229,6 +241,65 @@
                                 Constants.VTAP_FLAT_OUTBOUND_TABLE);
         connectTables(deviceId, Constants.VTAP_FLAT_OUTBOUND_TABLE,
                                 Constants.FLAT_TABLE);
+
+        // for FLAT table drop
+        setUpTableMissEntry(deviceId, Constants.FLAT_TABLE);
+
+        // for FLAT jump rules
+        if (!osNodeService.node(deviceId).phyIntfs().isEmpty()) {
+            setFlatJumpRules(deviceId);
+        }
+    }
+
+    private void setFlatJumpRules(DeviceId deviceId) {
+        osNodeService.node(deviceId)
+                     .phyIntfs()
+                     .forEach(phyInterface ->
+                             setFlatJumpRulesForPhyIntf(deviceId, phyInterface));
+    }
+
+    private void setFlatJumpRulesForPhyIntf(DeviceId deviceId,
+                                            OpenstackPhyInterface phyInterface) {
+        Optional<Port> phyPort = deviceService.getPorts(deviceId).stream()
+                .filter(port ->
+                        Objects.equals(port.annotations().value(PORT_NAME), phyInterface.intf()))
+                .findAny();
+
+        phyPort.ifPresent(port -> {
+            TrafficSelector.Builder selector = DefaultTrafficSelector.builder();
+            selector.matchInPort(port.number())
+                    .matchEthType(Ethernet.TYPE_IPV4);
+
+            TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder();
+            treatment.transition(STAT_FLAT_OUTBOUND_TABLE);
+            FlowRule flowRuleForIp = DefaultFlowRule.builder()
+                    .forDevice(deviceId)
+                    .withSelector(selector.build())
+                    .withTreatment(treatment.build())
+                    .withPriority(PRIORITY_FLAT_JUMP_UPSTREAM_RULE)
+                    .fromApp(appId)
+                    .makePermanent()
+                    .forTable(DHCP_TABLE)
+                    .build();
+
+            applyRule(flowRuleForIp, true);
+
+            selector = DefaultTrafficSelector.builder();
+            selector.matchInPort(port.number())
+                    .matchEthType(Ethernet.TYPE_ARP);
+
+            FlowRule flowRuleForArp = DefaultFlowRule.builder()
+                    .forDevice(deviceId)
+                    .withSelector(selector.build())
+                    .withTreatment(treatment.build())
+                    .withPriority(PRIORITY_FLAT_JUMP_UPSTREAM_RULE)
+                    .fromApp(appId)
+                    .makePermanent()
+                    .forTable(DHCP_TABLE)
+                    .build();
+
+            applyRule(flowRuleForArp, true);
+        });
     }
 
     private void setupJumpTable(DeviceId deviceId) {