-/**
+/*
* Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
+import java.util.Optional;
import org.opendaylight.openflowjava.protocol.api.keys.MatchEntrySerializerKey;
import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
import org.opendaylight.openflowplugin.extension.api.AugmentTuple;
import org.opendaylight.openflowplugin.extension.api.ExtensionAugment;
import org.opendaylight.openflowplugin.extension.api.path.MatchPath;
import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.oxm.container.match.entry.value.ExperimenterIdCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ExperimenterClass;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNodesNodeTableFlow;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNodesNodeTableFlowBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNotifPacketIn;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNotifPacketInBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNotifSwitchFlowRemoved;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNotifSwitchFlowRemovedBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNotifUpdateFlowStats;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNotifUpdateFlowStatsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchPacketInMessage;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchPacketInMessageBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchRpcOutputFlowStats;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchRpcOutputFlowStatsBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.ExtensionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.list.grouping.ExtensionList;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.list.grouping.ExtensionListBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.packet.received.Match;
import org.opendaylight.yangtools.yang.binding.Augmentable;
import org.opendaylight.yangtools.yang.binding.Augmentation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- *
- */
public final class MatchExtensionHelper {
- private static final Logger LOG = LoggerFactory
- .getLogger(MatchExtensionHelper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MatchExtensionHelper.class);
private MatchExtensionHelper() {
throw new IllegalAccessError("singleton enforcement");
}
/**
- * @param matchEntries
- * @param ofVersion
- * @param matchPath
+ * Injects an extension.
+ *
+ * @param matchEntry match entry
+ * @param ofVersion openflow version
+ * @param matchPath match path
+ */
+ public static void injectExtension(
+ final short ofVersion,
+ final MatchEntry matchEntry,
+ final MatchBuilder matchBuilder,
+ final MatchPath matchPath) {
+
+ final ExtensionListBuilder extBuilder = processExtension(matchEntry, ofVersion, matchPath);
+
+ // TODO: remove the Optional.ofNullable() here, which will result more performant and easier to understand code
+ final GeneralAugMatchNodesNodeTableFlowBuilder builder = Optional
+ .ofNullable(matchBuilder.augmentation(GeneralAugMatchNodesNodeTableFlow.class))
+ .map(GeneralAugMatchNodesNodeTableFlowBuilder::new)
+ .orElse(new GeneralAugMatchNodesNodeTableFlowBuilder().setExtensionList(new HashMap<>()));
+
+ if (extBuilder != null) {
+ final ExtensionList ext = extBuilder.build();
+ builder.getExtensionList().put(ext.key(), ext);
+ } else {
+ LOG.warn("Convertor for {} for version {} with match path {} not found.",
+ matchEntry, ofVersion, matchPath.name());
+ }
+
+ matchBuilder.addAugmentation(GeneralAugMatchNodesNodeTableFlow.class, builder.build());
+ }
+
+ /**
+ * Processes all extensions.
+ *
+ * @param matchEntries match entries
+ * @param ofVersion openflow version
+ * @param matchPath match path
+ * @param <E> extension point
* @return augmentation wrapper containing augmentation depending on matchPath
*/
@SuppressWarnings("unchecked")
- public static <EXT_POINT extends Augmentable<EXT_POINT>>
- AugmentTuple<EXT_POINT> processAllExtensions(Collection<MatchEntry> matchEntries,
- OpenflowVersion ofVersion, MatchPath matchPath) {
+ public static <E extends Augmentable<E>> AugmentTuple<E> processAllExtensions(
+ final Collection<MatchEntry> matchEntries, final OpenflowVersion ofVersion, final MatchPath matchPath) {
List<ExtensionList> extensionsList = new ArrayList<>();
- for (MatchEntry matchEntry : matchEntries) {
- ExtensionListBuilder extensionListBld = processExtension(matchEntry, ofVersion, matchPath);
- if (extensionListBld == null) {
- continue;
- }
+ if (matchEntries != null) {
+ for (MatchEntry matchEntry : matchEntries) {
+ ExtensionListBuilder extensionListBld = processExtension(matchEntry, ofVersion.getVersion(), matchPath);
+ if (extensionListBld == null) {
+ continue;
+ }
- extensionsList.add(extensionListBld.build());
+ extensionsList.add(extensionListBld.build());
+ }
}
- AugmentTuple<EXT_POINT> augmentTuple = null;
+ AugmentTuple<E> augmentTuple = null;
if (!extensionsList.isEmpty()) {
switch (matchPath) {
- case FLOWSSTATISTICSUPDATE_FLOWANDSTATISTICSMAPLIST_MATCH:
- GeneralAugMatchNotifUpdateFlowStatsBuilder generalExtMatchAugBld1 = new GeneralAugMatchNotifUpdateFlowStatsBuilder();
+ case FLOWS_STATISTICS_UPDATE_MATCH:
+ GeneralAugMatchNotifUpdateFlowStatsBuilder generalExtMatchAugBld1 =
+ new GeneralAugMatchNotifUpdateFlowStatsBuilder();
generalExtMatchAugBld1.setExtensionList(extensionsList);
- augmentTuple = (AugmentTuple<EXT_POINT>)
- new AugmentTuple<org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match>(
+ augmentTuple = (AugmentTuple<E>)
+ new AugmentTuple<>(
GeneralAugMatchNotifUpdateFlowStats.class, generalExtMatchAugBld1.build());
break;
- case PACKETRECEIVED_MATCH:
- GeneralAugMatchNotifPacketInBuilder generalExtMatchAugBld2 = new GeneralAugMatchNotifPacketInBuilder();
+ case PACKET_RECEIVED_MATCH:
+ GeneralAugMatchNotifPacketInBuilder generalExtMatchAugBld2 =
+ new GeneralAugMatchNotifPacketInBuilder();
generalExtMatchAugBld2.setExtensionList(extensionsList);
- augmentTuple = (AugmentTuple<EXT_POINT>)
- new AugmentTuple<Match>(GeneralAugMatchNotifPacketIn.class, generalExtMatchAugBld2.build());
+ augmentTuple = (AugmentTuple<E>)
+ new AugmentTuple<>(GeneralAugMatchNotifPacketIn.class, generalExtMatchAugBld2.build());
break;
- case SWITCHFLOWREMOVED_MATCH:
- GeneralAugMatchNotifSwitchFlowRemovedBuilder generalExtMatchAugBld3 = new GeneralAugMatchNotifSwitchFlowRemovedBuilder();
+ case PACKET_IN_MESSAGE_MATCH:
+ GeneralAugMatchPacketInMessageBuilder generalExtMatchAugBld5 =
+ new GeneralAugMatchPacketInMessageBuilder();
+ generalExtMatchAugBld5.setExtensionList(extensionsList);
+ augmentTuple = (AugmentTuple<E>)
+ new AugmentTuple<>(GeneralAugMatchPacketInMessage.class, generalExtMatchAugBld5.build());
+ break;
+ case SWITCH_FLOW_REMOVED_MATCH:
+ GeneralAugMatchNotifSwitchFlowRemovedBuilder generalExtMatchAugBld3 =
+ new GeneralAugMatchNotifSwitchFlowRemovedBuilder();
generalExtMatchAugBld3.setExtensionList(extensionsList);
- augmentTuple = (AugmentTuple<EXT_POINT>)
- new AugmentTuple<org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.mod.removed.Match>(
+ augmentTuple = (AugmentTuple<E>)
+ new AugmentTuple<>(
GeneralAugMatchNotifSwitchFlowRemoved.class, generalExtMatchAugBld3.build());
break;
+ case FLOWS_STATISTICS_RPC_MATCH:
+ GeneralAugMatchRpcOutputFlowStatsBuilder generalExtMatchAugBld4 =
+ new GeneralAugMatchRpcOutputFlowStatsBuilder();
+ generalExtMatchAugBld4.setExtensionList(extensionsList);
+ augmentTuple = (AugmentTuple<E>)
+ new AugmentTuple<>(
+ GeneralAugMatchRpcOutputFlowStats.class, generalExtMatchAugBld4.build());
+ break;
default:
LOG.warn("matchPath not supported: {}", matchPath);
}
}
/**
- * @param ofVersion
- * @param matchPath
- * @param matchEntry
- * @return
+ * Processes an extension.
+ *
+ * @param ofVersion openflow version
+ * @param matchPath match path
+ * @param matchEntry match entry
+ * @return an ExtensionListBuilder
*/
- private static ExtensionListBuilder processExtension(MatchEntry matchEntry, OpenflowVersion ofVersion, MatchPath matchPath) {
+ private static ExtensionListBuilder processExtension(final MatchEntry matchEntry, final short ofVersion,
+ final MatchPath matchPath) {
ExtensionListBuilder extListBld = null;
- /** TODO: EXTENSION PROPOSAL (match, OFJava to MD-SAL) */
+ // TODO: EXTENSION PROPOSAL (match, OFJava to MD-SAL)
MatchEntrySerializerKey<? extends OxmClassBase, ? extends MatchField> key = new MatchEntrySerializerKey<>(
- ofVersion.getVersion(), matchEntry.getOxmClass(), matchEntry.getOxmMatchField());
+ ofVersion, matchEntry.getOxmClass(), matchEntry.getOxmMatchField());
+
+ // If entry is experimenter, set experimenter ID to key
+ if (matchEntry.getOxmClass().equals(ExperimenterClass.class)) {
+ ExperimenterIdCase experimenterIdCase = (ExperimenterIdCase) matchEntry.getMatchEntryValue();
+ key.setExperimenterId(experimenterIdCase.getExperimenter().getExperimenter().getValue());
+ }
+
if (null != OFSessionUtil.getExtensionConvertorProvider()) {
- ConvertorFromOFJava<MatchEntry, MatchPath> convertor = OFSessionUtil.getExtensionConvertorProvider().getConverter(key);
+ ConvertorFromOFJava<MatchEntry, MatchPath> convertor =
+ OFSessionUtil.getExtensionConvertorProvider().getConverter(key);
if (convertor != null) {
ExtensionAugment<? extends Augmentation<Extension>> extensionMatch =
convertor.convert(matchEntry, matchPath);
}
return extListBld;
}
-
}
Code Review / openflowplugin.git / blobdiff