Added TUNNEL_ID and TUNNEL_IPV4_DST case to GroupBucketEntryBuilder

Change-Id: Ia784ceb6cc70ca1a0f9eb4b20eee7c90caafdf92

Added TUNNEL_ID and TUNNEL_IPV4_DST case to GroupBucketEntryBuilder
Change-Id: Ia784ceb6cc70ca1a0f9eb4b20eee7c90caafdf92
Hyunsun Moon · Gerrit Code Review
Commit a834c18e61606701fd8e333ce200f0e411a41eff a834c18e 1 parent 0b5ccd2b
Showing 2 changed files with 43 additions and 7 deletions
providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/GroupBucketEntryBuilder.java
providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/OpenFlowGroupProvider.java
--- a/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/GroupBucketEntryBuilder.java
View file @a834c18
+++ b/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/GroupBucketEntryBuilder.java
View file @a834c18
@@ -23,14 +23,22 @@ import org.onlab.packet.MplsLabel;
 import org.onlab.packet.VlanId;
 import org.onosproject.core.DefaultGroupId;
 import org.onosproject.core.GroupId;
+import org.onosproject.net.DeviceId;
 import org.onosproject.net.Lambda;
 import org.onosproject.net.PortNumber;
+import org.onosproject.net.driver.DefaultDriverData;
+import org.onosproject.net.driver.DefaultDriverHandler;
+import org.onosproject.net.driver.Driver;
+import org.onosproject.net.driver.DriverHandler;
+import org.onosproject.net.driver.DriverService;
 import org.onosproject.net.flow.DefaultTrafficTreatment;
 import org.onosproject.net.flow.TrafficTreatment;
 import org.onosproject.net.flow.instructions.Instructions;
 import org.onosproject.net.group.DefaultGroupBucket;
 import org.onosproject.net.group.GroupBucket;
 import org.onosproject.net.group.GroupBuckets;
+import org.onosproject.openflow.controller.Dpid;
+import org.onosproject.openflow.controller.ExtensionTreatmentInterpreter;
 import org.projectfloodlight.openflow.protocol.OFBucket;
 import org.projectfloodlight.openflow.protocol.OFGroupType;
 import org.projectfloodlight.openflow.protocol.action.OFAction;
@@ -56,6 +64,7 @@ import org.projectfloodlight.openflow.protocol.oxm.OFOxmOchSigidBasic;
 import org.projectfloodlight.openflow.types.IPv4Address;
 import org.projectfloodlight.openflow.types.OFVlanVidMatch;
 import org.projectfloodlight.openflow.types.U32;
+import org.projectfloodlight.openflow.types.U64;
 import org.projectfloodlight.openflow.types.U8;
 import org.projectfloodlight.openflow.types.VlanPcp;
 import org.slf4j.Logger;
@@ -69,20 +78,28 @@ import static org.slf4j.LoggerFactory.getLogger;
  */
 public class GroupBucketEntryBuilder {
+    private Dpid dpid;
     private List<OFBucket> ofBuckets;
     private OFGroupType type;
+    private DriverService driverService;
     private final Logger log = getLogger(getClass());
+
     /**
      * Creates a builder.
      *
+     * @param dpid dpid
      * @param ofBuckets list of OFBucket
      * @param type Group type
+     * @param driverService driver service
      */
-    public GroupBucketEntryBuilder(List<OFBucket> ofBuckets, OFGroupType type) {
+    public GroupBucketEntryBuilder(Dpid dpid, List<OFBucket> ofBuckets, OFGroupType type,
+                                   DriverService driverService) {
+        this.dpid = dpid;
         this.ofBuckets = ofBuckets;
         this.type = type;
+        this.driverService = driverService;
     }
     /**
@@ -192,7 +209,7 @@ public class GroupBucketEntryBuilder {
                     break;
                 case SET_FIELD:
                     OFActionSetField setField = (OFActionSetField) act;
-                    handleSetField(builder, setField.getField());
+                    handleSetField(builder, setField);
                     break;
                 case POP_MPLS:
                     OFActionPopMpls popMpls = (OFActionPopMpls) act;
@@ -243,7 +260,8 @@ public class GroupBucketEntryBuilder {
         return builder.build();
     }
-    private void handleSetField(TrafficTreatment.Builder builder, OFOxm<?> oxm) {
+    private void handleSetField(TrafficTreatment.Builder builder, OFActionSetField action) {
+        OFOxm<?> oxm = action.getField();
         switch (oxm.getMatchField().id) {
             case VLAN_PCP:
                 @SuppressWarnings("unchecked")
@@ -287,6 +305,18 @@ public class GroupBucketEntryBuilder {
                 OFOxm<U8> mplsBos = (OFOxm<U8>) oxm;
                 builder.setMplsBos(mplsBos.getValue() == U8.ZERO ? false : true);
                 break;
+            case TUNNEL_ID:
+                @SuppressWarnings("unchecked")
+                OFOxm<U64> tunnelId = (OFOxm<U64>) oxm;
+                builder.setTunnelId(tunnelId.getValue().getValue());
+                break;
+            case TUNNEL_IPV4_DST:
+                DriverHandler driver = getDriver(dpid);
+                ExtensionTreatmentInterpreter interpreter = driver.behaviour(ExtensionTreatmentInterpreter.class);
+                if (interpreter != null) {
+                    builder.extension(interpreter.mapAction(action), DeviceId.deviceId(Dpid.uri(dpid)));
+                }
+                break;
             case ARP_OP:
             case ARP_SHA:
             case ARP_SPA:
@@ -336,7 +366,6 @@ public class GroupBucketEntryBuilder {
             case SCTP_SRC:
             case TCP_DST:
             case TCP_SRC:
-            case TUNNEL_ID:
             case UDP_DST:
             case UDP_SRC:
             default:
@@ -344,4 +373,11 @@ public class GroupBucketEntryBuilder {
                 break;
         }
     }
+
+    private DriverHandler getDriver(Dpid dpid) {
+        DeviceId deviceId = DeviceId.deviceId(Dpid.uri(dpid));
+        Driver driver = driverService.getDriver(deviceId);
+        DriverHandler handler = new DefaultDriverHandler(new DefaultDriverData(driver, deviceId));
+        return handler;
+    }
 }
--- a/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/OpenFlowGroupProvider.java
View file @a834c18
+++ b/providers/openflow/group/src/main/java/org/onosproject/provider/of/group/impl/OpenFlowGroupProvider.java
View file @a834c18
@@ -225,14 +225,14 @@ public class OpenFlowGroupProvider extends AbstractProvider implements GroupProv
                                    OFGroupDescStatsReply groupDescStatsReply) {
         Map<Integer, Group> groups = Maps.newHashMap();
-
+        Dpid dpid = Dpid.dpid(deviceId.uri());
         for (OFGroupDescStatsEntry entry: groupDescStatsReply.getEntries()) {
             int id = entry.getGroup().getGroupNumber();
             GroupId groupId = new DefaultGroupId(id);
             GroupDescription.Type type = getGroupType(entry.getGroupType());
-            GroupBuckets buckets = new GroupBucketEntryBuilder(entry.getBuckets(),
+            GroupBuckets buckets = new GroupBucketEntryBuilder(dpid, entry.getBuckets(),
-                    entry.getGroupType()).build();
+                    entry.getGroupType(), driverService).build();
             DefaultGroup group = new DefaultGroup(groupId, deviceId, type, buckets);
             groups.put(id, group);
         }