Code Review / openflowplugin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
BUG-1759 ip-tos value
[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / ActionConvertor.java
diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java
index 2cb592f483a8f857faeda52050d04981959121eb..796b3e716430bc502178d9122ca70e4dc196c69c 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java
@@ -9,16 +9,14 @@
  */
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor;
 
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
+import com.google.common.collect.Ordering;
 
 import org.opendaylight.openflowplugin.extension.api.ConverterExtensionKey;
 import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava;
 import org.opendaylight.openflowplugin.extension.api.ConvertorToOFJava;
 import org.opendaylight.openflowplugin.extension.api.TypeVersionKey;
 import org.opendaylight.openflowplugin.extension.api.path.ActionPath;
-import org.opendaylight.openflowplugin.openflow.md.OFConstants;
+import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.extension.ActionExtensionHelper;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.ActionSetNwDstReactor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.ActionSetNwSrcReactor;
@@ -26,9 +24,10 @@ import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.Ord
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.MatchConvertorImpl;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.MatchReactor;
 import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil;
+import org.opendaylight.openflowplugin.openflow.md.util.ActionUtil;
 import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil;
 import org.opendaylight.openflowplugin.openflow.md.util.OpenflowPortsUtil;
-import org.opendaylight.openflowplugin.openflow.md.util.OpenflowVersion;
+import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Dscp;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlInCase;
@@ -90,7 +89,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.vlan.action._case.PushVlanActionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.dl.dst.action._case.SetDlDstAction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.dl.src.action._case.SetDlSrcAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.field._case.SetField;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.mpls.ttl.action._case.SetMplsTtlAction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.mpls.ttl.action._case.SetMplsTtlActionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.nw.tos.action._case.SetNwTosAction;
@@ -158,7 +156,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ge
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Ordering;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author usha@ericsson Action List:This class takes data from SAL layer and
@@ -168,7 +168,7 @@ import com.google.common.collect.Ordering;
  */
 public final class ActionConvertor {
     private static final Logger logger = LoggerFactory.getLogger(ActionConvertor.class);
-
+    
     private ActionConvertor() {
         // NOOP
     }
@@ -210,9 +210,10 @@ public final class ActionConvertor {
             else if (action instanceof DecMplsTtlCase)
                 ofAction = SalToOFDecMplsTtl(actionBuilder);
             else if (action instanceof PushVlanActionCase)
-                ofAction = SalToOFPushVlanAction(action, actionBuilder);
+                ofAction = SalToOFPushVlanAction(action, actionBuilder, version);
             else if (action instanceof PopVlanActionCase)
-                ofAction = (version == OFConstants.OFP_VERSION_1_0) ? SalToOFStripVlan(actionBuilder, version)
+                ofAction = (version == OFConstants.OFP_VERSION_1_0) ?
+                    SalToOFStripVlan(actionBuilder, version)
                         : SalToOFPopVlan(actionBuilder);
             else if (action instanceof PushMplsActionCase)
                 ofAction = SalToOFPushMplsAction(action, actionBuilder);
@@ -232,8 +233,15 @@ public final class ActionConvertor {
                 ofAction = SalToOFPopPBB(actionBuilder);
 
                 // 1.0 Actions
-            else if (action instanceof SetVlanIdActionCase)
+            else if (action instanceof SetVlanIdActionCase) {
+                /*if (version == OFConstants.OFP_VERSION_1_0) {
+
+                } else {
+                    List<Action> setVlanIdActionsList = convertToOF13(action, actionBuilder);
+                    actionsList.addAll(setVlanIdActionsList);
+                }*/
                 ofAction = SalToOFSetVlanId(action, actionBuilder, version);
+            }
             else if (action instanceof SetVlanPcpActionCase)
                 ofAction = SalToOFSetVlanpcp(action, actionBuilder, version);
             else if (action instanceof StripVlanActionCase)
@@ -293,17 +301,33 @@ public final class ActionConvertor {
             ActionBuilder actionBuilder, short version, BigInteger datapathid) {
 
         SetFieldCase setFieldCase = (SetFieldCase) action;
-        org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match match = setFieldCase
-                .getSetField();
+        org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match match =
+            setFieldCase.getSetField();
 
-        OxmFieldsActionBuilder oxmFieldsActionBuilder = new OxmFieldsActionBuilder();
-        MatchReactor.getInstance().convert(match, version, oxmFieldsActionBuilder, datapathid);
+        if (version == OFConstants.OFP_VERSION_1_0) {
+            // pushvlan +setField can be called to configure 1.0 switches via MDSAL app
+            if (match.getVlanMatch() != null) {
+                VlanVidActionBuilder vlanidActionBuilder = new VlanVidActionBuilder();
+                vlanidActionBuilder.setVlanVid(match.getVlanMatch().getVlanId().getVlanId().getValue());
+                actionBuilder.setType(
+                    org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetVlanVid.class);
+                actionBuilder.addAugmentation(VlanVidAction.class, vlanidActionBuilder.build());
+                return actionBuilder.build();
+            } else {
+                return emtpyAction(actionBuilder);
+            }
 
-        actionBuilder
-                .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField.class);
+        } else {
+            OxmFieldsActionBuilder oxmFieldsActionBuilder = new OxmFieldsActionBuilder();
+            MatchReactor.getInstance().convert(match, version, oxmFieldsActionBuilder, datapathid);
+
+            actionBuilder.setType(
+                org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField.class);
+
+            actionBuilder.addAugmentation(OxmFieldsAction.class, oxmFieldsActionBuilder.build());
+            return actionBuilder.build();
+        }
 
-        actionBuilder.addAugmentation(OxmFieldsAction.class, oxmFieldsActionBuilder.build());
-        return actionBuilder.build();
     }
 
     private static Action SalToOFDecNwTtl(ActionBuilder actionBuilder) {
@@ -332,7 +356,13 @@ public final class ActionConvertor {
 
     private static Action SalToOFPushVlanAction(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
-            ActionBuilder actionBuilder) {
+            ActionBuilder actionBuilder, short version) {
+        if (version == OFConstants.OFP_VERSION_1_0) {
+            // if client configure openflow 1.0 switch as a openflow 1.3 switch using openflow 1.3 instructions
+            // then we can ignore PUSH_VLAN as set-vlan-id will push a vlan header if not present
+            return null;
+        }
+
         PushVlanActionCase pushVlanActionCase = (PushVlanActionCase) action;
         PushVlanAction pushVlanAction = pushVlanActionCase.getPushVlanAction();
         actionBuilder.setType(PushVlan.class);
@@ -384,6 +414,7 @@ public final class ActionConvertor {
         return emtpyAction(actionBuilder);
     }
 
+    // set-vlan-id (1.0 feature) can be called on  1.3 switches as well using ADSAL apis
     private static Action SalToOFSetVlanId(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
             ActionBuilder actionBuilder, short version) {
@@ -399,6 +430,7 @@ public final class ActionConvertor {
                     .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetVlanVid.class);
             actionBuilder.addAugmentation(VlanVidAction.class, vlanidActionBuilder.build());
             return actionBuilder.build();
+
         } else if (version >= OFConstants.OFP_VERSION_1_3) {
             OxmFieldsActionBuilder oxmFieldsActionBuilder = new OxmFieldsActionBuilder();
             actionBuilder
@@ -507,7 +539,6 @@ public final class ActionConvertor {
             logger.error("Unknown Action Type for the Version", version);
             return null;
         }
-
     }
 
     private static Action SalToOFSetDlDst(
@@ -537,7 +568,6 @@ public final class ActionConvertor {
             logger.error("Unknown Action Type for the Version", version);
             return null;
         }
-
     }
 
     protected static Action SalToOFSetNwSrc(
@@ -588,7 +618,9 @@ public final class ActionConvertor {
             actionBuilder
                     .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField.class);
             List<MatchEntries> matchEntriesList = new ArrayList<>();
-            matchEntriesList.add(MatchConvertorImpl.toOfIpDscp(new Dscp(setnwtosaction.getTos().shortValue())));
+            matchEntriesList.add(MatchConvertorImpl.toOfIpDscp(new Dscp(
+                    ActionUtil.tosToDscp(setnwtosaction.getTos().shortValue())
+                    )));
             oxmFieldsActionBuilder.setMatchEntries(matchEntriesList);
             actionBuilder.addAugmentation(OxmFieldsAction.class, oxmFieldsActionBuilder.build());
             return actionBuilder.build();
OpenFlow Plugin