Code Review / openflowjava.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Bug 2756 - Action model update
[openflowjava.git] / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / serialization / ActionsInitializer.java
diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/ActionsInitializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/ActionsInitializer.java
index 51539db5fc1f76a5bdd234e2cbe40aeab3f6a1b0..91de3e43f70a8bfd47a6f93656cfdac0dff30789 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/ActionsInitializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/ActionsInitializer.java
@@ -38,33 +38,34 @@ import org.opendaylight.openflowjava.protocol.impl.serialization.action.OF13SetM
 import org.opendaylight.openflowjava.protocol.impl.serialization.action.OF13SetNwTtlActionSerializer;
 import org.opendaylight.openflowjava.protocol.impl.serialization.action.OF13SetQueueActionSerializer;
 import org.opendaylight.openflowjava.protocol.impl.util.ActionSerializerRegistryHelper;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.CopyTtlIn;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.CopyTtlOut;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecMplsTtl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecNwTtl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Enqueue;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Group;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Output;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopMpls;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopPbb;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopVlan;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushMpls;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushPbb;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushVlan;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetDlDst;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetDlSrc;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetMplsTtl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetNwDst;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetNwSrc;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetNwTos;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetNwTtl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetQueue;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetTpDst;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetTpSrc;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetVlanPcp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetVlanVid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.StripVlan;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.CopyTtlInCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.CopyTtlOutCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.DecMplsTtlCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.DecNwTtlCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.EnqueueCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.GroupCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.OutputActionCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PopMplsCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PopPbbCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PopVlanCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushMplsCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushPbbCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushVlanCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetDlDstCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetDlSrcCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetFieldCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetMplsTtlCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetNwDstCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetNwSrcCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetNwTosCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetNwTtlCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetQueueCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetTpDstCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetTpSrcCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetVlanPcpCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetVlanVidCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.StripVlanCase;
+//import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Group;
 
 /**
  * Initializes serializer registry with action serializers
@@ -84,36 +85,36 @@ public final class ActionsInitializer {
         // register OF v1.0 action serializers
         ActionSerializerRegistryHelper helper = new ActionSerializerRegistryHelper(
                 EncodeConstants.OF10_VERSION_ID, serializerRegistry);
-        helper.registerSerializer(Output.class, new OF10OutputActionSerializer());
-        helper.registerSerializer(SetVlanVid.class, new OF10SetVlanVidActionSerializer());
-        helper.registerSerializer(SetVlanPcp.class, new OF10SetVlanPcpActionSerializer());
-        helper.registerSerializer(StripVlan.class, new OF10StripVlanActionSerializer());
-        helper.registerSerializer(SetDlSrc.class, new OF10SetDlSrcActionSerializer());
-        helper.registerSerializer(SetDlDst.class, new OF10SetDlDstActionSerializer());
-        helper.registerSerializer(SetNwSrc.class, new OF10SetNwSrcActionSerializer());
-        helper.registerSerializer(SetNwDst.class, new OF10SetNwDstActionSerializer());
-        helper.registerSerializer(SetNwTos.class, new OF10SetNwTosActionSerializer());
-        helper.registerSerializer(SetTpSrc.class, new OF10SetTpSrcActionSerializer());
-        helper.registerSerializer(SetTpDst.class, new OF10SetTpDstActionSerializer());
-        helper.registerSerializer(Enqueue.class, new OF10EnqueueActionSerializer());
+        helper.registerSerializer(OutputActionCase.class, new OF10OutputActionSerializer());
+        helper.registerSerializer(SetVlanVidCase.class, new OF10SetVlanVidActionSerializer());
+        helper.registerSerializer(SetVlanPcpCase.class, new OF10SetVlanPcpActionSerializer());
+        helper.registerSerializer(StripVlanCase.class, new OF10StripVlanActionSerializer());
+        helper.registerSerializer(SetDlSrcCase.class, new OF10SetDlSrcActionSerializer());
+        helper.registerSerializer(SetDlDstCase.class, new OF10SetDlDstActionSerializer());
+        helper.registerSerializer(SetNwSrcCase.class, new OF10SetNwSrcActionSerializer());
+        helper.registerSerializer(SetNwDstCase.class, new OF10SetNwDstActionSerializer());
+        helper.registerSerializer(SetNwTosCase.class, new OF10SetNwTosActionSerializer());
+        helper.registerSerializer(SetTpSrcCase.class, new OF10SetTpSrcActionSerializer());
+        helper.registerSerializer(SetTpDstCase.class, new OF10SetTpDstActionSerializer());
+        helper.registerSerializer(EnqueueCase.class, new OF10EnqueueActionSerializer());
         // register OF v1.0 action serializers
         helper = new ActionSerializerRegistryHelper(
                 EncodeConstants.OF13_VERSION_ID, serializerRegistry);
-        helper.registerSerializer(Output.class, new OF13OutputActionSerializer());
-        helper.registerSerializer(CopyTtlOut.class, new OF13CopyTtlOutActionSerializer());
-        helper.registerSerializer(CopyTtlIn.class, new OF13CopyTtlInActionSerializer());
-        helper.registerSerializer(SetMplsTtl.class, new OF13SetMplsTtlActionSerializer());
-        helper.registerSerializer(DecMplsTtl.class, new OF13DecMplsTtlActionSerializer());
-        helper.registerSerializer(PushVlan.class, new OF13PushVlanActionSerializer());
-        helper.registerSerializer(PopVlan.class, new OF13PopVlanActionSerializer());
-        helper.registerSerializer(PushMpls.class, new OF13PushMplsActionSerializer());
-        helper.registerSerializer(PopMpls.class, new OF13PopMplsActionSerializer());
-        helper.registerSerializer(SetQueue.class, new OF13SetQueueActionSerializer());
-        helper.registerSerializer(Group.class, new OF13GroupActionSerializer());
-        helper.registerSerializer(SetNwTtl.class, new OF13SetNwTtlActionSerializer());
-        helper.registerSerializer(DecNwTtl.class, new OF13DecNwTtlActionSerializer());
-        helper.registerSerializer(SetField.class, new OF13SetFieldActionSerializer());
-        helper.registerSerializer(PushPbb.class, new OF13PushPbbActionSerializer());
-        helper.registerSerializer(PopPbb.class, new OF13PopPbbActionSerializer());
+        helper.registerSerializer(OutputActionCase.class, new OF13OutputActionSerializer());
+        helper.registerSerializer(CopyTtlOutCase.class, new OF13CopyTtlOutActionSerializer());
+        helper.registerSerializer(CopyTtlInCase.class, new OF13CopyTtlInActionSerializer());
+        helper.registerSerializer(SetMplsTtlCase.class, new OF13SetMplsTtlActionSerializer());
+        helper.registerSerializer(DecMplsTtlCase.class, new OF13DecMplsTtlActionSerializer());
+        helper.registerSerializer(PushVlanCase.class, new OF13PushVlanActionSerializer());
+        helper.registerSerializer(PopVlanCase.class, new OF13PopVlanActionSerializer());
+        helper.registerSerializer(PushMplsCase.class, new OF13PushMplsActionSerializer());
+        helper.registerSerializer(PopMplsCase.class, new OF13PopMplsActionSerializer());
+        helper.registerSerializer(SetQueueCase.class, new OF13SetQueueActionSerializer());
+        helper.registerSerializer(GroupCase.class, new OF13GroupActionSerializer());
+        helper.registerSerializer(SetNwTtlCase.class, new OF13SetNwTtlActionSerializer());
+        helper.registerSerializer(DecNwTtlCase.class, new OF13DecNwTtlActionSerializer());
+        helper.registerSerializer(SetFieldCase.class, new OF13SetFieldActionSerializer());
+        helper.registerSerializer(PushPbbCase.class, new OF13PushPbbActionSerializer());
+        helper.registerSerializer(PopPbbCase.class, new OF13PopPbbActionSerializer());
     }
 }
\ No newline at end of file
Opendaylight Openflow Protocol Library