X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fopenflow%2Fmd%2Fcore%2Fsal%2Fconvertor%2FActionConvertor.java;h=76d1ac6e74f7ae7dba011c14822446c912e899a7;hb=51584a6ea4e86ad6b7e6c4cb61bba647c1d4a636;hp=6c0a9ed6d90a99b32d4cd78c35f232b6bc24341a;hpb=167ccae41167f03a285e022a85d6a67b3f0e0a41;p=openflowplugin.git 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 6c0a9ed6d9..76d1ac6e74 100644 --- 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 @@ -4,18 +4,70 @@ import java.util.ArrayList; import java.util.List; import org.opendaylight.controller.sal.core.NodeConnector.NodeConnectorIDType; +import org.opendaylight.openflowjava.protocol.api.util.BinContent; 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.GroupAction; -import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputAction; -import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopMplsAction; -import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopPbbAction; -import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopVlanAction; -import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushMplsAction; -import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushPbbAction; -import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushVlanAction; -import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetMplsTtlAction; -import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwTtlAction; -import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetQueueAction; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlInCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlInCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlOutCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlOutCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DecMplsTtlCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DecMplsTtlCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DecNwTtlCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DecNwTtlCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.GroupActionCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.GroupActionCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputActionCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputActionCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopMplsActionCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopMplsActionCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopPbbActionCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopPbbActionCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopVlanActionCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopVlanActionCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushMplsActionCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushMplsActionCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushPbbActionCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushPbbActionCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushVlanActionCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushVlanActionCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetFieldCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetFieldCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetMplsTtlActionCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetMplsTtlActionCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwTtlActionCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwTtlActionCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetQueueActionCase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetQueueActionCaseBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.copy.ttl.in._case.CopyTtlIn; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.copy.ttl.in._case.CopyTtlInBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.copy.ttl.out._case.CopyTtlOutBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.dec.mpls.ttl._case.DecMplsTtl; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.dec.mpls.ttl._case.DecMplsTtlBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.dec.nw.ttl._case.DecNwTtl; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.dec.nw.ttl._case.DecNwTtlBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.group.action._case.GroupAction; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.group.action._case.GroupActionBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.output.action._case.OutputAction; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.output.action._case.OutputActionBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.mpls.action._case.PopMplsAction; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.mpls.action._case.PopMplsActionBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.pbb.action._case.PopPbbAction; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.pbb.action._case.PopPbbActionBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.vlan.action._case.PopVlanAction; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.vlan.action._case.PopVlanActionBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.mpls.action._case.PushMplsAction; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.mpls.action._case.PushMplsActionBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.pbb.action._case.PushPbbAction; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.pbb.action._case.PushPbbActionBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.vlan.action._case.PushVlanAction; +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.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.ttl.action._case.SetNwTtlAction; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.nw.ttl.action._case.SetNwTtlActionBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.queue.action._case.SetQueueAction; +import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.queue.action._case.SetQueueActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanId; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.EthertypeAction; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.EthertypeActionBuilder; @@ -35,18 +87,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.QueueIdAction; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.QueueIdActionBuilder; -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.Experimenter; 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.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.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.SetNwTtl; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetQueue; @@ -55,102 +103,96 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev1 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.ActionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.EtherType; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortNumber; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortNumberValues; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortNumberValuesV10; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.MatchEntries; import org.opendaylight.yangtools.yang.binding.Augmentation; -import org.openflow.protocol.OFPort; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - - - - - - /** * @author usha@ericsson Action List:This class takes data from SAL layer and * converts into OF Data + * @author avishnoi@in.ibm.com Added convertor for OF bucket actions to SAL + * actions * */ public final class ActionConvertor { private static final Logger logger = LoggerFactory.getLogger(ActionConvertor.class); private static final String PREFIX_SEPARATOR = "/"; + final private static short OF10 = 1; + final private static short OF13 = 4; + private ActionConvertor() { // NOOP } public static List getActionList( - List actions) + List actions, + short version) { - ActionBuilder actionBuilder = new ActionBuilder(); ActionsListBuilder actionsListBuilder = new ActionsListBuilder(); - List actionsList = new ArrayList(); + List actionsList = new ArrayList(); - for (int actionItem = 0; actionItem < actions.size(); actionItem++) - { + for (int actionItem = 0; actionItem < actions.size(); actionItem++) { org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action = actions.get( actionItem).getAction(); - if (action instanceof OutputAction) - actionsList.add(salToOFOutputAction(action,actionBuilder,actionsListBuilder)); - else if (action instanceof GroupAction) - actionsList.add(SalToOFGroupAction(action, actionBuilder, actionsListBuilder)); - else if (action instanceof CopyTtlOut) - actionsList.add(SalToOFCopyTTLIOut(actionBuilder, actionsListBuilder)); - else if (action instanceof CopyTtlIn) - actionsList.add(SalToOFCopyTTLIIn(actionBuilder, actionsListBuilder)); - else if (action instanceof SetMplsTtlAction) - actionsList.add(SalToOFSetMplsTtl(action, actionBuilder, actionsListBuilder)); - else if (action instanceof DecMplsTtl) - actionsList.add(SalToOFDecMplsTtl(actionBuilder, actionsListBuilder)); - else if (action instanceof PushVlanAction) - actionsList.add(SalToOFPushVlanAction(action, actionBuilder, actionsListBuilder)); - else if (action instanceof PopVlanAction) - actionsList.add(SalToOFPopVlan(action, actionBuilder, actionsListBuilder)); - else if (action instanceof PushMplsAction) - actionsList.add(SalToOFPushMplsAction(action, actionBuilder, actionsListBuilder)); - else if (action instanceof PopMplsAction) - actionsList.add(SalToOFPopMpls(action, actionBuilder, actionsListBuilder)); - else if (action instanceof SetQueueAction) - actionsList.add(SalToOFSetQueue(action, actionBuilder, actionsListBuilder)); - - else if (action instanceof SetNwTtlAction) - actionsList.add(SalToOFSetNwTtl(action, actionBuilder, actionsListBuilder)); - else if (action instanceof DecNwTtl) - actionsList.add(SalToOFDecNwTtl(action, actionBuilder, actionsListBuilder)); - else if (action instanceof SetField) - actionsList.add(SalToOFSetField(action, actionBuilder, actionsListBuilder)); - - else if (action instanceof PushPbbAction) - actionsList.add(SalToOFPushPbbAction(action, actionBuilder, actionsListBuilder)); - else if (action instanceof PopPbbAction) - actionsList.add(SalToOFPopPBB(action, actionBuilder, actionsListBuilder)); + if (action instanceof OutputActionCase) + actionsList.add(salToOFOutputAction(action, actionsListBuilder, version)); + else if (action instanceof GroupActionCase) + actionsList.add(SalToOFGroupAction(action, actionsListBuilder)); + else if (action instanceof CopyTtlOutCase) + actionsList.add(SalToOFCopyTTLIOut(actionsListBuilder)); + else if (action instanceof CopyTtlInCase) + actionsList.add(SalToOFCopyTTLIIn(actionsListBuilder)); + else if (action instanceof SetMplsTtlActionCase) + actionsList.add(SalToOFSetMplsTtl(action, actionsListBuilder)); + else if (action instanceof DecMplsTtlCase) + actionsList.add(SalToOFDecMplsTtl(actionsListBuilder)); + else if (action instanceof PushVlanActionCase) + actionsList.add(SalToOFPushVlanAction(action, actionsListBuilder)); + else if (action instanceof PopVlanActionCase) + actionsList.add(SalToOFPopVlan(action, actionsListBuilder)); + else if (action instanceof PushMplsActionCase) + actionsList.add(SalToOFPushMplsAction(action, actionsListBuilder)); + else if (action instanceof PopMplsActionCase) + actionsList.add(SalToOFPopMpls(action, actionsListBuilder)); + else if (action instanceof SetQueueActionCase) + actionsList.add(SalToOFSetQueue(action, actionsListBuilder)); + else if (action instanceof SetNwTtlActionCase) + actionsList.add(SalToOFSetNwTtl(action, actionsListBuilder)); + else if (action instanceof DecNwTtlCase) + actionsList.add(SalToOFDecNwTtl(action, actionsListBuilder)); + else if (action instanceof SetFieldCase) + actionsList.add(SalToOFSetField(action, actionsListBuilder)); + else if (action instanceof PushPbbActionCase) + actionsList.add(SalToOFPushPbbAction(action, actionsListBuilder)); + else if (action instanceof PopPbbActionCase) + actionsList.add(SalToOFPopPBB(action, actionsListBuilder)); else if (action instanceof ExperimenterAction) - actionsList.add(SalToOFExperimenter(action, actionBuilder, actionsListBuilder)); + actionsList.add(SalToOFExperimenter(action, actionsListBuilder)); } return actionsList; - } - private static ActionsList SalToOFSetField( org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action, - ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) { - org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetField setField = (org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetField) action; - org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match match = setField.getMatch(); + SetFieldCase setFieldCase = (SetFieldCase) action; + org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match match = setFieldCase.getSetField(); - List matchEntries = FlowConvertor.toMatch(match); + List matchEntries = MatchConvertor.toMatch(match); OxmFieldsActionBuilder oxmFieldsActionBuilder = new OxmFieldsActionBuilder(); oxmFieldsActionBuilder.setMatchEntries(matchEntries); - + ActionBuilder actionBuilder = new ActionBuilder(); actionBuilder .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField.class); @@ -162,56 +204,54 @@ public final class ActionConvertor { private static ActionsList SalToOFDecNwTtl( org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action, - ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) { - actionBuilder.setType(DecNwTtl.class); + ActionBuilder actionBuilder = new ActionBuilder(); + actionBuilder.setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecNwTtl.class); return emtpyAction(actionBuilder, actionsListBuilder); } private static ActionsList SalToOFPushMplsAction( org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action, - ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) { - + ActionBuilder actionBuilder = new ActionBuilder(); + PushMplsActionCase pushMplsActionCase = (PushMplsActionCase) action; + actionBuilder.setType(PushMpls.class); - return SalToOFPushAction(((PushMplsAction) action).getEthernetType(), actionBuilder, actionsListBuilder); + return SalToOFPushAction(pushMplsActionCase.getPushMplsAction().getEthernetType(), actionBuilder, actionsListBuilder); } private static ActionsList SalToOFPushPbbAction( org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action, - ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) { + ActionBuilder actionBuilder = new ActionBuilder(); + PushPbbActionCase pushPbbActionCase = (PushPbbActionCase) action; actionBuilder.setType(PushPbb.class); - return SalToOFPushAction(((PushPbbAction) action).getEthernetType(), actionBuilder, actionsListBuilder); + return SalToOFPushAction(pushPbbActionCase.getPushPbbAction().getEthernetType(), actionBuilder, actionsListBuilder); } private static ActionsList SalToOFPushVlanAction( org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action, - ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) { - - PushVlanAction pushVlanAction = (PushVlanAction) action; - VlanId vlanId = new VlanId(pushVlanAction.getVlanId()); - Integer etherType = vlanId.getValue(); + ActionBuilder actionBuilder = new ActionBuilder(); + PushVlanActionCase pushVlanActionCase = (PushVlanActionCase) action; + PushVlanAction pushVlanAction = pushVlanActionCase.getPushVlanAction(); actionBuilder.setType(PushVlan.class); - return SalToOFPushAction(etherType, actionBuilder, actionsListBuilder); + return SalToOFPushAction(pushVlanAction.getEthernetType(), actionBuilder, actionsListBuilder); } private static ActionsList SalToOFSetNwTtl( org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action, - ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) { - + ActionBuilder actionBuilder = new ActionBuilder(); + SetNwTtlActionCase nwTtlActionCase = (SetNwTtlActionCase) action; NwTtlActionBuilder nwTtlActionBuilder = new NwTtlActionBuilder(); - nwTtlActionBuilder.setNwTtl(((SetNwTtlAction) action).getNwTtl()); - - + nwTtlActionBuilder.setNwTtl(nwTtlActionCase.getSetNwTtlAction().getNwTtl()); actionBuilder.setType(SetNwTtl.class); actionBuilder.addAugmentation(NwTtlAction.class, nwTtlActionBuilder.build()); actionsListBuilder.setAction(actionBuilder.build()); @@ -221,10 +261,10 @@ public final class ActionConvertor { private static ActionsList SalToOFSetQueue( org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action, - ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) { - - SetQueueAction setQueueAction = (SetQueueAction) action; + ActionBuilder actionBuilder = new ActionBuilder(); + SetQueueActionCase setQueueActionCase = (SetQueueActionCase) action; + SetQueueAction setQueueAction = setQueueActionCase.getSetQueueAction(); QueueIdActionBuilder queueIdActionBuilder = new QueueIdActionBuilder(); queueIdActionBuilder.setQueueId(Long.getLong(setQueueAction.getQueue())); @@ -237,37 +277,36 @@ public final class ActionConvertor { private static ActionsList SalToOFPopMpls( org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action, - ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) { - + ActionBuilder actionBuilder = new ActionBuilder(); + PopMplsActionCase popMplsActionCase = (PopMplsActionCase) action; actionBuilder.setType(PopMpls.class); - return SalToOFPushAction(((PopMplsAction) action).getEthernetType(), actionBuilder, actionsListBuilder); + return SalToOFPushAction(popMplsActionCase.getPopMplsAction().getEthernetType(), actionBuilder, actionsListBuilder); } private static ActionsList SalToOFPopVlan( org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action, - ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) { - - actionBuilder.setType(PushMpls.class); + ActionBuilder actionBuilder = new ActionBuilder(); + actionBuilder.setType(PopVlan.class); return emtpyAction(actionBuilder, actionsListBuilder); } private static ActionsList SalToOFPopPBB( org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action, - ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) { + ActionBuilder actionBuilder = new ActionBuilder(); actionBuilder.setType(PopPbb.class); return emtpyAction(actionBuilder, actionsListBuilder); } private static ActionsList SalToOFExperimenter( org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action, - ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) { + ActionBuilder actionBuilder = new ActionBuilder(); ExperimenterActionBuilder experimenterActionBuilder = new ExperimenterActionBuilder(); experimenterActionBuilder.setExperimenter(((ExperimenterAction) action).getExperimenter()); actionBuilder.setType(Experimenter.class); @@ -282,13 +321,14 @@ public final class ActionConvertor { private static ActionsList SalToOFGroupAction( org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action, - ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) { - GroupAction groupAction = (GroupAction) action; + GroupActionCase groupActionCase = (GroupActionCase) action; + GroupAction groupAction = groupActionCase.getGroupAction(); GroupIdActionBuilder groupIdBuilder = new GroupIdActionBuilder(); groupIdBuilder.setGroupId(Long.getLong(groupAction.getGroup())); + ActionBuilder actionBuilder = new ActionBuilder(); actionBuilder.setType(Group.class); actionBuilder.addAugmentation(GroupIdAction.class, groupIdBuilder.build()); actionsListBuilder.setAction(actionBuilder.build()); @@ -307,7 +347,8 @@ public final class ActionConvertor { return actionsListBuilder.build(); } - private static ActionsList SalToOFDecMplsTtl(ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) { + private static ActionsList SalToOFDecMplsTtl(ActionsListBuilder actionsListBuilder) { + ActionBuilder actionBuilder = new ActionBuilder(); actionBuilder .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecMplsTtl.class); return emtpyAction(actionBuilder, actionsListBuilder); @@ -315,10 +356,12 @@ public final class ActionConvertor { private static ActionsList SalToOFSetMplsTtl( org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action, - ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) { + ActionBuilder actionBuilder = new ActionBuilder(); - SetMplsTtlAction mplsTtlAction = (SetMplsTtlAction) action; + SetMplsTtlActionCase mplsTtlActionCase = (SetMplsTtlActionCase) action; + SetMplsTtlAction mplsTtlAction = mplsTtlActionCase.getSetMplsTtlAction(); + MplsTtlActionBuilder mplsTtlActionBuilder = new MplsTtlActionBuilder(); mplsTtlActionBuilder.setMplsTtl(mplsTtlAction.getMplsTtl()/* SAL */); @@ -329,13 +372,15 @@ public final class ActionConvertor { return actionsListBuilder.build(); } - private static ActionsList SalToOFCopyTTLIIn(ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) { + private static ActionsList SalToOFCopyTTLIIn(ActionsListBuilder actionsListBuilder) { + ActionBuilder actionBuilder = new ActionBuilder(); actionBuilder .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.CopyTtlIn.class); return emtpyAction(actionBuilder, actionsListBuilder); } - private static ActionsList SalToOFCopyTTLIOut(ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) { + private static ActionsList SalToOFCopyTTLIOut(ActionsListBuilder actionsListBuilder) { + ActionBuilder actionBuilder = new ActionBuilder(); actionBuilder .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.CopyTtlOut.class); return emtpyAction(actionBuilder, actionsListBuilder); @@ -350,43 +395,63 @@ public final class ActionConvertor { private static ActionsList salToOFOutputAction( org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action, - ActionBuilder actionBuilder, - ActionsListBuilder actionsListBuilder) { + ActionsListBuilder actionsListBuilder, short version) { - - OutputAction outputAction = ((OutputAction) action); + OutputActionCase outputActionCase = ((OutputActionCase) action); + OutputAction outputAction = outputActionCase.getOutputAction(); PortActionBuilder portAction = new PortActionBuilder(); MaxLengthActionBuilder maxLenActionBuilder = new MaxLengthActionBuilder(); maxLenActionBuilder.setMaxLength(outputAction.getMaxLength()); - + ActionBuilder actionBuilder = new ActionBuilder(); actionBuilder.addAugmentation(MaxLengthAction.class, maxLenActionBuilder.build()); Uri uri = outputAction.getOutputNodeConnector(); - if (uri.getValue() == NodeConnectorIDType.ALL) - portAction.setPort(new PortNumber((long) OFPort.OFPP_ALL.getValue())); - - if (uri.getValue() == NodeConnectorIDType.SWSTACK) - portAction.setPort(new PortNumber((long) OFPort.OFPP_LOCAL.getValue())); - - if ((uri.getValue() == NodeConnectorIDType.HWPATH) - || (uri.getValue() == NodeConnectorIDType.ONEPK) - || (uri.getValue() == NodeConnectorIDType.ONEPK2OPENFLOW) - || (uri.getValue() == NodeConnectorIDType.ONEPK2PCEP) - || (uri.getValue() == NodeConnectorIDType.OPENFLOW) - || (uri.getValue() == NodeConnectorIDType.OPENFLOW2ONEPK) - || (uri.getValue() == NodeConnectorIDType.OPENFLOW2PCEP) - || (uri.getValue() == NodeConnectorIDType.PCEP) - || (uri.getValue() == NodeConnectorIDType.PCEP2ONEPK) - || (uri.getValue() == NodeConnectorIDType.PCEP2OPENFLOW) + if (uri.getValue() == NodeConnectorIDType.ALL) { + if (version >= OF13) { + portAction.setPort(new PortNumber(BinContent.intToUnsignedLong(PortNumberValues.ALL.getIntValue()))); + + } else if (version == OF10) { + portAction.setPort(new PortNumber((long) PortNumberValuesV10.ALL.getIntValue())); + + } + } + if (uri.getValue() == NodeConnectorIDType.SWSTACK) { + if (version >= OF13) { + portAction.setPort(new PortNumber(BinContent.intToUnsignedLong(PortNumberValues.LOCAL.getIntValue()))); + + } else if (version == OF10) { + portAction.setPort(new PortNumber((long) PortNumberValuesV10.LOCAL.getIntValue())); + + } + } + + if ((uri.getValue() == NodeConnectorIDType.HWPATH) || (uri.getValue() == NodeConnectorIDType.ONEPK) + || (uri.getValue() == NodeConnectorIDType.ONEPK2OPENFLOW) + || (uri.getValue() == NodeConnectorIDType.ONEPK2PCEP) + || (uri.getValue() == NodeConnectorIDType.OPENFLOW) + || (uri.getValue() == NodeConnectorIDType.OPENFLOW2ONEPK) + || (uri.getValue() == NodeConnectorIDType.OPENFLOW2PCEP) + || (uri.getValue() == NodeConnectorIDType.PCEP) || (uri.getValue() == NodeConnectorIDType.PCEP2ONEPK) + || (uri.getValue() == NodeConnectorIDType.PCEP2OPENFLOW) || (uri.getValue() == NodeConnectorIDType.PRODUCTION)) { - portAction.setPort(new PortNumber((long) OFPort.OFPP_NORMAL.getValue())); + if (version >= OF13) { + portAction.setPort(new PortNumber(BinContent.intToUnsignedLong(PortNumberValues.NORMAL.getIntValue()))); + + } else if (version == OF10) { + portAction.setPort(new PortNumber((long) PortNumberValuesV10.NORMAL.getIntValue())); } + } - if (uri.getValue() == NodeConnectorIDType.CONTROLLER) { + if (uri.getValue() == NodeConnectorIDType.CONTROLLER) { - // portAction.setPort(new PortNumber((long) - // OFPort.OFPP_CONTROLLER.getValue())); + if (version >= OF13) { + portAction.setPort(new PortNumber(BinContent.intToUnsignedLong(PortNumberValues.CONTROLLER + .getIntValue()))); + } else if (version == OF10) { + portAction.setPort(new PortNumber((long) PortNumberValuesV10.CONTROLLER.getIntValue())); + + } } actionBuilder @@ -395,4 +460,219 @@ public final class ActionConvertor { actionsListBuilder.setAction(actionBuilder.build()); return actionsListBuilder.build(); } + + /** + * Method to convert OF actions associated with bucket to SAL Actions. + * + * @param actionList + * @return List of converted SAL Actions. + */ + public static List toSALBucketActions( + List actionList) { + + List bucketActions = new ArrayList(); + for (ActionsList actionDesc : actionList) { + + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.Action action = actionDesc + .getAction(); + + if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Output.class)) + bucketActions.add(ofToSALOutputAction(action)); + else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Group.class)) + bucketActions.add(ofToSALGroupAction(action)); + else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.CopyTtlOut.class)){ + CopyTtlOutBuilder copyTtlOutaction = new CopyTtlOutBuilder(); + bucketActions.add(new CopyTtlOutCaseBuilder().setCopyTtlOut(copyTtlOutaction.build()).build()); + } + else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.CopyTtlIn.class)){ + CopyTtlInBuilder copyTtlInaction = new CopyTtlInBuilder(); + bucketActions.add(new CopyTtlInCaseBuilder().setCopyTtlIn(copyTtlInaction.build()).build()); + } + else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetMplsTtl.class)) + bucketActions.add(ofToSALSetMplsTtl(action)); + else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecMplsTtl.class)){ + DecMplsTtlBuilder decMplsTtl = new DecMplsTtlBuilder(); + bucketActions.add(new DecMplsTtlCaseBuilder().setDecMplsTtl(decMplsTtl.build()).build()); + } + else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushVlan.class)) + bucketActions.add(ofToSALPushVlanAction(action)); + else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopVlan.class)){ + PopVlanActionBuilder popVlan = new PopVlanActionBuilder(); + bucketActions.add(new PopVlanActionCaseBuilder().setPopVlanAction(popVlan.build()).build()); + } + else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushMpls.class)){ + PushMplsActionBuilder pushMpls = new PushMplsActionBuilder(); + bucketActions.add(new PushMplsActionCaseBuilder().setPushMplsAction(pushMpls.build()).build()); + } + else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopMpls.class)){ + PopMplsActionBuilder popMpls = new PopMplsActionBuilder(); + bucketActions.add(new PopMplsActionCaseBuilder().setPopMplsAction(popMpls.build()).build()); + } + else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetQueue.class)) + bucketActions.add(ofToSALSetQueue(action)); + + else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetNwTtl.class)) + bucketActions.add(ofToSALSetNwTtl(action)); + else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecNwTtl.class)){ + DecNwTtlBuilder decNwTtl = new DecNwTtlBuilder(); + bucketActions.add(new DecNwTtlCaseBuilder().setDecNwTtl(decNwTtl.build()).build()); + } + else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField.class)) + bucketActions.add(new SetFieldCaseBuilder().setSetField(MatchConvertor.ofToSALSetField(action)).build()); + + else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushPbb.class)) + bucketActions.add(ofToSALPushPbbAction(action)); + else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopPbb.class)){ + PopPbbActionBuilder popPbb = new PopPbbActionBuilder(); + bucketActions.add(new PopPbbActionCaseBuilder().setPopPbbAction(popPbb.build()).build()); + } + else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Experimenter.class)){ + //bucketActions.add(ofToSALExperimenter(action)); + // TODO: Need to explore/discuss on how to handle experimenter case. + } + + } + return bucketActions; + } + + /** + * Method converts OF Output action object to SAL Output action object. + * + * @param action + * org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common. + * action.rev130731.actions.actions.list.Action + * @return OutputAction + */ + public static OutputActionCase ofToSALOutputAction( + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.Action action) { + + OutputActionBuilder outputAction = new OutputActionBuilder(); + PortAction port = action.getAugmentation(PortAction.class); + if (port != null) { + outputAction.setOutputNodeConnector(new Uri(port.getPort().getValue().toString())); + } else { + logger.error("Provided action is not OF Output action, no associated port found!"); + } + + MaxLengthAction length = action.getAugmentation(MaxLengthAction.class); + if (length != null) { + outputAction.setMaxLength(length.getMaxLength()); + } else { + logger.error("Provided action is not OF Output action, no associated length found!"); + } + + return new OutputActionCaseBuilder().setOutputAction(outputAction.build()).build(); + } + + /** + * Method converts OF GroupAction object to SAL GroupAction object + * + * @param action + * @return GroupAction + */ + public static GroupActionCase ofToSALGroupAction( + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.Action action) { + + GroupActionBuilder groupAction = new GroupActionBuilder(); + + GroupIdAction groupId = action.getAugmentation(GroupIdAction.class); + groupAction.setGroupId(groupId.getGroupId()); + + return new GroupActionCaseBuilder().setGroupAction(groupAction.build()).build(); + } + + /** + * Method converts OF SetMplsTTL action object to SAL SetMplsTTL action + * object. + * + * @param action + * @return + */ + public static SetMplsTtlActionCase ofToSALSetMplsTtl( + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.Action action) { + + SetMplsTtlActionBuilder mplsTtlAction = new SetMplsTtlActionBuilder(); + MplsTtlAction mplsTtl = action.getAugmentation(MplsTtlAction.class); + mplsTtlAction.setMplsTtl(mplsTtl.getMplsTtl()); + return new SetMplsTtlActionCaseBuilder().setSetMplsTtlAction(mplsTtlAction.build()).build(); + } + + /** + * Method converts OF Pushvlan action to SAL PushVlan action. + * + * @param action + * @return PushVlanAction + */ + public static PushVlanActionCase ofToSALPushVlanAction( + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.Action action) { + + PushVlanActionBuilder pushVlanAction = new PushVlanActionBuilder(); + + EthertypeAction etherType = action.getAugmentation(EthertypeAction.class); + pushVlanAction.setVlanId(new VlanId(etherType.getEthertype().getValue())); + + return new PushVlanActionCaseBuilder().setPushVlanAction(pushVlanAction.build()).build(); + } + + /** + * Method converts OF SetQueue action to SAL SetQueue action. + * + * @param action + * @return SetQueueAction + */ + public static SetQueueActionCase ofToSALSetQueue( + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.Action action) { + + SetQueueActionBuilder setQueueAction = new SetQueueActionBuilder(); + + QueueIdAction queueId = action.getAugmentation(QueueIdAction.class); + setQueueAction.setQueueId(queueId.getQueueId()); + + return new SetQueueActionCaseBuilder().setSetQueueAction(setQueueAction.build()).build(); + } + + /** + * Method converts OF SetNwTtl action to SAL SetNwTtl action. + * + * @param action + * @return SetNwTtlAction + */ + public static SetNwTtlActionCase ofToSALSetNwTtl( + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.Action action) { + + SetNwTtlActionBuilder setNwTtl = new SetNwTtlActionBuilder(); + NwTtlAction nwTtl = action.getAugmentation(NwTtlAction.class); + setNwTtl.setNwTtl(nwTtl.getNwTtl()); + + return new SetNwTtlActionCaseBuilder().setSetNwTtlAction(setNwTtl.build()).build(); + } + + /** + * Method converts OF Pushvlan action to SAL PushVlan action. + * + * @param action + * @return PushVlanAction + */ + public static PushPbbActionCase ofToSALPushPbbAction( + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.Action action) { + + PushPbbActionBuilder pushPbbAction = new PushPbbActionBuilder(); + + EthertypeAction etherType = action.getAugmentation(EthertypeAction.class); + pushPbbAction.setEthernetType(etherType.getEthertype().getValue()); + + return new PushPbbActionCaseBuilder().setPushPbbAction(pushPbbAction.build()).build(); + } + + public static Object ofToSALExperimenter( + org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.Action action) { + + ExperimenterAction ExperimenterAction = action.getAugmentation(ExperimenterAction.class); + + return null; + /* + * TODO: Need to explore/discuss about how to handle experimenter + */ + + } }