*/
package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor;
-import org.opendaylight.openflowplugin.openflow.md.OFConstants;
+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.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;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.OrderComparator;
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.InventoryDataServiceUtil;
import org.opendaylight.openflowplugin.openflow.md.util.OpenflowPortsUtil;
import org.opendaylight.openflowplugin.openflow.md.util.OpenflowVersion;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.DlAddressActionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.EthertypeAction;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.EthertypeActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterActionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.GroupIdAction;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.GroupIdActionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MaxLengthAction;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.OxmFieldsActionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortAction;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortMatchEntry;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortMatchEntryBuilder;
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.augments.rev131002.VlanPcpAction;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanVidActionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanVidMatchEntry;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanVidMatchEntryBuilder;
-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.oxm.rev130731.EthDst;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.EthSrc;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.OpenflowBasicClass;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.TcpDst;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.TcpSrc;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.VlanVid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.grouping.MatchEntries;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.grouping.MatchEntriesBuilder;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralExtensionGrouping;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
* 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);
/**
* Translates SAL actions into OF Library actions
- * @param actions SAL actions
- * @param version Openflow protocol version used
+ *
+ * @param actions SAL actions
+ * @param version Openflow protocol version used
* @param datapathid
* @return OF Library actions
*/
public static List<Action> getActions(
List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action> actions,
- short version, BigInteger datapathid)
-
- {
+ short version, BigInteger datapathid) {
List<Action> actionsList = new ArrayList<>();
Action ofAction;
+ actions = Ordering.from(OrderComparator.<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action>toInstance())
+ .sortedCopy(actions);
+
for (int actionItem = 0; actionItem < actions.size(); actionItem++) {
ofAction = null;
ActionBuilder actionBuilder = new ActionBuilder();
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);
ofAction = SalToOFPushPbbAction(action, actionBuilder);
else if (action instanceof PopPbbActionCase)
ofAction = SalToOFPopPBB(actionBuilder);
- else if (action instanceof ExperimenterAction)
- ofAction = SalToOFExperimenter(action, actionBuilder);
- // 1.0 Actions
- else if (action instanceof SetVlanIdActionCase)
+ // 1.0 Actions
+ 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)
ofAction = SalToOFSetTpDst(action, actionBuilder, version);
else if (action instanceof SetNwTosActionCase)
ofAction = SalToOFSetNwTos(action, actionBuilder, version);
-
+ else if (action instanceof GeneralExtensionGrouping) {
+
+ /**
+ * TODO: EXTENSION PROPOSAL (action, MD-SAL to OFJava)
+ * - we might need sessionContext as converter input
+ *
+ */
+
+ GeneralExtensionGrouping extensionCaseGrouping = (GeneralExtensionGrouping) action;
+ Extension extAction = extensionCaseGrouping.getExtension();
+ ConverterExtensionKey<? extends ExtensionKey> key = new ConverterExtensionKey<>(extensionCaseGrouping.getExtensionKey(), version);
+ ConvertorToOFJava<Action> convertor =
+ OFSessionUtil.getExtensionConvertorProvider().getConverter(key);
+ if (convertor != null) {
+ ofAction = convertor.convert(extAction);
+ }
+ } else {
+ // try vendor codecs
+ TypeVersionKey<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action> key =
+ new TypeVersionKey<>(
+ (Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action>) action.getImplementedInterface(),
+ version);
+ ConvertorActionToOFJava<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action, Action> convertor =
+ OFSessionUtil.getExtensionConvertorProvider().getConverter(key);
+ if (convertor != null) {
+ ofAction = convertor.convert(action);
+ }
+ }
+
if (ofAction != null) {
actionsList.add(ofAction);
}
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) {
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 emtpyAction(actionBuilder);
+ }
+
PushVlanActionCase pushVlanActionCase = (PushVlanActionCase) action;
PushVlanAction pushVlanAction = pushVlanActionCase.getPushVlanAction();
actionBuilder.setType(PushVlan.class);
return emtpyAction(actionBuilder);
}
- private static Action SalToOFExperimenter(
- org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
- ActionBuilder actionBuilder) {
- ExperimenterActionBuilder experimenterActionBuilder = new ExperimenterActionBuilder();
- experimenterActionBuilder.setExperimenter(((ExperimenterAction) action).getExperimenter());
- actionBuilder.setType(Experimenter.class);
- actionBuilder
- .addAugmentation(
- ExperimenterAction.class,
- (Augmentation<Action>) experimenterActionBuilder);
- return actionBuilder.build();
- }
-
+ // 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) {
.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
matchEntriesBuilder.setOxmMatchField(VlanVid.class);
VlanVidMatchEntryBuilder vlanVidBuilder = new VlanVidMatchEntryBuilder();
vlanVidBuilder.setCfiBit(true);
- vlanVidBuilder.setVlanVid(new Integer(0x0000));
+ vlanVidBuilder.setVlanVid(0x0000);
matchEntriesBuilder.addAugmentation(VlanVidMatchEntry.class, vlanVidBuilder.build());
matchEntriesBuilder.setHasMask(false);
matchEntriesList.add(matchEntriesBuilder.build());
logger.error("Unknown Action Type for the Version", version);
return null;
}
-
}
private static Action SalToOFSetDlDst(
logger.error("Unknown Action Type for the Version", version);
return null;
}
-
}
protected static Action SalToOFSetNwSrc(
logger.error(e.getMessage(), e);
return null;
}
-
+
return actionBuilder.build();
}
logger.error(e.getMessage(), e);
return null;
}
-
+
return actionBuilder.build();
}
.setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetTpSrc.class);
actionBuilder.addAugmentation(PortAction.class, settpsrc.build());
return actionBuilder.build();
+ } else if (version == OFConstants.OFP_VERSION_1_3) {
+ SetTpSrcActionCase settpsrccase = (SetTpSrcActionCase) action;
+ SetTpSrcAction settpsrcaction = settpsrccase.getSetTpSrcAction();
+
+ MatchEntriesBuilder matchEntriesBuilder = new MatchEntriesBuilder();
+ matchEntriesBuilder.setOxmClass(OpenflowBasicClass.class);
+ matchEntriesBuilder.setHasMask(false);
+ matchEntriesBuilder.setOxmMatchField(TcpSrc.class);
+ PortMatchEntryBuilder portMatchEntryBuilder = new PortMatchEntryBuilder();
+ portMatchEntryBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber(settpsrcaction.getPort().getValue().intValue()));
+ matchEntriesBuilder.addAugmentation(PortMatchEntry.class, portMatchEntryBuilder.build());
+
+ actionBuilder
+ .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField.class);
+
+ OxmFieldsActionBuilder oxmFieldsActionBuilder = new OxmFieldsActionBuilder();
+ List<MatchEntries> matchEntries = new ArrayList<MatchEntries>();
+ matchEntries.add(matchEntriesBuilder.build());
+ oxmFieldsActionBuilder.setMatchEntries(matchEntries);
+
+ actionBuilder.addAugmentation(OxmFieldsAction.class, oxmFieldsActionBuilder.build());
+ return actionBuilder.build();
}
logger.error("Unknown Action Type for the Version", version);
return null;
.setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetTpDst.class);
actionBuilder.addAugmentation(PortAction.class, settpdst.build());
return actionBuilder.build();
+ } else if (version == OFConstants.OFP_VERSION_1_3) {
+ SetTpDstActionCase settpdstcase = (SetTpDstActionCase) action;
+ SetTpDstAction settpdstaction = settpdstcase.getSetTpDstAction();
+
+ MatchEntriesBuilder matchEntriesBuilder = new MatchEntriesBuilder();
+ matchEntriesBuilder.setOxmClass(OpenflowBasicClass.class);
+ matchEntriesBuilder.setHasMask(false);
+ matchEntriesBuilder.setOxmMatchField(TcpDst.class);
+ PortMatchEntryBuilder portMatchEntryBuilder = new PortMatchEntryBuilder();
+ portMatchEntryBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber(settpdstaction.getPort().getValue().intValue()));
+ matchEntriesBuilder.addAugmentation(PortMatchEntry.class, portMatchEntryBuilder.build());
+
+ actionBuilder
+ .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField.class);
+
+ OxmFieldsActionBuilder oxmFieldsActionBuilder = new OxmFieldsActionBuilder();
+ List<MatchEntries> matchEntries = new ArrayList<MatchEntries>();
+ matchEntries.add(matchEntriesBuilder.build());
+ oxmFieldsActionBuilder.setMatchEntries(matchEntries);
+
+ actionBuilder.addAugmentation(OxmFieldsAction.class, oxmFieldsActionBuilder.build());
+ return actionBuilder.build();
}
logger.error("Unknown Action Type for the Version", version);
return null;
private static Action SalToOFPushAction(Integer ethernetType, ActionBuilder actionBuilder) {
EthertypeActionBuilder ethertypeActionBuilder = new EthertypeActionBuilder();
- ethertypeActionBuilder.setEthertype(new EtherType(ethernetType));
+ if (ethernetType != null) {
+ ethertypeActionBuilder.setEthertype(new EtherType(ethernetType));
+ }
/* OF */
actionBuilder.addAugmentation(EthertypeAction.class, ethertypeActionBuilder.build());
if (outputAction.getMaxLength() != null) {
maxLenActionBuilder.setMaxLength(outputAction.getMaxLength());
} else {
- maxLenActionBuilder.setMaxLength(new Integer(0));
+ maxLenActionBuilder.setMaxLength(0);
}
actionBuilder.addAugmentation(MaxLengthAction.class, maxLenActionBuilder.build());
if (OpenflowPortsUtil.checkPortValidity(ofVersion, portNumber)) {
portAction.setPort(new PortNumber(portNumber));
} else {
- logger.error("Invalid Port specified "+ portNumber + " for Output Action for OF version:"+ ofVersion);
+ logger.error("Invalid Port specified " + portNumber + " for Output Action for OF version:" + ofVersion);
}
actionBuilder.setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Output.class);
* Method to convert OF actions associated with bucket to SAL Actions.
*
* @param actionList
- * @param ofVersion current ofp version
+ * @param ofVersion current ofp version
+ * @param actionPath TODO
* @return List of converted SAL Actions.
*/
public static List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action> toMDSalActions(
- List<Action> actionList, OpenflowVersion ofVersion) {
+ List<Action> actionList, OpenflowVersion ofVersion, ActionPath actionPath) {
List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action> bucketActions = new ArrayList<>();
for (Action action : actionList) {
} 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.
+ /**
+ * TODO: EXTENSION PROPOSAL (action, OFJava to MD-SAL)
+ * - we might also need a way on how to identify exact type of augmentation to be
+ * used as match can be bound to multiple models
+ */
+ org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action processedAction =
+ ActionExtensionHelper.processAlienAction(action, ofVersion, actionPath);
+ if (processedAction != null) {
+ bucketActions.add(processedAction);
+ }
}
-
}
return bucketActions;
}
/**
* Method converts OF Output action object to SAL Output action object.
- * @param ofVersion
- * @param ofVersion
- * @param action
- * org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.
- * action.rev130731.actions.actions.list.Action
*
+ * @param ofVersion
+ * @param ofVersion
+ * @param action org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.
+ * action.rev130731.actions.actions.list.Action
* @return OutputAction
*/
public static OutputActionCase ofToSALOutputAction(OpenflowVersion ofVersion, Action action) {
return new PushPbbActionCaseBuilder().setPushPbbAction(pushPbbAction.build()).build();
}
- public static Object ofToSALExperimenter(Action action) {
-
- ExperimenterAction ExperimenterAction = action.getAugmentation(ExperimenterAction.class);
-
- return null;
- /*
- * TODO: Need to explore/discuss about how to handle experimenter
- */
-
- }
}
Code Review / openflowplugin.git / blobdiff