<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<optional>true</optional>
</dependency>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<optional>true</optional>
</dependency>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>karaf4-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
</parent>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>openflowplugin-karaf</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
/**
* Returns the eric_field class.
*/
- public abstract Class<? extends MatchField> getEricField();
+ public abstract MatchField getEricField();
/**
* Returns the oxm_class class.
*/
- public abstract Class<? extends OxmClassBase> getOxmClass();
+ public abstract OxmClassBase getOxmClass();
}
public class Icmpv6NDOptionsTypeCodec extends AbstractMatchCodec {
private static final int VALUE_LENGTH = 1;
public static final MatchEntrySerializerKey<?, ?> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, EricExpClass.class, Icmpv6NdOptionsType.class);
+ EncodeConstants.OF_VERSION_1_3, EricExpClass.VALUE, Icmpv6NdOptionsType.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, EricConstants.ERICOXM_OF_EXPERIMENTER_ID,
EricConstants.ERICOXM_OF_ICMPV6_ND_OPTIONS_TYPE);
}
@Override
- public Class<? extends MatchField> getEricField() {
- return Icmpv6NdOptionsType.class;
+ public MatchField getEricField() {
+ return Icmpv6NdOptionsType.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return EricExpClass.class;
+ public OxmClassBase getOxmClass() {
+ return EricExpClass.VALUE;
}
-}
\ No newline at end of file
+}
private static final int VALUE_LENGTH = 4;
public static final MatchEntrySerializerKey<?, ?> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, EricExpClass.class, Icmpv6NdReserved.class);
+ EncodeConstants.OF_VERSION_1_3, EricExpClass.VALUE, Icmpv6NdReserved.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, EricConstants.ERICOXM_OF_EXPERIMENTER_ID,
EricConstants.ERICOXM_OF_ICMPV6_ND_RESERVED);
}
@Override
- public Class<? extends MatchField> getEricField() {
- return Icmpv6NdReserved.class;
+ public MatchField getEricField() {
+ return Icmpv6NdReserved.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return EricExpClass.class;
+ public OxmClassBase getOxmClass() {
+ return EricExpClass.VALUE;
}
-}
\ No newline at end of file
+}
@Before
public void setUp() {
providers.add(provider);
- matchSerializerKey = new MatchEntrySerializerKey<>(VERSION, EricExpClass.class, MatchField.class);
+ matchSerializerKey = new MatchEntrySerializerKey<>(VERSION, EricExpClass.VALUE, MatchField.VALUE);
//OxmClass 1, OxmField 2
matchDeserializerKey = new MatchEntryDeserializerKey(VERSION, 1, 2);
@Test
public void registerEricExtensionsTest() {
verify(registrator).registerMatchEntrySerializer(
- eq(new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, EricExpClass.class,
- Icmpv6NdReserved.class)), any(Icmpv6NDReservedCodec.class));
+ eq(new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, EricExpClass.VALUE,
+ Icmpv6NdReserved.VALUE)), any(Icmpv6NDReservedCodec.class));
verify(registrator).registerMatchEntryDeserializer(
eq(new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3,
EricConstants.ERICOXM_OF_EXPERIMENTER_ID, EricConstants.ERICOXM_OF_ICMPV6_ND_RESERVED)),
any(Icmpv6NDReservedCodec.class));
verify(registrator).registerMatchEntrySerializer(
- eq(new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, EricExpClass.class,
- Icmpv6NdOptionsType.class)), any(Icmpv6NDOptionsTypeCodec.class));
+ eq(new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, EricExpClass.VALUE,
+ Icmpv6NdOptionsType.VALUE)), any(Icmpv6NDOptionsTypeCodec.class));
verify(registrator).registerMatchEntryDeserializer(
eq(new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3,
EricConstants.ERICOXM_OF_EXPERIMENTER_ID,
ericExtensionsRegistrator.close();
verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, EricExpClass.class,
- Icmpv6NdReserved.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, EricExpClass.VALUE,
+ Icmpv6NdReserved.VALUE));
verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, EricConstants.ERICOXM_OF_EXPERIMENTER_ID,
EricConstants.ERICOXM_OF_ICMPV6_ND_RESERVED));
verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, EricExpClass.class,
- Icmpv6NdOptionsType.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, EricExpClass.VALUE,
+ Icmpv6NdOptionsType.VALUE));
verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, EricConstants.ERICOXM_OF_EXPERIMENTER_ID,
EricConstants.ERICOXM_OF_ICMPV6_ND_OPTIONS_TYPE));
input = icmpv6NDOptionsTypeCodec.deserialize(buffer);
final Icmpv6NdOptionsTypeCaseValue result = (Icmpv6NdOptionsTypeCaseValue) input.getMatchEntryValue();
- assertEquals(EricExpClass.class, input.getOxmClass());
- assertEquals(Icmpv6NdOptionsType.class, input.getOxmMatchField());
+ assertEquals(EricExpClass.VALUE, input.getOxmClass());
+ assertEquals(Icmpv6NdOptionsType.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(2, result.getIcmpv6NdOptionsTypeValues().getIcmpv6NdOptionsType().shortValue());
}
final Icmpv6NdOptionsTypeCaseValueBuilder caseBuilder = new Icmpv6NdOptionsTypeCaseValueBuilder();
final Icmpv6NdOptionsTypeValuesBuilder valuesBuilder = new Icmpv6NdOptionsTypeValuesBuilder();
- matchEntryBuilder.setOxmClass(EricExpClass.class);
- matchEntryBuilder.setOxmMatchField(Icmpv6NdOptionsType.class);
+ matchEntryBuilder.setOxmClass(EricExpClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Icmpv6NdOptionsType.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setIcmpv6NdOptionsType(Uint8.ONE);
message.writeByte(VALUE_LENGTH);
message.writeByte(2);
}
-}
\ No newline at end of file
+}
input = icmpv6NDReservedCodec.deserialize(buffer);
final Icmpv6NdReservedCaseValue result = (Icmpv6NdReservedCaseValue) input.getMatchEntryValue();
- assertEquals(EricExpClass.class, input.getOxmClass());
- assertEquals(Icmpv6NdReserved.class, input.getOxmMatchField());
+ assertEquals(EricExpClass.VALUE, input.getOxmClass());
+ assertEquals(Icmpv6NdReserved.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(2, result.getIcmpv6NdReservedValues().getIcmpv6NdReserved().intValue());
}
final Icmpv6NdReservedCaseValueBuilder caseBuilder = new Icmpv6NdReservedCaseValueBuilder();
final Icmpv6NdReservedValuesBuilder valuesBuilder = new Icmpv6NdReservedValuesBuilder();
- matchEntryBuilder.setOxmClass(EricExpClass.class);
- matchEntryBuilder.setOxmMatchField(Icmpv6NdReserved.class);
+ matchEntryBuilder.setOxmClass(EricExpClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Icmpv6NdReserved.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setIcmpv6NdReserved(Uint32.ONE);
message.writeByte(VALUE_LENGTH);
message.writeInt(2);
}
-}
\ No newline at end of file
+}
EncodeConstants.OF_VERSION_1_3,
matchEntry.getOxmClass(),
matchEntry.getOxmMatchField());
- if (matchEntry.getOxmClass().equals(ExperimenterClass.class)) {
+ if (ExperimenterClass.VALUE.equals(matchEntry.getOxmClass())) {
ExperimenterIdCase experimenterIdCase = (ExperimenterIdCase) matchEntry.getMatchEntryValue();
key.setExperimenterId(experimenterIdCase.getExperimenter().getExperimenter().getValue());
}
@Override
public void injectSerializerRegistry(final SerializerRegistry registry) {
- this.serializerRegistry = registry;
+ serializerRegistry = registry;
}
@Override
public void injectDeserializerRegistry(final DeserializerRegistry registry) {
- this.deserializerRegistry = registry;
+ deserializerRegistry = registry;
}
}
public abstract class AbstractExperimenterMatchCodec extends AbstractMatchCodec {
protected static <F extends MatchField> MatchEntrySerializerKey<ExperimenterClass, F> createSerializerKey(
- final Uint8 version, final Uint32 expId, final Class<F> oxmField) {
+ final Uint8 version, final Uint32 expId, final F oxmField) {
MatchEntrySerializerKey<ExperimenterClass, F> key = new MatchEntrySerializerKey<>(
- version, ExperimenterClass.class, oxmField);
+ version, ExperimenterClass.VALUE, oxmField);
key.setExperimenterId(expId);
return key;
}
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return ExperimenterClass.class;
+ public OxmClassBase getOxmClass() {
+ return ExperimenterClass.VALUE;
}
@Override
/**
* Returns the nxm_field class.
*/
- public abstract Class<? extends MatchField> getNxmField();
+ public abstract MatchField getNxmField();
/**
* Returns the oxm_class class.
*/
- public abstract Class<? extends OxmClassBase> getOxmClass();
+ public abstract OxmClassBase getOxmClass();
}
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm1Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm1Class.VALUE;
}
}
private static final int VALUE_LENGTH = 2;
private static final int NXM_FIELD_CODE = 15;
public static final MatchEntrySerializerKey<Nxm0Class, NxmOfArpOp> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpOp.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfArpOp.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmOfArpOp.class;
+ public MatchField getNxmField() {
+ return NxmOfArpOp.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm0Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm0Class.VALUE;
}
}
private static final int VALUE_LENGTH = 6;
private static final int NXM_FIELD_CODE = 17;
public static final MatchEntrySerializerKey<Nxm1Class, NxmNxArpSha> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxArpSha.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxArpSha.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxArpSha.class;
+ public MatchField getNxmField() {
+ return NxmNxArpSha.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm1Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm1Class.VALUE;
}
}
private static final int VALUE_LENGTH = 4;
private static final int NXM_FIELD_CODE = 16;
public static final MatchEntrySerializerKey<Nxm0Class, NxmOfArpSpa> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpSpa.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfArpSpa.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmOfArpSpa.class;
+ public MatchField getNxmField() {
+ return NxmOfArpSpa.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm0Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm0Class.VALUE;
}
}
private static final int VALUE_LENGTH = 6;
private static final int NXM_FIELD_CODE = 18;
public static final MatchEntrySerializerKey<Nxm1Class, NxmNxArpTha> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxArpTha.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxArpTha.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxArpTha.class;
+ public MatchField getNxmField() {
+ return NxmNxArpTha.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm1Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm1Class.VALUE;
}
}
private static final int VALUE_LENGTH = 4;
private static final int NXM_FIELD_CODE = 17;
public static final MatchEntrySerializerKey<Nxm0Class, NxmOfArpTpa> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpTpa.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfArpTpa.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmOfArpTpa.class;
+ public MatchField getNxmField() {
+ return NxmOfArpTpa.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm0Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm0Class.VALUE;
}
}
private static final int NXM_FIELD_CODE = 107;
public static final MatchEntrySerializerKey<Nxm1Class, NxmNxCtMark> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtMark.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtMark.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxCtMark.class;
+ public MatchField getNxmField() {
+ return NxmNxCtMark.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm1Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm1Class.VALUE;
}
}
private static final int VALUE_LENGTH = 4;
private static final int NXM_FIELD_CODE = 105;
public static final MatchEntrySerializerKey<Nxm1Class, NxmNxCtState> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtState.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtState.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxCtState.class;
+ public MatchField getNxmField() {
+ return NxmNxCtState.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm1Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm1Class.VALUE;
}
}
private static final int VALUE_LENGTH = 2;
private static final int NXM_FIELD_CODE = 125;
public static final MatchEntrySerializerKey<Nxm1Class, NxmNxCtTpDst> SERIALIZER_KEY =
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtTpDst.class);
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtTpDst.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxCtTpDst.class;
+ public MatchField getNxmField() {
+ return NxmNxCtTpDst.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm1Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm1Class.VALUE;
}
}
private static final int VALUE_LENGTH = 2;
private static final int NXM_FIELD_CODE = 124;
public static final MatchEntrySerializerKey<Nxm1Class, NxmNxCtTpSrc> SERIALIZER_KEY =
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtTpSrc.class);
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtTpSrc.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxCtTpSrc.class;
+ public MatchField getNxmField() {
+ return NxmNxCtTpSrc.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm1Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm1Class.VALUE;
}
}
private static final int VALUE_LENGTH = 2;
private static final int NXM_FIELD_CODE = 106;
public static final MatchEntrySerializerKey<Nxm1Class, NxmNxCtZone> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtZone.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtZone.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxCtZone.class;
+ public MatchField getNxmField() {
+ return NxmNxCtZone.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm1Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm1Class.VALUE;
}
}
private static final int VALUE_LENGTH = 6;
private static final int NXM_FIELD_CODE = 1;
public static final MatchEntrySerializerKey<Nxm0Class, NxmOfEthDst> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthDst.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfEthDst.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmOfEthDst.class;
+ public MatchField getNxmField() {
+ return NxmOfEthDst.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm0Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm0Class.VALUE;
}
}
private static final int VALUE_LENGTH = 6;
private static final int NXM_FIELD_CODE = 2;
public static final MatchEntrySerializerKey<Nxm0Class, NxmOfEthSrc> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthSrc.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfEthSrc.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmOfEthSrc.class;
+ public MatchField getNxmField() {
+ return NxmOfEthSrc.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm0Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm0Class.VALUE;
}
}
private static final int VALUE_LENGTH = 2;
private static final int NXM_FIELD_CODE = 3;
public static final MatchEntrySerializerKey<Nxm0Class, NxmOfEthType> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthType.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfEthType.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmOfEthType.class;
+ public MatchField getNxmField() {
+ return NxmOfEthType.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm0Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm0Class.VALUE;
}
}
private static final int VALUE_LENGTH = 1;
private static final int NXM_FIELD_CODE = 13;
public static final MatchEntrySerializerKey<Nxm0Class, NxmOfIcmpType> SERIALIZER_KEY =
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfIcmpType.class);
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfIcmpType.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmOfIcmpType.class;
+ public MatchField getNxmField() {
+ return NxmOfIcmpType.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm0Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm0Class.VALUE;
}
}
private static final int NXM_FIELD_CODE = 0;
public static final MatchEntrySerializerKey<Nxm0Class, NxmOfInPort> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfInPort.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfInPort.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmOfInPort.class;
+ public MatchField getNxmField() {
+ return NxmOfInPort.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm0Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm0Class.VALUE;
}
}
private static final int VALUE_LENGTH = 4;
private static final int NXM_FIELD_CODE = 8;
public static final MatchEntrySerializerKey<Nxm0Class, NxmOfIpDst> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfIpDst.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfIpDst.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmOfIpDst.class;
+ public MatchField getNxmField() {
+ return NxmOfIpDst.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm0Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm0Class.VALUE;
}
}
private static final int VALUE_LENGTH = 4;
private static final int NXM_FIELD_CODE = 7;
public static final MatchEntrySerializerKey<Nxm0Class, NxmOfIpSrc> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfIpSrc.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfIpSrc.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmOfIpSrc.class;
+ public MatchField getNxmField() {
+ return NxmOfIpSrc.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm0Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm0Class.VALUE;
}
}
private static final int VALUE_LENGTH = 16;
private static final int NXM_FIELD_CODE = 20;
public static final MatchEntrySerializerKey<Nxm1Class, NxmOfIpDst> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmOfIpDst.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmOfIpDst.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmOfIpDst.class;
+ public MatchField getNxmField() {
+ return NxmOfIpDst.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm1Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm1Class.VALUE;
}
}
private static final int VALUE_LENGTH = 16;
private static final int NXM_FIELD_CODE = 19;
public static final MatchEntrySerializerKey<Nxm1Class, NxmOfIpSrc> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmOfIpSrc.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmOfIpSrc.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmOfIpSrc.class;
+ public MatchField getNxmField() {
+ return NxmOfIpSrc.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm1Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm1Class.VALUE;
}
}
private static final int NXM_FIELD_CODE = 2;
public static final MatchEntrySerializerKey<Nxm0Class, NxmOfMetadata> SERIALIZER_KEY =
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfMetadata.class);
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfMetadata.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmOfMetadata.class;
+ public MatchField getNxmField() {
+ return NxmOfMetadata.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm0Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm0Class.VALUE;
}
}
private static final int NXM_FIELD_CODE = 34;
public static final MatchEntrySerializerKey<Nxm0Class, NxmOfMplsLabel> SERIALIZER_KEY =
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfMplsLabel.class);
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfMplsLabel.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmOfMplsLabel.class;
+ public MatchField getNxmField() {
+ return NxmOfMplsLabel.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm0Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm0Class.VALUE;
}
}
createSerializerKey(
EncodeConstants.OF_VERSION_1_3,
NiciraConstants.NX_NSH_VENDOR_ID,
- NxmNxNshFlags.class);
+ NxmNxNshFlags.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY =
createDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxNshFlags.class;
+ public MatchField getNxmField() {
+ return NxmNxNshFlags.VALUE;
}
@Override
createSerializerKey(
EncodeConstants.OF_VERSION_1_3,
NiciraConstants.NX_NSH_VENDOR_ID,
- NxmNxNshMdtype.class);
+ NxmNxNshMdtype.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY =
createDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxNshMdtype.class;
+ public MatchField getNxmField() {
+ return NxmNxNshMdtype.VALUE;
}
}
createSerializerKey(
EncodeConstants.OF_VERSION_1_3,
NiciraConstants.NX_NSH_VENDOR_ID,
- NxmNxNshNp.class);
+ NxmNxNshNp.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY =
createDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxNshNp.class;
+ public MatchField getNxmField() {
+ return NxmNxNshNp.VALUE;
}
}
private static final int VALUE_LENGTH = Byte.BYTES;
private static final int NXM_FIELD_CODE = 10;
public static final MatchEntrySerializerKey<ExperimenterClass, NxmNxNshTtl> SERIALIZER_KEY =
- createSerializerKey(EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NxmNxNshTtl.class);
+ createSerializerKey(EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NxmNxNshTtl.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY =
createDeserializerKey(EncodeConstants.OF_VERSION_1_3, NiciraConstants.NX_NSH_VENDOR_ID, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxNshTtl.class;
+ public MatchField getNxmField() {
+ return NxmNxNshTtl.VALUE;
}
}
createSerializerKey(
EncodeConstants.OF_VERSION_1_3,
NiciraConstants.NX_NSH_VENDOR_ID,
- NxmNxNshc1.class);
+ NxmNxNshc1.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY =
createDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxNshc1.class;
+ public MatchField getNxmField() {
+ return NxmNxNshc1.VALUE;
}
}
createSerializerKey(
EncodeConstants.OF_VERSION_1_3,
NiciraConstants.NX_NSH_VENDOR_ID,
- NxmNxNshc2.class);
+ NxmNxNshc2.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY =
createDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxNshc2.class;
+ public MatchField getNxmField() {
+ return NxmNxNshc2.VALUE;
}
}
\ No newline at end of file
createSerializerKey(
EncodeConstants.OF_VERSION_1_3,
NiciraConstants.NX_NSH_VENDOR_ID,
- NxmNxNshc3.class);
+ NxmNxNshc3.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY =
createDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxNshc3.class;
+ public MatchField getNxmField() {
+ return NxmNxNshc3.VALUE;
}
}
createSerializerKey(
EncodeConstants.OF_VERSION_1_3,
NiciraConstants.NX_NSH_VENDOR_ID,
- NxmNxNshc4.class);
+ NxmNxNshc4.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY =
createDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxNshc4.class;
+ public MatchField getNxmField() {
+ return NxmNxNshc4.VALUE;
}
}
createSerializerKey(
EncodeConstants.OF_VERSION_1_3,
NiciraConstants.NX_NSH_VENDOR_ID,
- NxmNxNsi.class);
+ NxmNxNsi.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY =
createDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxNsi.class;
+ public MatchField getNxmField() {
+ return NxmNxNsi.VALUE;
}
}
createSerializerKey(
EncodeConstants.OF_VERSION_1_3,
NiciraConstants.NX_NSH_VENDOR_ID,
- NxmNxNsp.class);
+ NxmNxNsp.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY =
createDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxNsp.class;
+ public MatchField getNxmField() {
+ return NxmNxNsp.VALUE;
}
}
private static final int VALUE_LENGTH = 4;
private static final int NXM_FIELD_CODE = 33;
public static final MatchEntrySerializerKey<Nxm1Class, NxmNxPktMark> SERIALIZER_KEY =
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxPktMark.class);
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxPktMark.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxPktMark.class;
+ public MatchField getNxmField() {
+ return NxmNxPktMark.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm1Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm1Class.VALUE;
}
}
private static final int NXM_FIELD_CODE = 0;
public static final MatchEntrySerializerKey<Nxm1Class, NxmNxReg0> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg0.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg0.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxReg0.class;
+ public MatchField getNxmField() {
+ return NxmNxReg0.VALUE;
}
}
private static final int NXM_FIELD_CODE = 1;
public static final MatchEntrySerializerKey<Nxm1Class, NxmNxReg1> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg1.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg1.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxReg1.class;
+ public MatchField getNxmField() {
+ return NxmNxReg1.VALUE;
}
}
private static final int NXM_FIELD_CODE = 2;
public static final MatchEntrySerializerKey<Nxm1Class, NxmNxReg2> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg2.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg2.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxReg2.class;
+ public MatchField getNxmField() {
+ return NxmNxReg2.VALUE;
}
}
private static final int NXM_FIELD_CODE = 3;
public static final MatchEntrySerializerKey<Nxm1Class, NxmNxReg3> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg3.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg3.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxReg3.class;
+ public MatchField getNxmField() {
+ return NxmNxReg3.VALUE;
}
}
private static final int NXM_FIELD_CODE = 4;
public static final MatchEntrySerializerKey<Nxm1Class, NxmNxReg4> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg4.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg4.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxReg4.class;
+ public MatchField getNxmField() {
+ return NxmNxReg4.VALUE;
}
}
private static final int NXM_FIELD_CODE = 5;
public static final MatchEntrySerializerKey<Nxm1Class, NxmNxReg5> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg5.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg5.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxReg5.class;
+ public MatchField getNxmField() {
+ return NxmNxReg5.VALUE;
}
}
private static final int NXM_FIELD_CODE = 6;
public static final MatchEntrySerializerKey<Nxm1Class, NxmNxReg6> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg6.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg6.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxReg6.class;
+ public MatchField getNxmField() {
+ return NxmNxReg6.VALUE;
}
-
}
private static final int NXM_FIELD_CODE = 7;
public static final MatchEntrySerializerKey<Nxm1Class, NxmNxReg7> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg7.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg7.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxReg7.class;
+ public MatchField getNxmField() {
+ return NxmNxReg7.VALUE;
}
}
private static final int VALUE_LENGTH = 2;
private static final int NXM_FIELD_CODE = 10;
public static final MatchEntrySerializerKey<Nxm0Class, NxmOfTcpDst> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfTcpDst.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfTcpDst.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmOfTcpDst.class;
+ public MatchField getNxmField() {
+ return NxmOfTcpDst.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm0Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm0Class.VALUE;
}
}
private static final int VALUE_LENGTH = 2;
private static final int NXM_FIELD_CODE = 9;
public static final MatchEntrySerializerKey<Nxm0Class, NxmOfTcpSrc> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfTcpSrc.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfTcpSrc.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmOfTcpSrc.class;
+ public MatchField getNxmField() {
+ return NxmOfTcpSrc.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm0Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm0Class.VALUE;
}
}
private static final int VALUE_LENGTH = 8;
private static final int NXM_FIELD_CODE = 16;
public static final MatchEntrySerializerKey<Nxm1Class, NxmNxTunId> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunId.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxTunId.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxTunId.class;
+ public MatchField getNxmField() {
+ return NxmNxTunId.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm1Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm1Class.VALUE;
}
}
private static final int VALUE_LENGTH = 4;
private static final int NXM_FIELD_CODE = 32;
public static final MatchEntrySerializerKey<Nxm1Class, NxmNxTunIpv4Dst> SERIALIZER_KEY =
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunIpv4Dst.class);
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxTunIpv4Dst.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxTunIpv4Dst.class;
+ public MatchField getNxmField() {
+ return NxmNxTunIpv4Dst.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm1Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm1Class.VALUE;
}
}
private static final int VALUE_LENGTH = 4;
private static final int NXM_FIELD_CODE = 31;
public static final MatchEntrySerializerKey<Nxm1Class, NxmNxTunIpv4Src> SERIALIZER_KEY =
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunIpv4Src.class);
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxTunIpv4Src.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmNxTunIpv4Src.class;
+ public MatchField getNxmField() {
+ return NxmNxTunIpv4Src.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm1Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm1Class.VALUE;
}
}
private static final int VALUE_LENGTH = 2;
private static final int NXM_FIELD_CODE = 12;
public static final MatchEntrySerializerKey<Nxm0Class, NxmOfUdpDst> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfUdpDst.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfUdpDst.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmOfUdpDst.class;
+ public MatchField getNxmField() {
+ return NxmOfUdpDst.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm0Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm0Class.VALUE;
}
}
private static final int VALUE_LENGTH = 2;
private static final int NXM_FIELD_CODE = 11;
public static final MatchEntrySerializerKey<Nxm0Class, NxmOfUdpSrc> SERIALIZER_KEY = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfUdpSrc.class);
+ EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfUdpSrc.VALUE);
public static final MatchEntryDeserializerKey DESERIALIZER_KEY = new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, NXM_FIELD_CODE);
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return NxmOfUdpSrc.class;
+ public MatchField getNxmField() {
+ return NxmOfUdpSrc.VALUE;
}
@Override
- public Class<? extends OxmClassBase> getOxmClass() {
- return Nxm0Class.class;
+ public OxmClassBase getOxmClass() {
+ return Nxm0Class.VALUE;
}
}
actionSerializerKey = new NiciraActionSerializerKey(VERSION, PopVlanCase.class);
//subtype = 10
actionDeserializerKey = new NiciraActionDeserializerKey(VERSION, 10);
- matchSerializerKey = new MatchEntrySerializerKey<>(VERSION, Nxm0Class.class, MatchField.class);
+ matchSerializerKey = new MatchEntrySerializerKey<>(VERSION, Nxm0Class.VALUE, MatchField.VALUE);
//OxmClass 1, OxmField 2
matchDeserializerKey = new MatchEntryDeserializerKey(VERSION, 1, 2);
eq(new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionDecap.class)),
any(DecapCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg0.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg0.VALUE)),
any(Reg0Codec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 0)),
any(Reg0Codec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg1.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg1.VALUE)),
any(Reg1Codec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 1)),
any(Reg1Codec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg2.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg2.VALUE)),
any(Reg2Codec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 2)),
any(Reg2Codec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg3.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg3.VALUE)),
any(Reg3Codec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 3)),
any(Reg3Codec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg4.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg4.VALUE)),
any(Reg4Codec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 4)),
any(Reg4Codec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg5.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg5.VALUE)),
any(Reg5Codec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 5)),
any(Reg5Codec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg6.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg6.VALUE)),
any(Reg6Codec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 6)),
any(Reg6Codec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg7.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg7.VALUE)),
any(Reg7Codec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 7)),
any(Reg7Codec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunId.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxTunId.VALUE)),
any(TunIdCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 16)),
any(TunIdCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpOp.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfArpOp.VALUE)),
any(ArpOpCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 15)),
any(ArpOpCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxArpSha.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxArpSha.VALUE)),
any(ArpShaCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 17)),
any(ArpShaCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpSpa.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfArpSpa.VALUE)),
any(ArpSpaCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 16)),
any(ArpSpaCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxArpTha.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxArpTha.VALUE)),
any(ArpThaCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 18)),
any(ArpThaCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpTpa.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfArpTpa.VALUE)),
any(ArpTpaCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 17)),
any(ArpTpaCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthDst.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfEthDst.VALUE)),
any(EthDstCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 1)),
any(EthDstCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(
- eq(new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthSrc.class)),
+ eq(new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfEthSrc.VALUE)),
any(EthSrcCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 2)),
any(EthSrcCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthType.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfEthType.VALUE)),
any(EthTypeCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 3)),
any(EthTypeCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunIpv4Dst.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxTunIpv4Dst.VALUE)),
any(TunIpv4DstCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 32)),
any(TunIpv4DstCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunIpv4Src.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxTunIpv4Src.VALUE)),
any(TunIpv4SrcCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 31)),
any(TunIpv4SrcCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfTcpSrc.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfTcpSrc.VALUE)),
any(TcpSrcCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 9)),
any(TcpSrcCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfTcpDst.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfTcpDst.VALUE)),
any(TcpDstCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 10)),
any(TcpDstCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfUdpSrc.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfUdpSrc.VALUE)),
any(UdpSrcCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 11)),
any(UdpSrcCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfUdpDst.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfUdpDst.VALUE)),
any(UdpDstCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 12)),
any(UdpDstCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtState.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtState.VALUE)),
any(CtStateCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 105)),
any(CtStateCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtZone.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtZone.VALUE)),
any(CtZoneCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 106)),
any(CtZoneCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtMark.class)),
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtMark.VALUE)),
any(CtMarkCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 107)),
any(CtMarkCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class,
- NxmNxCtTpSrc.class)), any(CtTpSrcCodec.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE,
+ NxmNxCtTpSrc.VALUE)), any(CtTpSrcCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.NXM_1_CLASS, 124)), any(CtTpSrcCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class,
- NxmNxCtTpDst.class)), any(CtTpDstCodec.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE,
+ NxmNxCtTpDst.VALUE)), any(CtTpDstCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.NXM_1_CLASS, 125)), any(CtTpDstCodec.class));
Mockito.verify(registrator).registerMatchEntrySerializer(eq(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class,
- NxmNxPktMark.class)), any(PktMarkCodec.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE,
+ NxmNxPktMark.VALUE)), any(PktMarkCodec.class));
Mockito.verify(registrator).registerMatchEntryDeserializer(eq(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.NXM_1_CLASS, 33)), any(PktMarkCodec.class));
// experimenters
MatchEntrySerializerKey<ExperimenterClass, NxmNxNshFlags> nshFlagsSerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNshFlags.class);
+ ExperimenterClass.VALUE,
+ NxmNxNshFlags.VALUE);
nshFlagsSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).registerMatchEntrySerializer(
eq(nshFlagsSerializerKey),
any(NshFlagsCodec.class));
MatchEntrySerializerKey<ExperimenterClass, NxmNxNshMdtype> mdtypeSerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNshMdtype.class);
+ ExperimenterClass.VALUE,
+ NxmNxNshMdtype.VALUE);
mdtypeSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).registerMatchEntrySerializer(
eq(mdtypeSerializerKey),
any(NshMdtypeCodec.class));
MatchEntrySerializerKey<ExperimenterClass, NxmNxNshNp> nshNpSerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNshNp.class);
+ ExperimenterClass.VALUE,
+ NxmNxNshNp.VALUE);
nshNpSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).registerMatchEntrySerializer(
eq(nshNpSerializerKey),
any(NshNpCodec.class));
MatchEntrySerializerKey<ExperimenterClass, NxmNxNsp> nspSerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNsp.class);
+ ExperimenterClass.VALUE,
+ NxmNxNsp.VALUE);
nspSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).registerMatchEntrySerializer(
eq(nspSerializerKey),
any(NspCodec.class));
MatchEntrySerializerKey<ExperimenterClass, NxmNxNsi> nsiSerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNsi.class);
+ ExperimenterClass.VALUE,
+ NxmNxNsi.VALUE);
nsiSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).registerMatchEntrySerializer(
eq(nsiSerializerKey),
any(NsiCodec.class));
MatchEntrySerializerKey<ExperimenterClass, NxmNxNshc1> nshc1SerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNshc1.class);
+ ExperimenterClass.VALUE,
+ NxmNxNshc1.VALUE);
nshc1SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).registerMatchEntrySerializer(
eq(nshc1SerializerKey),
any(Nshc1Codec.class));
MatchEntrySerializerKey<ExperimenterClass, NxmNxNshc2> nshc2SerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNshc2.class);
+ ExperimenterClass.VALUE,
+ NxmNxNshc2.VALUE);
nshc2SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).registerMatchEntrySerializer(
eq(nshc2SerializerKey),
any(Nshc2Codec.class));
MatchEntrySerializerKey<ExperimenterClass, NxmNxNshc3> nshc3SerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNshc3.class);
+ ExperimenterClass.VALUE,
+ NxmNxNshc3.VALUE);
nshc3SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).registerMatchEntrySerializer(
eq(nshc3SerializerKey),
any(Nshc3Codec.class));
MatchEntrySerializerKey<ExperimenterClass, NxmNxNshc4> nshc4SerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNshc4.class);
+ ExperimenterClass.VALUE,
+ NxmNxNshc4.VALUE);
nshc4SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).registerMatchEntrySerializer(
eq(nshc4SerializerKey),
any(Nshc4Codec.class));
MatchEntrySerializerKey<ExperimenterClass, NxmNxNshTtl> nshTtlSerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNshTtl.class);
+ ExperimenterClass.VALUE,
+ NxmNxNshTtl.VALUE);
nshTtlSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).registerMatchEntrySerializer(
eq(nshTtlSerializerKey),
Mockito.verify(registrator).unregisterActionSerializer(
new NiciraActionSerializerKey(EncodeConstants.OF_VERSION_1_3, ActionDecNshTtl.class));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg0.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg0.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 0));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg1.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg1.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 1));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg2.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg2.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 2));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg3.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg3.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 3));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg4.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg4.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 4));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg5.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg5.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 5));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg6.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg6.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 6));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxReg7.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxReg7.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 7));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunId.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxTunId.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 16));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpOp.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfArpOp.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 15));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxArpSha.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxArpSha.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 17));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpSpa.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfArpSpa.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 16));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxArpTha.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxArpTha.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 18));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfArpTpa.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfArpTpa.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 17));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthDst.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfEthDst.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 1));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthSrc.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfEthSrc.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 2));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfEthType.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfEthType.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 3));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunIpv4Dst.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxTunIpv4Dst.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 32));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxTunIpv4Src.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxTunIpv4Src.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 31));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfTcpSrc.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfTcpSrc.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 9));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfTcpDst.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfTcpDst.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 10));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfUdpSrc.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfUdpSrc.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 11));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.class, NxmOfUdpDst.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm0Class.VALUE, NxmOfUdpDst.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_0_CLASS, 12));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtState.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtState.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 105));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtZone.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtZone.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 106));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtMark.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtMark.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 107));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtTpSrc.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtTpSrc.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 124));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxCtTpDst.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxCtTpDst.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 125));
Mockito.verify(registrator).unregisterMatchEntrySerializer(
- new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.class, NxmNxPktMark.class));
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, Nxm1Class.VALUE, NxmNxPktMark.VALUE));
Mockito.verify(registrator).unregisterMatchEntryDeserializer(
new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_3, OxmMatchConstants.NXM_1_CLASS, 33));
// experimenters
MatchEntrySerializerKey<ExperimenterClass, NxmNxNshFlags> nshFlagsSerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNshFlags.class);
+ ExperimenterClass.VALUE,
+ NxmNxNshFlags.VALUE);
nshFlagsSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).unregisterMatchEntrySerializer(nshFlagsSerializerKey);
MatchEntryDeserializerKey nshFlagsDeserializerKey = new MatchEntryDeserializerKey(
Mockito.verify(registrator).unregisterMatchEntryDeserializer(nshFlagsDeserializerKey);
MatchEntrySerializerKey<ExperimenterClass, NxmNxNshMdtype> mdtypeSerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNshMdtype.class);
+ ExperimenterClass.VALUE,
+ NxmNxNshMdtype.VALUE);
mdtypeSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).unregisterMatchEntrySerializer(mdtypeSerializerKey);
MatchEntryDeserializerKey mdtypeDeserializerKey = new MatchEntryDeserializerKey(
Mockito.verify(registrator).unregisterMatchEntryDeserializer(mdtypeDeserializerKey);
MatchEntrySerializerKey<ExperimenterClass, NxmNxNshNp> nshNpSerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNshNp.class);
+ ExperimenterClass.VALUE,
+ NxmNxNshNp.VALUE);
nshNpSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).unregisterMatchEntrySerializer(nshNpSerializerKey);
MatchEntryDeserializerKey nshNpDeserializerKey = new MatchEntryDeserializerKey(
Mockito.verify(registrator).unregisterMatchEntryDeserializer(nshNpDeserializerKey);
MatchEntrySerializerKey<ExperimenterClass, NxmNxNsp> nspSerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNsp.class);
+ ExperimenterClass.VALUE,
+ NxmNxNsp.VALUE);
nspSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).unregisterMatchEntrySerializer(nspSerializerKey);
MatchEntryDeserializerKey nspDeserializerKey = new MatchEntryDeserializerKey(
Mockito.verify(registrator).unregisterMatchEntryDeserializer(nspDeserializerKey);
MatchEntrySerializerKey<ExperimenterClass, NxmNxNsi> nsiSerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNsi.class);
+ ExperimenterClass.VALUE,
+ NxmNxNsi.VALUE);
nsiSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).unregisterMatchEntrySerializer(nsiSerializerKey);
MatchEntryDeserializerKey nsiDeserializerKey = new MatchEntryDeserializerKey(
Mockito.verify(registrator).unregisterMatchEntryDeserializer(nsiDeserializerKey);
MatchEntrySerializerKey<ExperimenterClass, NxmNxNshc1> nshc1SerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNshc1.class);
+ ExperimenterClass.VALUE,
+ NxmNxNshc1.VALUE);
nshc1SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).unregisterMatchEntrySerializer(nshc1SerializerKey);
MatchEntryDeserializerKey nshc1DeserializerKey = new MatchEntryDeserializerKey(
Mockito.verify(registrator).unregisterMatchEntryDeserializer(nshc1DeserializerKey);
MatchEntrySerializerKey<ExperimenterClass, NxmNxNshc2> nshc2SerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNshc2.class);
+ ExperimenterClass.VALUE,
+ NxmNxNshc2.VALUE);
nshc2SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).unregisterMatchEntrySerializer(nshc2SerializerKey);
MatchEntryDeserializerKey nshc2DeserializerKey = new MatchEntryDeserializerKey(
Mockito.verify(registrator).unregisterMatchEntryDeserializer(nshc2DeserializerKey);
MatchEntrySerializerKey<ExperimenterClass, NxmNxNshc3> nshc3SerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNshc3.class);
+ ExperimenterClass.VALUE,
+ NxmNxNshc3.VALUE);
nshc3SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).unregisterMatchEntrySerializer(nshc3SerializerKey);
MatchEntryDeserializerKey nshc3DeserializerKey = new MatchEntryDeserializerKey(
Mockito.verify(registrator).unregisterMatchEntryDeserializer(nshc3DeserializerKey);
MatchEntrySerializerKey<ExperimenterClass, NxmNxNshc4> nshc4SerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNshc4.class);
+ ExperimenterClass.VALUE,
+ NxmNxNshc4.VALUE);
nshc4SerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).unregisterMatchEntrySerializer(nshc1SerializerKey);
MatchEntryDeserializerKey nshc4DeserializerKey = new MatchEntryDeserializerKey(
Mockito.verify(registrator).unregisterMatchEntryDeserializer(nshc4DeserializerKey);
MatchEntrySerializerKey<ExperimenterClass, NxmNxNshTtl> nshTtlSerializerKey = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- NxmNxNshTtl.class);
+ ExperimenterClass.VALUE,
+ NxmNxNshTtl.VALUE);
nshTtlSerializerKey.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
Mockito.verify(registrator).unregisterMatchEntrySerializer(nshTtlSerializerKey);
MatchEntryDeserializerKey nshTtlDeserializerKey = new MatchEntryDeserializerKey(
import org.opendaylight.openflowjava.nx.api.NiciraConstants;
import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder;
NxActionNatBuilder nxActionNatBuilder = new NxActionNatBuilder();
nxActionNatBuilder.setFlags(Uint16.valueOf(5));
nxActionNatBuilder.setRangePresent(Uint16.valueOf(0x3F));
- nxActionNatBuilder.setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.0.0"));
- nxActionNatBuilder.setIpAddressMax(IpAddressBuilder.getDefaultInstance("192.168.10.0"));
+ nxActionNatBuilder.setIpAddressMin(new IpAddress(new Ipv4Address("192.168.0.0")));
+ nxActionNatBuilder.setIpAddressMax(new IpAddress(new Ipv4Address("192.168.10.0")));
nxActionNatBuilder.setPortMin(Uint16.valueOf(3000));
nxActionNatBuilder.setPortMax(Uint16.valueOf(4000));
NxActionNatCaseBuilder nxActionNatCaseBuilder = new NxActionNatCaseBuilder();
nxActionNatBuilder = new NxActionNatBuilder();
nxActionNatBuilder.setFlags(Uint16.valueOf(5));
nxActionNatBuilder.setRangePresent(Uint16.valueOf(0x21));
- nxActionNatBuilder.setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.0.0"));
+ nxActionNatBuilder.setIpAddressMin(new IpAddress(new Ipv4Address("192.168.0.0")));
nxActionNatBuilder.setPortMax(Uint16.valueOf(4000));
nxActionNatCaseBuilder = new NxActionNatCaseBuilder();
nxActionNatCaseBuilder.setNxActionNat(nxActionNatBuilder.build());
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowjava.nx.codec.action;
import static org.junit.Assert.assertEquals;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.UnpooledByteBufAllocator;
-import java.util.Collections;
+import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
final Action action = createAction();
MatchEntrySerializerKey<?, ?> key = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class,
- OxmMatchFieldClass.class);
+ ExperimenterClass.VALUE,
+ OxmMatchFieldClass.VALUE);
key.setExperimenterId(NiciraConstants.NX_NSH_VENDOR_ID);
when(serializerRegistry.getSerializer(key)).thenReturn(ofSerializer);
doNothing().when(ofSerializer).serialize(any(), any());
ExperimenterIdCaseBuilder expCaseBuilder = new ExperimenterIdCaseBuilder();
expCaseBuilder.setExperimenter(experimenterBuilder.build());
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmMatchField(OxmMatchFieldClass.class);
- matchEntryBuilder.setOxmClass(ExperimenterClass.class);
+ matchEntryBuilder.setOxmMatchField(OxmMatchFieldClass.VALUE);
+ matchEntryBuilder.setOxmClass(ExperimenterClass.VALUE);
matchEntryBuilder.setMatchEntryValue(expCaseBuilder.build());
NxActionRegLoad2 nxActionRegLoad2 = new NxActionRegLoad2Builder()
- .setMatchEntry(Collections.singletonList(matchEntryBuilder.build()))
+ .setMatchEntry(List.of(matchEntryBuilder.build()))
.build();
ActionRegLoad2 actionRegLoad2 = new ActionRegLoad2Builder().setNxActionRegLoad2(nxActionRegLoad2).build();
return new ActionBuilder().setActionChoice(actionRegLoad2).build();
private ByteBuf buffer;
private TestCodec testCodec;
- private class TestNxmField implements MatchField {
+ private static class TestNxmField implements MatchField {
// test class
+
+ @Override
+ public Class<? extends MatchField> implementedInterface() {
+ return TestNxmField.class;
+ }
}
- private class TestCodec extends AbstractExperimenterMatchCodec {
+ private static class TestCodec extends AbstractExperimenterMatchCodec {
@Override
protected void serializeValue(final NxExpMatchEntryValue value, final boolean hasMask,
}
@Override
- public Class<? extends MatchField> getNxmField() {
- return TestNxmField.class;
+ public MatchField getNxmField() {
+ return TestNxmField.VALUE;
}
}
MatchEntry matchEntry = testCodec.deserialize(buffer);
- assertEquals(ExperimenterClass.class, matchEntry.getOxmClass());
- assertEquals(TestNxmField.class, matchEntry.getOxmMatchField());
+ assertEquals(ExperimenterClass.VALUE, matchEntry.getOxmClass());
+ assertEquals(TestNxmField.VALUE, matchEntry.getOxmMatchField());
assertEquals(false, matchEntry.getHasMask());
Experimenter experimenter = ((ExperimenterIdCase) matchEntry.getMatchEntryValue()).getExperimenter();
assertEquals(EXPERIMENTER_ID, experimenter.getExperimenter().getValue());
MatchEntry matchEntry = testCodec.deserialize(buffer);
- assertEquals(ExperimenterClass.class, matchEntry.getOxmClass());
- assertEquals(TestNxmField.class, matchEntry.getOxmMatchField());
+ assertEquals(ExperimenterClass.VALUE, matchEntry.getOxmClass());
+ assertEquals(TestNxmField.VALUE, matchEntry.getOxmMatchField());
assertEquals(true, matchEntry.getHasMask());
Experimenter experimenter = ((ExperimenterIdCase) matchEntry.getMatchEntryValue()).getExperimenter();
assertEquals(EXPERIMENTER_ID, experimenter.getExperimenter().getValue());
static MatchEntry createMatchEntry(final NxExpMatchEntryValue value, final boolean hasMask) {
return new MatchEntryBuilder()
- .setOxmClass(ExperimenterClass.class)
- .setOxmMatchField(TestNxmField.class)
+ .setOxmClass(ExperimenterClass.VALUE)
+ .setOxmMatchField(TestNxmField.VALUE)
.setHasMask(hasMask)
.setMatchEntryValue(new ExperimenterIdCaseBuilder()
.setExperimenter(new ExperimenterBuilder()
}
@Override
- public Class<? extends MatchField> getNxmField() {
+ public MatchField getNxmField() {
return null;
}
}
final ArpOpCaseValue result = (ArpOpCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm0Class.class, input.getOxmClass());
- assertEquals(NxmOfArpOp.class, input.getOxmMatchField());
+ assertEquals(Nxm0Class.VALUE, input.getOxmClass());
+ assertEquals(NxmOfArpOp.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(2, result.getArpOpValues().getValue().shortValue());
}
final ArpOpCaseValueBuilder caseBuilder = new ArpOpCaseValueBuilder();
final ArpOpValuesBuilder valuesBuilder = new ArpOpValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm0Class.class);
- matchEntryBuilder.setOxmMatchField(NxmOfArpOp.class);
+ matchEntryBuilder.setOxmClass(Nxm0Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmOfArpOp.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint16.ONE);
final ArpShaCaseValue result = (ArpShaCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmNxArpSha.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmNxArpSha.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(RESULT_ADDRESS, result.getArpShaValues().getMacAddress());
}
final ArpShaCaseValueBuilder caseBuilder = new ArpShaCaseValueBuilder();
final ArpShaValuesBuilder valuesBuilder = new ArpShaValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmNxArpSha.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmNxArpSha.VALUE);
matchEntryBuilder.setHasMask(false);
final ArpSpaCaseValue result = (ArpSpaCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm0Class.class, input.getOxmClass());
- assertEquals(NxmOfArpSpa.class, input.getOxmMatchField());
+ assertEquals(Nxm0Class.VALUE, input.getOxmClass());
+ assertEquals(NxmOfArpSpa.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(2, result.getArpSpaValues().getValue().shortValue());
}
final ArpSpaCaseValueBuilder caseBuilder = new ArpSpaCaseValueBuilder();
final ArpSpaValuesBuilder valuesBuilder = new ArpSpaValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm0Class.class);
- matchEntryBuilder.setOxmMatchField(NxmOfArpSpa.class);
+ matchEntryBuilder.setOxmClass(Nxm0Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmOfArpSpa.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint32.ONE);
final ArpThaCaseValue result = (ArpThaCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmNxArpTha.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmNxArpTha.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(TEST_ADDRESS, result.getArpThaValues().getMacAddress());
}
final ArpThaCaseValueBuilder caseBuilder = new ArpThaCaseValueBuilder();
final ArpThaValuesBuilder valuesBuilder = new ArpThaValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmNxArpTha.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmNxArpTha.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setMacAddress(IetfYangUtil.INSTANCE.macAddressFor(new byte[VALUE_LENGTH]));
final ArpTpaCaseValue result = (ArpTpaCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm0Class.class, input.getOxmClass());
- assertEquals(NxmOfArpTpa.class, input.getOxmMatchField());
+ assertEquals(Nxm0Class.VALUE, input.getOxmClass());
+ assertEquals(NxmOfArpTpa.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(2, result.getArpTpaValues().getValue().intValue());
}
final ArpTpaCaseValueBuilder caseBuilder = new ArpTpaCaseValueBuilder();
final ArpTpaValuesBuilder valuesBuilder = new ArpTpaValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm0Class.class);
- matchEntryBuilder.setOxmMatchField(NxmOfArpTpa.class);
+ matchEntryBuilder.setOxmClass(Nxm0Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmOfArpTpa.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint32.ONE);
final CtStateCaseValue result = (CtStateCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmNxCtState.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmNxCtState.VALUE, input.getOxmMatchField());
assertEquals(true, input.getHasMask());
assertEquals(1, result.getCtStateValues().getCtState().intValue());
assertEquals(2, result.getCtStateValues().getMask().intValue());
final CtStateCaseValueBuilder caseBuilder = new CtStateCaseValueBuilder();
final CtStateValuesBuilder valuesBuilder = new CtStateValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmNxCtState.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmNxCtState.VALUE);
matchEntryBuilder.setHasMask(true);
valuesBuilder.setCtState(Uint32.ONE);
final CtTpDstCaseValue result = (CtTpDstCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmNxCtTpDst.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmNxCtTpDst.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(2, result.getCtTpDstValues().getCtTpDst().shortValue());
}
final CtTpDstCaseValueBuilder caseBuilder = new CtTpDstCaseValueBuilder();
final CtTpDstValuesBuilder valuesBuilder = new CtTpDstValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmNxCtTpDst.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmNxCtTpDst.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setCtTpDst(Uint16.ONE);
final CtTpSrcCaseValue result = (CtTpSrcCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmNxCtTpSrc.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmNxCtTpSrc.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(2, result.getCtTpSrcValues().getCtTpSrc().shortValue());
}
final CtTpSrcCaseValueBuilder caseBuilder = new CtTpSrcCaseValueBuilder();
final CtTpSrcValuesBuilder valuesBuilder = new CtTpSrcValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmNxCtTpSrc.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmNxCtTpSrc.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setCtTpSrc(Uint16.ONE);
final CtZoneCaseValue result = (CtZoneCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmNxCtZone.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmNxCtZone.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(2, result.getCtZoneValues().getCtZone().shortValue());
}
final CtZoneCaseValueBuilder caseBuilder = new CtZoneCaseValueBuilder();
final CtZoneValuesBuilder valuesBuilder = new CtZoneValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmNxCtZone.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmNxCtZone.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setCtZone(Uint16.ONE);
final EthDstCaseValue result = (EthDstCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm0Class.class, input.getOxmClass());
- assertEquals(NxmOfEthDst.class, input.getOxmMatchField());
+ assertEquals(Nxm0Class.VALUE, input.getOxmClass());
+ assertEquals(NxmOfEthDst.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(TEST_ADDRESS, result.getEthDstValues().getMacAddress());
}
final EthDstCaseValueBuilder caseBuilder = new EthDstCaseValueBuilder();
final EthDstValuesBuilder valuesBuilder = new EthDstValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm0Class.class);
- matchEntryBuilder.setOxmMatchField(NxmOfEthDst.class);
+ matchEntryBuilder.setOxmClass(Nxm0Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmOfEthDst.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setMacAddress(IetfYangUtil.INSTANCE.macAddressFor(new byte[VALUE_LENGTH]));
final EthSrcCaseValue result = (EthSrcCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm0Class.class, input.getOxmClass());
- assertEquals(NxmOfEthSrc.class, input.getOxmMatchField());
+ assertEquals(Nxm0Class.VALUE, input.getOxmClass());
+ assertEquals(NxmOfEthSrc.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(TEST_ADDRESS, result.getEthSrcValues().getMacAddress());
}
final EthSrcCaseValueBuilder caseBuilder = new EthSrcCaseValueBuilder();
final EthSrcValuesBuilder valuesBuilder = new EthSrcValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm0Class.class);
- matchEntryBuilder.setOxmMatchField(NxmOfEthDst.class);
+ matchEntryBuilder.setOxmClass(Nxm0Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmOfEthDst.VALUE);
matchEntryBuilder.setHasMask(false);
final EthTypeCaseValue result = (EthTypeCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm0Class.class, input.getOxmClass());
- assertEquals(NxmOfEthType.class, input.getOxmMatchField());
+ assertEquals(Nxm0Class.VALUE, input.getOxmClass());
+ assertEquals(NxmOfEthType.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(2, result.getEthTypeValues().getValue().shortValue());
}
final EthTypeCaseValueBuilder caseBuilder = new EthTypeCaseValueBuilder();
final EthTypeValuesBuilder valuesBuilder = new EthTypeValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm0Class.class);
- matchEntryBuilder.setOxmMatchField(NxmOfEthType.class);
+ matchEntryBuilder.setOxmClass(Nxm0Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmOfEthType.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint16.ONE);
final IcmpTypeCaseValue result = (IcmpTypeCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm0Class.class, input.getOxmClass());
- assertEquals(NxmOfIcmpType.class, input.getOxmMatchField());
+ assertEquals(Nxm0Class.VALUE, input.getOxmClass());
+ assertEquals(NxmOfIcmpType.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(2, result.getIcmpTypeValues().getValue().shortValue());
}
final IcmpTypeCaseValueBuilder caseBuilder = new IcmpTypeCaseValueBuilder();
final IcmpTypeValuesBuilder valuesBuilder = new IcmpTypeValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm0Class.class);
- matchEntryBuilder.setOxmMatchField(NxmOfIcmpType.class);
+ matchEntryBuilder.setOxmClass(Nxm0Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmOfIcmpType.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint8.ONE);
final IpDstCaseValue result = (IpDstCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm0Class.class, input.getOxmClass());
- assertEquals(NxmOfIpDst.class, input.getOxmMatchField());
+ assertEquals(Nxm0Class.VALUE, input.getOxmClass());
+ assertEquals(NxmOfIpDst.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(2, result.getIpDstValues().getValue().intValue());
}
final IpDstCaseValueBuilder caseBuilder = new IpDstCaseValueBuilder();
final IpDstValuesBuilder valuesBuilder = new IpDstValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm0Class.class);
- matchEntryBuilder.setOxmMatchField(NxmOfIpDst.class);
+ matchEntryBuilder.setOxmClass(Nxm0Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmOfIpDst.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint32.ONE);
final IpSrcCaseValue result = (IpSrcCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm0Class.class, input.getOxmClass());
- assertEquals(NxmOfIpSrc.class, input.getOxmMatchField());
+ assertEquals(Nxm0Class.VALUE, input.getOxmClass());
+ assertEquals(NxmOfIpSrc.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(2, result.getIpSrcValues().getValue().intValue());
}
final IpSrcCaseValueBuilder caseBuilder = new IpSrcCaseValueBuilder();
final IpSrcValuesBuilder valuesBuilder = new IpSrcValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm0Class.class);
- matchEntryBuilder.setOxmMatchField(NxmOfIpSrc.class);
+ matchEntryBuilder.setOxmClass(Nxm0Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmOfIpSrc.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint32.ONE);
final IpDstCaseValue result = (IpDstCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmOfIpDst.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmOfIpDst.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(2, result.getIpDstValues().getValue().intValue());
}
final IpDstCaseValueBuilder caseBuilder = new IpDstCaseValueBuilder();
final IpDstValuesBuilder valuesBuilder = new IpDstValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmOfIpDst.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmOfIpDst.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint32.ONE);
final IpSrcCaseValue result = (IpSrcCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmOfIpSrc.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmOfIpSrc.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(2, result.getIpSrcValues().getValue().intValue());
}
final IpSrcCaseValueBuilder caseBuilder = new IpSrcCaseValueBuilder();
final IpSrcValuesBuilder valuesBuilder = new IpSrcValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmOfIpSrc.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmOfIpSrc.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint32.ONE);
public void deserializeTest() {
createBuffer(buffer);
input = metadataCodec.deserialize(buffer);
- assertEquals(Nxm0Class.class, input.getOxmClass());
- assertEquals(NxmOfMetadata.class, input.getOxmMatchField());
+ assertEquals(Nxm0Class.VALUE, input.getOxmClass());
+ assertEquals(NxmOfMetadata.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
}
private static MatchEntry createMatchEntry() {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(Nxm0Class.class);
- matchEntryBuilder.setOxmMatchField(NxmOfMetadata.class);
+ matchEntryBuilder.setOxmClass(Nxm0Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmOfMetadata.VALUE);
matchEntryBuilder.setHasMask(false);
OfMetadataCaseValueBuilder caseBuilder = new OfMetadataCaseValueBuilder();
final PktMarkCaseValue result = (PktMarkCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmNxPktMark.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmNxPktMark.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(2, result.getPktMarkValues().getPktMark().intValue());
}
final PktMarkCaseValueBuilder caseBuilder = new PktMarkCaseValueBuilder();
final PktMarkValuesBuilder valuesBuilder = new PktMarkValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmNxPktMark.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmNxPktMark.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setPktMark(Uint32.ONE);
final RegCaseValue result = (RegCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmNxReg0.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmNxReg0.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(1, result.getRegValues().getValue().intValue());
}
final RegCaseValueBuilder caseBuilder = new RegCaseValueBuilder();
final RegValuesBuilder valuesBuilder = new RegValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmNxReg0.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmNxReg0.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint32.ONE);
final RegCaseValue result = (RegCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmNxReg1.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmNxReg1.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(1, result.getRegValues().getValue().intValue());
}
final RegCaseValueBuilder caseBuilder = new RegCaseValueBuilder();
final RegValuesBuilder valuesBuilder = new RegValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmNxReg1.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmNxReg1.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint32.ONE);
final RegCaseValue result = (RegCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmNxReg2.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmNxReg2.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(1, result.getRegValues().getValue().intValue());
}
final RegCaseValueBuilder caseBuilder = new RegCaseValueBuilder();
final RegValuesBuilder valuesBuilder = new RegValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmNxReg2.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmNxReg2.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint32.ONE);
final RegCaseValue result = (RegCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmNxReg3.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmNxReg3.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(1, result.getRegValues().getValue().intValue());
}
final RegCaseValueBuilder caseBuilder = new RegCaseValueBuilder();
final RegValuesBuilder valuesBuilder = new RegValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmNxReg3.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmNxReg3.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint32.ONE);
final RegCaseValue result = (RegCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmNxReg4.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmNxReg4.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(1, result.getRegValues().getValue().intValue());
}
final RegCaseValueBuilder caseBuilder = new RegCaseValueBuilder();
final RegValuesBuilder valuesBuilder = new RegValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmNxReg4.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmNxReg4.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint32.ONE);
final RegCaseValue result = (RegCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmNxReg5.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmNxReg5.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(1, result.getRegValues().getValue().intValue());
}
final RegCaseValueBuilder caseBuilder = new RegCaseValueBuilder();
final RegValuesBuilder valuesBuilder = new RegValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmNxReg5.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmNxReg5.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint32.ONE);
final RegCaseValue result = (RegCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmNxReg6.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmNxReg6.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(1, result.getRegValues().getValue().intValue());
}
final RegCaseValueBuilder caseBuilder = new RegCaseValueBuilder();
final RegValuesBuilder valuesBuilder = new RegValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmNxReg6.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmNxReg6.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint32.ONE);
final RegCaseValue result = (RegCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmNxReg7.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmNxReg7.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(1, result.getRegValues().getValue().intValue());
}
final RegCaseValueBuilder caseBuilder = new RegCaseValueBuilder();
final RegValuesBuilder valuesBuilder = new RegValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmNxReg7.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmNxReg7.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint32.ONE);
final TcpDstCaseValue result = (TcpDstCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm0Class.class, input.getOxmClass());
- assertEquals(NxmOfTcpDst.class, input.getOxmMatchField());
+ assertEquals(Nxm0Class.VALUE, input.getOxmClass());
+ assertEquals(NxmOfTcpDst.VALUE, input.getOxmMatchField());
assertEquals(true, input.getHasMask());
assertEquals(1, result.getTcpDstValues().getPort().getValue().shortValue());
assertEquals(0xffff, result.getTcpDstValues().getMask().shortValue() & 0xffff);
final TcpDstCaseValueBuilder caseBuilder = new TcpDstCaseValueBuilder();
final TcpDstValuesBuilder valuesBuilder = new TcpDstValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm0Class.class);
- matchEntryBuilder.setOxmMatchField(NxmOfTcpDst.class);
+ matchEntryBuilder.setOxmClass(Nxm0Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmOfTcpDst.VALUE);
matchEntryBuilder.setHasMask(true);
valuesBuilder.setPort(new PortNumber(Uint16.ONE));
final TcpSrcCaseValue result = (TcpSrcCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm0Class.class, input.getOxmClass());
- assertEquals(NxmOfTcpSrc.class, input.getOxmMatchField());
+ assertEquals(Nxm0Class.VALUE, input.getOxmClass());
+ assertEquals(NxmOfTcpSrc.VALUE, input.getOxmMatchField());
assertEquals(true, input.getHasMask());
assertEquals(1, result.getTcpSrcValues().getPort().getValue().shortValue());
assertEquals(0xffff, result.getTcpSrcValues().getMask().shortValue() & 0xffff);
final TcpSrcCaseValueBuilder caseBuilder = new TcpSrcCaseValueBuilder();
final TcpSrcValuesBuilder valuesBuilder = new TcpSrcValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm0Class.class);
- matchEntryBuilder.setOxmMatchField(NxmOfTcpSrc.class);
+ matchEntryBuilder.setOxmClass(Nxm0Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmOfTcpSrc.VALUE);
matchEntryBuilder.setHasMask(true);
valuesBuilder.setPort(new PortNumber(Uint16.ONE));
final TunIdCaseValue result = (TunIdCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmNxTunId.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmNxTunId.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(0, result.getTunIdValues().getValue().longValue());
}
final TunIdCaseValueBuilder caseBuilder = new TunIdCaseValueBuilder();
final TunIdValuesBuilder valuesBuilder = new TunIdValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmNxTunId.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmNxTunId.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint64.ZERO);
final TunIpv4DstCaseValue result = (TunIpv4DstCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmNxTunIpv4Dst.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmNxTunIpv4Dst.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(1, result.getTunIpv4DstValues().getValue().intValue());
}
final TunIpv4DstCaseValueBuilder caseBuilder = new TunIpv4DstCaseValueBuilder();
final TunIpv4DstValuesBuilder valuesBuilder = new TunIpv4DstValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmNxTunIpv4Dst.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmNxTunIpv4Dst.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint32.ONE);
final TunIpv4SrcCaseValue result = (TunIpv4SrcCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmNxTunIpv4Src.class, input.getOxmMatchField());
+ assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+ assertEquals(NxmNxTunIpv4Src.VALUE, input.getOxmMatchField());
assertEquals(false, input.getHasMask());
assertEquals(1, result.getTunIpv4SrcValues().getValue().intValue());
}
final TunIpv4SrcCaseValueBuilder caseBuilder = new TunIpv4SrcCaseValueBuilder();
final TunIpv4SrcValuesBuilder valuesBuilder = new TunIpv4SrcValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm1Class.class);
- matchEntryBuilder.setOxmMatchField(NxmNxTunIpv4Src.class);
+ matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmNxTunIpv4Src.VALUE);
matchEntryBuilder.setHasMask(false);
valuesBuilder.setValue(Uint32.ONE);
final UdpDstCaseValue result = (UdpDstCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm0Class.class, input.getOxmClass());
- assertEquals(NxmOfUdpDst.class, input.getOxmMatchField());
+ assertEquals(Nxm0Class.VALUE, input.getOxmClass());
+ assertEquals(NxmOfUdpDst.VALUE, input.getOxmMatchField());
assertEquals(true, input.getHasMask());
assertEquals(1, result.getUdpDstValues().getPort().getValue().shortValue());
assertEquals(0xffff, result.getUdpDstValues().getMask().shortValue() & 0xffff);
final UdpDstCaseValueBuilder caseBuilder = new UdpDstCaseValueBuilder();
final UdpDstValuesBuilder valuesBuilder = new UdpDstValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm0Class.class);
- matchEntryBuilder.setOxmMatchField(NxmOfUdpDst.class);
+ matchEntryBuilder.setOxmClass(Nxm0Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmOfUdpDst.VALUE);
matchEntryBuilder.setHasMask(true);
valuesBuilder.setPort(new PortNumber(Uint16.ONE));
final UdpSrcCaseValue result = (UdpSrcCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm0Class.class, input.getOxmClass());
- assertEquals(NxmOfUdpSrc.class, input.getOxmMatchField());
+ assertEquals(Nxm0Class.VALUE, input.getOxmClass());
+ assertEquals(NxmOfUdpSrc.VALUE, input.getOxmMatchField());
assertEquals(true, input.getHasMask());
assertEquals(1, result.getUdpSrcValues().getPort().getValue().shortValue());
assertEquals(0xffff, result.getUdpSrcValues().getMask().shortValue() & 0xffff);
final UdpSrcCaseValueBuilder caseBuilder = new UdpSrcCaseValueBuilder();
final UdpSrcValuesBuilder valuesBuilder = new UdpSrcValuesBuilder();
- matchEntryBuilder.setOxmClass(Nxm0Class.class);
- matchEntryBuilder.setOxmMatchField(NxmOfUdpSrc.class);
+ matchEntryBuilder.setOxmClass(Nxm0Class.VALUE);
+ matchEntryBuilder.setOxmMatchField(NxmOfUdpSrc.VALUE);
matchEntryBuilder.setHasMask(true);
valuesBuilder.setPort(new PortNumber(Uint16.ONE));
return new Factory<>((Class<? extends Augmentation<T>>[]) array);
}
- public static final class Builder<G extends DataObject, T extends Augmentable<T>>
- implements org.opendaylight.yangtools.concepts.Builder<AugmentationGroupingResolver<G, T>> {
+ public static final class Builder<G extends DataObject, T extends Augmentable<T>> {
private final Set<Class<? extends Augmentation<T>>> augmentations = new HashSet<>();
private final Class<G> grouping;
return this;
}
- @Override
@SuppressWarnings("unchecked")
public @NonNull AugmentationGroupingResolver<G, T> build() {
return new AugmentationGroupingResolver<>(grouping,
* @param <T> type of key
*/
public class ConverterExtensionKey<T extends ExtensionKey> extends TypeVersionKey<T> {
- public ConverterExtensionKey(final Class<T> type, final Uint8 ofVersion) {
- super(type, ofVersion);
+ @SuppressWarnings("unchecked")
+ public ConverterExtensionKey(final T type, final Uint8 ofVersion) {
+ super((Class<T>) type.implementedInterface(), ofVersion);
}
}
* @param <T> type of wrapped augmentation
*/
public class ExtensionAugment<T extends Augmentation<Extension>> extends AugmentTuple<Extension> {
+ private final ExtensionKey key;
- private final Class<? extends ExtensionKey> key;
-
- public ExtensionAugment(Class<T> augmentationClass, T augmentationObject, Class<? extends ExtensionKey> key) {
+ public ExtensionAugment(final Class<T> augmentationClass, final T augmentationObject, final ExtensionKey key) {
super(augmentationClass, augmentationObject);
this.key = key;
}
* Returns the key which represents an extension type.
* @return key
*/
- public Class<? extends ExtensionKey> getKey() {
+ public ExtensionKey getKey() {
return key;
}
}
eqGroup.add(GeneralAugMatchNodesNodeTableFlow.class);
eqGroup.add(GeneralAugMatchNotifPacketIn.class);
- ExtensionList extension1 = new ExtensionListBuilder().setExtensionKey(JoachimTheBig.class).build();
+ ExtensionList extension1 = new ExtensionListBuilder().setExtensionKey(JoachimTheBig.VALUE).build();
Match match1 = new MatchBuilder()
.addAugmentation(new GeneralAugMatchNodesNodeTableFlowBuilder()
.setExtensionList(Collections.singletonMap(extension1.key(), extension1))
org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.packet.received.MatchBuilder mb2 =
new org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service
.rev130709.packet.received.MatchBuilder();
- ExtensionList extension2 = new ExtensionListBuilder().setExtensionKey(JoachimTheTiny.class).build();
+ ExtensionList extension2 = new ExtensionListBuilder().setExtensionKey(JoachimTheTiny.VALUE).build();
org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.packet.received.Match match2 =
mb2.addAugmentation(new GeneralAugMatchNotifPacketInBuilder()
.setExtensionList(Collections.singletonMap(extension2.key(), extension2)).build()).build();
- Assert.assertEquals(JoachimTheBig.class,
+ Assert.assertEquals(JoachimTheBig.VALUE,
eqGroup.getExtension(match1).get().nonnullExtensionList().values().iterator().next().getExtensionKey());
- Assert.assertEquals(JoachimTheTiny.class,
+ Assert.assertEquals(JoachimTheTiny.VALUE,
eqGroup.getExtension(match2).get().nonnullExtensionList().values().iterator().next().getExtensionKey());
}
private interface JoachimTheBig extends ExtensionKey {
- // nobody
+ JoachimTheBig VALUE = () -> JoachimTheBig.class;
}
private interface JoachimTheTiny extends ExtensionKey {
- // nobody
+ JoachimTheTiny VALUE = () -> JoachimTheTiny.class;
}
-
}
eqGroup.add(GeneralAugMatchNodesNodeTableFlow.class);
eqGroup.add(GeneralAugMatchRpcAddFlow.class);
- ExtensionList extension1 = new ExtensionListBuilder().setExtensionKey(JoachimTheBig.class).build();
+ ExtensionList extension1 = new ExtensionListBuilder().setExtensionKey(JoachimTheBig.VALUE).build();
Match match1 = new MatchBuilder()
.addAugmentation(new GeneralAugMatchNodesNodeTableFlowBuilder()
.setExtensionList(Collections.singletonMap(extension1.key(), extension1))
.build())
.build();
- ExtensionList extension2 = new ExtensionListBuilder().setExtensionKey(JoachimTheTiny.class).build();
+ ExtensionList extension2 = new ExtensionListBuilder().setExtensionKey(JoachimTheTiny.VALUE).build();
Match match2 = new MatchBuilder()
.addAugmentation(new GeneralAugMatchNodesNodeTableFlowBuilder()
.setExtensionList(Collections.singletonMap(extension2.key(), extension2))
.build())
.build();
- Assert.assertEquals(JoachimTheBig.class,
+ Assert.assertEquals(JoachimTheBig.VALUE,
eqGroup.getExtension(match1).get().nonnullExtensionList().values().iterator().next().getExtensionKey());
- Assert.assertEquals(JoachimTheTiny.class,
+ Assert.assertEquals(JoachimTheTiny.VALUE,
eqGroup.getExtension(match2).get().nonnullExtensionList().values().iterator().next().getExtensionKey());
}
eqGroup.add(GeneralAugMatchRpcAddFlowWriteActionsSetField.class);
eqGroup.add(GeneralAugMatchNodesNodeTableFlowWriteActionsSetField.class);
- ExtensionList extension1 = new ExtensionListBuilder().setExtensionKey(ZVendorExt1.class).build();
+ ExtensionList extension1 = new ExtensionListBuilder().setExtensionKey(ZVendorExt1.VALUE).build();
SetField setField1 = new SetFieldBuilder()
.addAugmentation(new GeneralAugMatchRpcAddFlowWriteActionsSetFieldBuilder()
.setExtensionList(Collections.singletonMap(extension1.key(), extension1))
.build())
.build();
- ExtensionList extension2 = new ExtensionListBuilder().setExtensionKey(ZVendorExt2.class).build();
+ ExtensionList extension2 = new ExtensionListBuilder().setExtensionKey(ZVendorExt2.VALUE).build();
SetField setField2 = new SetFieldBuilder()
.addAugmentation(new GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder()
.setExtensionList(Collections.singletonMap(extension2.key(), extension2))
.build())
.build();
- Assert.assertEquals(ZVendorExt1.class,
+ Assert.assertEquals(ZVendorExt1.VALUE,
eqGroup.getExtension(setField1).get().nonnullExtensionList().values().iterator().next()
.getExtensionKey());
- Assert.assertEquals(ZVendorExt2.class,
+ Assert.assertEquals(ZVendorExt2.VALUE,
eqGroup.getExtension(setField2).get().nonnullExtensionList().values().iterator().next()
.getExtensionKey());
}
private interface ZVendorExt1 extends ExtensionKey {
- // nobody
+ ZVendorExt1 VALUE = () -> ZVendorExt1.class;
}
private interface ZVendorExt2 extends ExtensionKey {
- // nobody
+ ZVendorExt2 VALUE = () -> ZVendorExt2.class;
}
}
import org.slf4j.LoggerFactory;
public class EricExtensionProvider implements AutoCloseable {
-
private static final Logger LOG = LoggerFactory.getLogger(EricExtensionProvider.class);
private static final Icmpv6NDReservedConvertor ICMPV6_ND_RESERVED_CONVERTOR = new Icmpv6NDReservedConvertor();
- private static final Icmpv6NDOptionsTypeConvertor ICMPV6_ND_OPTIONS_TYPE_CONVERTOR
- = new Icmpv6NDOptionsTypeConvertor();
+ private static final Icmpv6NDOptionsTypeConvertor ICMPV6_ND_OPTIONS_TYPE_CONVERTOR =
+ new Icmpv6NDOptionsTypeConvertor();
private final ExtensionConverterRegistrator extensionConverterRegistrator;
private final List<ObjectRegistration<?>> registrations;
* Register appropriate converters.
*/
public EricExtensionProvider(final OpenFlowPluginExtensionRegistratorProvider provider) {
- this.extensionConverterRegistrator = requireNonNull(provider.getExtensionConverterRegistrator());
+ extensionConverterRegistrator = requireNonNull(provider.getExtensionConverterRegistrator());
registrations = List.of(
extensionConverterRegistrator.registerMatchConvertor(new ConverterExtensionKey<>(
- Icmpv6NdReservedKey.class, EncodeConstants.OF_VERSION_1_3), ICMPV6_ND_RESERVED_CONVERTOR),
+ Icmpv6NdReservedKey.VALUE, EncodeConstants.OF_VERSION_1_3), ICMPV6_ND_RESERVED_CONVERTOR),
extensionConverterRegistrator.registerMatchConvertor(
Icmpv6NDReservedCodec.SERIALIZER_KEY, ICMPV6_ND_RESERVED_CONVERTOR),
extensionConverterRegistrator.registerMatchConvertor(new ConverterExtensionKey<>(
- Icmpv6NdOptionsTypeKey.class, EncodeConstants.OF_VERSION_1_3), ICMPV6_ND_OPTIONS_TYPE_CONVERTOR),
+ Icmpv6NdOptionsTypeKey.VALUE, EncodeConstants.OF_VERSION_1_3), ICMPV6_ND_OPTIONS_TYPE_CONVERTOR),
extensionConverterRegistrator.registerMatchConvertor(
Icmpv6NDOptionsTypeCodec.SERIALIZER_KEY, ICMPV6_ND_OPTIONS_TYPE_CONVERTOR));
}
= (Icmpv6NdOptionsTypeCaseValue)input.getMatchEntryValue();
return resolveAugmentation(new EricOfIcmpv6NdOptionsTypeBuilder()
.setIcmpv6NdOptionsType(icmpv6NdOptionsTypeCaseValue.getIcmpv6NdOptionsTypeValues()
- .getIcmpv6NdOptionsType()).build(), path, Icmpv6NdOptionsTypeKey.class);
+ .getIcmpv6NdOptionsType()).build(), path, Icmpv6NdOptionsTypeKey.VALUE);
}
@Override
= new Icmpv6NdOptionsTypeCaseValueBuilder();
icmpv6NdOptionsTypeCaseValueBuilder.setIcmpv6NdOptionsTypeValues(new Icmpv6NdOptionsTypeValuesBuilder()
.setIcmpv6NdOptionsType(value).build());
- return MatchUtil.createDefaultMatchEntryBuilder(Icmpv6NdOptionsType.class, EricExpClass.class,
+ return MatchUtil.createDefaultMatchEntryBuilder(Icmpv6NdOptionsType.VALUE, EricExpClass.VALUE,
icmpv6NdOptionsTypeCaseValueBuilder.build()).build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(
- final EricOfIcmpv6NdOptionsType value, final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final EricOfIcmpv6NdOptionsType value, final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class,
Icmpv6NdReservedCaseValue icmpv6NdReservedCaseValue = (Icmpv6NdReservedCaseValue) input.getMatchEntryValue();
return resolveAugmentation(new EricOfIcmpv6NdReservedBuilder().setIcmpv6NdReserved(
icmpv6NdReservedCaseValue.getIcmpv6NdReservedValues().getIcmpv6NdReserved()).build(), path,
- Icmpv6NdReservedKey.class);
+ Icmpv6NdReservedKey.VALUE);
}
@Override
Icmpv6NdReservedCaseValueBuilder icmpv6NdReservedCaseValueBuilder = new Icmpv6NdReservedCaseValueBuilder();
icmpv6NdReservedCaseValueBuilder.setIcmpv6NdReservedValues(new Icmpv6NdReservedValuesBuilder()
.setIcmpv6NdReserved(value).build());
- return MatchUtil.createDefaultMatchEntryBuilder(Icmpv6NdReserved.class, EricExpClass.class,
+ return MatchUtil.createDefaultMatchEntryBuilder(Icmpv6NdReserved.VALUE, EricExpClass.VALUE,
icmpv6NdReservedCaseValueBuilder.build()).build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(
- final EricOfIcmpv6NdReserved value, final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final EricOfIcmpv6NdReserved value, final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class,
private MatchUtil() {
}
- public static MatchEntryBuilder createDefaultMatchEntryBuilder(final Class<? extends MatchField> matchField,
- final Class<? extends OxmClassBase> oxmClass,
+ public static MatchEntryBuilder createDefaultMatchEntryBuilder(final MatchField matchField,
+ final OxmClassBase oxmClass,
final MatchEntryValue matchEntryValue) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
matchEntryBuilder.setHasMask(false);
= icmpv6NDOptionsTypeConvertor.convert(matchEntry, MatchPath.PACKET_RECEIVED_MATCH);
assertEquals(10, ((EricAugMatchNotifPacketIn) extensionAugment.getAugmentationObject())
.getEricOfIcmpv6NdOptionsType().getIcmpv6NdOptionsType().intValue());
- assertEquals(extensionAugment.getKey(), Icmpv6NdOptionsTypeKey.class);
+ assertEquals(extensionAugment.getKey(), Icmpv6NdOptionsTypeKey.VALUE);
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1
= icmpv6NDOptionsTypeConvertor.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH);
assertEquals(10, ((EricAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getEricOfIcmpv6NdOptionsType() .getIcmpv6NdOptionsType().intValue());
- assertEquals(extensionAugment.getKey(), Icmpv6NdOptionsTypeKey.class);
+ assertEquals(extensionAugment.getKey(), Icmpv6NdOptionsTypeKey.VALUE);
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2
= icmpv6NDOptionsTypeConvertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
assertEquals(10, ((EricAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject())
.getEricOfIcmpv6NdOptionsType().getIcmpv6NdOptionsType().intValue());
- assertEquals(extensionAugment.getKey(), Icmpv6NdOptionsTypeKey.class);
+ assertEquals(extensionAugment.getKey(), Icmpv6NdOptionsTypeKey.VALUE);
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3
= icmpv6NDOptionsTypeConvertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH);
assertEquals(10, ((EricAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject())
.getEricOfIcmpv6NdOptionsType().getIcmpv6NdOptionsType().intValue());
- assertEquals(extensionAugment.getKey(), Icmpv6NdOptionsTypeKey.class);
+ assertEquals(extensionAugment.getKey(), Icmpv6NdOptionsTypeKey.VALUE);
}
@Test
new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class,
new EricAugMatchNodesNodeTableFlowBuilder().setEricOfIcmpv6NdOptionsType(
new EricOfIcmpv6NdOptionsTypeBuilder().setIcmpv6NdOptionsType(Uint8.ONE).build()).build(),
- Icmpv6NdOptionsTypeKey.class);
+ Icmpv6NdOptionsTypeKey.VALUE);
ExtensionListBuilder extListBld = null;
ExtensionBuilder extBld = new ExtensionBuilder();
.setExtensionList(BindingMap.of(extListBld.build())).build())
.build();
- assertEquals(Icmpv6NdOptionsTypeKey.class, eqGroup.getExtension(setField).get().nonnullExtensionList()
+ assertEquals(Icmpv6NdOptionsTypeKey.VALUE, eqGroup.getExtension(setField).get().nonnullExtensionList()
.values().iterator().next().getExtensionKey());
}
}
= icmpv6NDReservedConvertor.convert(matchEntry, MatchPath.PACKET_RECEIVED_MATCH);
assertEquals(10, ((EricAugMatchNotifPacketIn) extensionAugment.getAugmentationObject())
.getEricOfIcmpv6NdReserved().getIcmpv6NdReserved().intValue());
- assertEquals(extensionAugment.getKey(), Icmpv6NdReservedKey.class);
+ assertEquals(extensionAugment.getKey(), Icmpv6NdReservedKey.VALUE);
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1
= icmpv6NDReservedConvertor.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH);
assertEquals(10, ((EricAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getEricOfIcmpv6NdReserved().getIcmpv6NdReserved().intValue());
- assertEquals(extensionAugment.getKey(), Icmpv6NdReservedKey.class);
+ assertEquals(extensionAugment.getKey(), Icmpv6NdReservedKey.VALUE);
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2
= icmpv6NDReservedConvertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
assertEquals(10, ((EricAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject())
.getEricOfIcmpv6NdReserved().getIcmpv6NdReserved().intValue());
- assertEquals(extensionAugment.getKey(), Icmpv6NdReservedKey.class);
+ assertEquals(extensionAugment.getKey(), Icmpv6NdReservedKey.VALUE);
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3
= icmpv6NDReservedConvertor.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH);
assertEquals(10, ((EricAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject())
.getEricOfIcmpv6NdReserved().getIcmpv6NdReserved().intValue());
- assertEquals(extensionAugment.getKey(), Icmpv6NdReservedKey.class);
+ assertEquals(extensionAugment.getKey(), Icmpv6NdReservedKey.VALUE);
}
@Test
new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class,
new EricAugMatchNodesNodeTableFlowBuilder().setEricOfIcmpv6NdReserved(
new EricOfIcmpv6NdReservedBuilder().setIcmpv6NdReserved(Uint32.ONE).build()).build(),
- Icmpv6NdReservedKey.class);
+ Icmpv6NdReservedKey.VALUE);
ExtensionListBuilder extListBld = null;
ExtensionBuilder extBld = new ExtensionBuilder();
.build())
.build();
- assertEquals(Icmpv6NdReservedKey.class, eqGroup.getExtension(setField).get().nonnullExtensionList()
+ assertEquals(Icmpv6NdReservedKey.VALUE, eqGroup.getExtension(setField).get().nonnullExtensionList()
.values().iterator().next().getExtensionKey());
}
* Register appropriate converters.
*/
public NiciraExtensionProvider(final OpenFlowPluginExtensionRegistratorProvider provider) {
- this.extensionConverterRegistrator = requireNonNull(provider.getExtensionConverterRegistrator());
+ extensionConverterRegistrator = requireNonNull(provider.getExtensionConverterRegistrator());
registrations = new HashSet<>();
// src=dataStore/config
registerAction13(NxActionRegLoadNodesNodeTableFlowApplyActionsCase.class, REG_LOAD_CONVERTOR_PROXY);
NiciraUtil.createOfJavaKeyFrom(DecNshTtlCodec.SERIALIZER_KEY), DEC_NSH_TTL_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxReg0Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxReg0Key.VALUE, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxReg1Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxReg1Key.VALUE, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxReg2Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxReg2Key.VALUE, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxReg3Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxReg3Key.VALUE, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxReg4Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxReg4Key.VALUE, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxReg5Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxReg5Key.VALUE, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxReg6Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxReg6Key.VALUE, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxReg7Key.class, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxReg7Key.VALUE, EncodeConstants.OF_VERSION_1_3), REG_CONVERTOR));
registrations
.add(extensionConverterRegistrator.registerMatchConvertor(Reg0Codec.SERIALIZER_KEY, REG_CONVERTOR));
registrations
.add(extensionConverterRegistrator.registerMatchConvertor(Reg7Codec.SERIALIZER_KEY, REG_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxTunIdKey.class, EncodeConstants.OF_VERSION_1_3), TUN_ID_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxTunIdKey.VALUE, EncodeConstants.OF_VERSION_1_3), TUN_ID_CONVERTOR));
registrations
.add(extensionConverterRegistrator.registerMatchConvertor(TunIdCodec.SERIALIZER_KEY, TUN_ID_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxArpShaKey.class, EncodeConstants.OF_VERSION_1_3), ARP_SHA_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxArpShaKey.VALUE, EncodeConstants.OF_VERSION_1_3), ARP_SHA_CONVERTOR));
registrations.add(
extensionConverterRegistrator.registerMatchConvertor(ArpShaCodec.SERIALIZER_KEY, ARP_SHA_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxArpThaKey.class, EncodeConstants.OF_VERSION_1_3), ARP_THA_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxArpThaKey.VALUE, EncodeConstants.OF_VERSION_1_3), ARP_THA_CONVERTOR));
registrations.add(
extensionConverterRegistrator.registerMatchConvertor(ArpThaCodec.SERIALIZER_KEY, ARP_THA_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmOfArpOpKey.class, EncodeConstants.OF_VERSION_1_3), ARP_OP_CONVERTOR));
+ new ConverterExtensionKey<>(NxmOfArpOpKey.VALUE, EncodeConstants.OF_VERSION_1_3), ARP_OP_CONVERTOR));
registrations
.add(extensionConverterRegistrator.registerMatchConvertor(ArpOpCodec.SERIALIZER_KEY, ARP_OP_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmOfArpSpaKey.class, EncodeConstants.OF_VERSION_1_3), ARP_SPA_CONVERTOR));
+ new ConverterExtensionKey<>(NxmOfArpSpaKey.VALUE, EncodeConstants.OF_VERSION_1_3), ARP_SPA_CONVERTOR));
registrations.add(
extensionConverterRegistrator.registerMatchConvertor(ArpSpaCodec.SERIALIZER_KEY, ARP_SPA_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmOfArpTpaKey.class, EncodeConstants.OF_VERSION_1_3), ARP_TPA_CONVERTOR));
+ new ConverterExtensionKey<>(NxmOfArpTpaKey.VALUE, EncodeConstants.OF_VERSION_1_3), ARP_TPA_CONVERTOR));
registrations.add(
extensionConverterRegistrator.registerMatchConvertor(ArpTpaCodec.SERIALIZER_KEY, ARP_TPA_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmOfInPortKey.class, EncodeConstants.OF_VERSION_1_3),
+ new ConverterExtensionKey<>(NxmOfInPortKey.VALUE, EncodeConstants.OF_VERSION_1_3),
NXM_IN_PORT_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(InPortCodec.SERIALIZER_KEY,
NXM_IN_PORT_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmOfEthSrcKey.class, EncodeConstants.OF_VERSION_1_3), ETH_SRC_CONVERTOR));
+ new ConverterExtensionKey<>(NxmOfEthSrcKey.VALUE, EncodeConstants.OF_VERSION_1_3), ETH_SRC_CONVERTOR));
registrations.add(
extensionConverterRegistrator.registerMatchConvertor(EthSrcCodec.SERIALIZER_KEY, ETH_SRC_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmOfEthDstKey.class, EncodeConstants.OF_VERSION_1_3), ETH_DST_CONVERTOR));
+ new ConverterExtensionKey<>(NxmOfEthDstKey.VALUE, EncodeConstants.OF_VERSION_1_3), ETH_DST_CONVERTOR));
registrations.add(
extensionConverterRegistrator.registerMatchConvertor(EthDstCodec.SERIALIZER_KEY, ETH_DST_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmOfEthTypeKey.class, EncodeConstants.OF_VERSION_1_3),
+ new ConverterExtensionKey<>(NxmOfEthTypeKey.VALUE, EncodeConstants.OF_VERSION_1_3),
ETH_TYPE_CONVERTOR));
registrations.add(
extensionConverterRegistrator.registerMatchConvertor(EthTypeCodec.SERIALIZER_KEY, ETH_TYPE_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxNspKey.class, EncodeConstants.OF_VERSION_1_3), NSP_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxNspKey.VALUE, EncodeConstants.OF_VERSION_1_3), NSP_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(NspCodec.SERIALIZER_KEY, NSP_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxNsiKey.class, EncodeConstants.OF_VERSION_1_3), NSI_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxNsiKey.VALUE, EncodeConstants.OF_VERSION_1_3), NSI_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(NsiCodec.SERIALIZER_KEY, NSI_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxNshc1Key.class, EncodeConstants.OF_VERSION_1_3), NSC1_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxNshc1Key.VALUE, EncodeConstants.OF_VERSION_1_3), NSC1_CONVERTOR));
registrations
.add(extensionConverterRegistrator.registerMatchConvertor(Nshc1Codec.SERIALIZER_KEY, NSC1_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxNshc2Key.class, EncodeConstants.OF_VERSION_1_3), NSC2_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxNshc2Key.VALUE, EncodeConstants.OF_VERSION_1_3), NSC2_CONVERTOR));
registrations
.add(extensionConverterRegistrator.registerMatchConvertor(Nshc2Codec.SERIALIZER_KEY, NSC2_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxNshc3Key.class, EncodeConstants.OF_VERSION_1_3), NSC3_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxNshc3Key.VALUE, EncodeConstants.OF_VERSION_1_3), NSC3_CONVERTOR));
registrations
.add(extensionConverterRegistrator.registerMatchConvertor(Nshc3Codec.SERIALIZER_KEY, NSC3_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxNshc4Key.class, EncodeConstants.OF_VERSION_1_3), NSC4_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxNshc4Key.VALUE, EncodeConstants.OF_VERSION_1_3), NSC4_CONVERTOR));
registrations
.add(extensionConverterRegistrator.registerMatchConvertor(Nshc4Codec.SERIALIZER_KEY, NSC4_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxNshFlagsKey.class, EncodeConstants.OF_VERSION_1_3),
+ new ConverterExtensionKey<>(NxmNxNshFlagsKey.VALUE, EncodeConstants.OF_VERSION_1_3),
NSH_FLAGS_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(NshFlagsCodec.SERIALIZER_KEY,
NSH_FLAGS_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxNshTtlKey.class, EncodeConstants.OF_VERSION_1_3),
+ new ConverterExtensionKey<>(NxmNxNshTtlKey.VALUE, EncodeConstants.OF_VERSION_1_3),
NSH_TTL_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(NshTtlCodec.SERIALIZER_KEY,
NSH_TTL_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxTunIpv4SrcKey.class, EncodeConstants.OF_VERSION_1_3),
+ new ConverterExtensionKey<>(NxmNxTunIpv4SrcKey.VALUE, EncodeConstants.OF_VERSION_1_3),
TUN_IPV4_SRC_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(TunIpv4SrcCodec.SERIALIZER_KEY,
TUN_IPV4_SRC_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxTunIpv4DstKey.class, EncodeConstants.OF_VERSION_1_3),
+ new ConverterExtensionKey<>(NxmNxTunIpv4DstKey.VALUE, EncodeConstants.OF_VERSION_1_3),
TUN_IPV4_DST_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(TunIpv4DstCodec.SERIALIZER_KEY,
TUN_IPV4_DST_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxNshMdtypeKey.class, EncodeConstants.OF_VERSION_1_3),
+ new ConverterExtensionKey<>(NxmNxNshMdtypeKey.VALUE, EncodeConstants.OF_VERSION_1_3),
NSH_MDTYPE_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(NshMdtypeCodec.SERIALIZER_KEY,
NSH_MDTYPE_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxNshNpKey.class, EncodeConstants.OF_VERSION_1_3), NSH_NP_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxNshNpKey.VALUE, EncodeConstants.OF_VERSION_1_3), NSH_NP_CONVERTOR));
registrations.add(
extensionConverterRegistrator.registerMatchConvertor(NshNpCodec.SERIALIZER_KEY, NSH_NP_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmOfTcpSrcKey.class, EncodeConstants.OF_VERSION_1_3), TCP_SRC_CONVERTOR));
+ new ConverterExtensionKey<>(NxmOfTcpSrcKey.VALUE, EncodeConstants.OF_VERSION_1_3), TCP_SRC_CONVERTOR));
registrations.add(
extensionConverterRegistrator.registerMatchConvertor(TcpSrcCodec.SERIALIZER_KEY, TCP_SRC_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmOfTcpDstKey.class, EncodeConstants.OF_VERSION_1_3), TCP_DST_CONVERTOR));
+ new ConverterExtensionKey<>(NxmOfTcpDstKey.VALUE, EncodeConstants.OF_VERSION_1_3), TCP_DST_CONVERTOR));
registrations.add(
extensionConverterRegistrator.registerMatchConvertor(TcpDstCodec.SERIALIZER_KEY, TCP_DST_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmOfUdpSrcKey.class, EncodeConstants.OF_VERSION_1_3), UDP_SRC_CONVERTOR));
+ new ConverterExtensionKey<>(NxmOfUdpSrcKey.VALUE, EncodeConstants.OF_VERSION_1_3), UDP_SRC_CONVERTOR));
registrations.add(
extensionConverterRegistrator.registerMatchConvertor(UdpSrcCodec.SERIALIZER_KEY, UDP_SRC_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmOfUdpDstKey.class, EncodeConstants.OF_VERSION_1_3), UDP_DST_CONVERTOR));
+ new ConverterExtensionKey<>(NxmOfUdpDstKey.VALUE, EncodeConstants.OF_VERSION_1_3), UDP_DST_CONVERTOR));
registrations.add(
extensionConverterRegistrator.registerMatchConvertor(UdpDstCodec.SERIALIZER_KEY, UDP_DST_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxCtStateKey.class, EncodeConstants.OF_VERSION_1_3),
+ new ConverterExtensionKey<>(NxmNxCtStateKey.VALUE, EncodeConstants.OF_VERSION_1_3),
CT_STATE_CONVERTOR));
registrations.add(
extensionConverterRegistrator.registerMatchConvertor(CtStateCodec.SERIALIZER_KEY, CT_STATE_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxCtZoneKey.class, EncodeConstants.OF_VERSION_1_3), CT_ZONE_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxCtZoneKey.VALUE, EncodeConstants.OF_VERSION_1_3), CT_ZONE_CONVERTOR));
registrations.add(
extensionConverterRegistrator.registerMatchConvertor(CtZoneCodec.SERIALIZER_KEY, CT_ZONE_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxCtMarkKey.class, EncodeConstants.OF_VERSION_1_3), CT_MARK_CONVERTOR));
+ new ConverterExtensionKey<>(NxmNxCtMarkKey.VALUE, EncodeConstants.OF_VERSION_1_3), CT_MARK_CONVERTOR));
registrations.add(
extensionConverterRegistrator.registerMatchConvertor(CtMarkCodec.SERIALIZER_KEY, CT_MARK_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxCtTpSrcKey.class, EncodeConstants.OF_VERSION_1_3),
+ new ConverterExtensionKey<>(NxmNxCtTpSrcKey.VALUE, EncodeConstants.OF_VERSION_1_3),
CT_TP_SRC_CONVERTOR));
registrations.add(
extensionConverterRegistrator.registerMatchConvertor(CtTpSrcCodec.SERIALIZER_KEY, CT_TP_SRC_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxCtTpDstKey.class, EncodeConstants.OF_VERSION_1_3),
+ new ConverterExtensionKey<>(NxmNxCtTpDstKey.VALUE, EncodeConstants.OF_VERSION_1_3),
CT_TP_DST_CONVERTOR));
registrations.add(
extensionConverterRegistrator.registerMatchConvertor(CtTpDstCodec.SERIALIZER_KEY, CT_TP_DST_CONVERTOR));
registrations.add(extensionConverterRegistrator.registerMatchConvertor(
- new ConverterExtensionKey<>(NxmNxPktMarkKey.class, EncodeConstants.OF_VERSION_1_3),
+ new ConverterExtensionKey<>(NxmNxPktMarkKey.VALUE, EncodeConstants.OF_VERSION_1_3),
PKT_MARK_CONVERTOR));
registrations.add(
extensionConverterRegistrator.registerMatchConvertor(PktMarkCodec.SERIALIZER_KEY, PKT_MARK_CONVERTOR));
NiciraMatchCodecs.IPV6_DST_CODEC.getHeaderWithoutHasMask())
.put(new SrcNxOfMplsLabelCaseBuilder().setOfMplsLabel(Empty.value()).build(),
NiciraMatchCodecs.OXM_OF_MPLS_LABEL.getHeaderWithoutHasMask())
- .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg0.class).build(),
+ .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg0.VALUE).build(),
NiciraMatchCodecs.REG0_CODEC.getHeaderWithoutHasMask())
- .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg1.class).build(),
+ .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg1.VALUE).build(),
NiciraMatchCodecs.REG1_CODEC.getHeaderWithoutHasMask())
- .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg2.class).build(),
+ .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg2.VALUE).build(),
NiciraMatchCodecs.REG2_CODEC.getHeaderWithoutHasMask())
- .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg3.class).build(),
+ .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg3.VALUE).build(),
NiciraMatchCodecs.REG3_CODEC.getHeaderWithoutHasMask())
- .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg4.class).build(),
+ .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg4.VALUE).build(),
NiciraMatchCodecs.REG4_CODEC.getHeaderWithoutHasMask())
- .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg5.class).build(),
+ .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg5.VALUE).build(),
NiciraMatchCodecs.REG5_CODEC.getHeaderWithoutHasMask())
- .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg6.class).build(),
+ .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg6.VALUE).build(),
NiciraMatchCodecs.REG6_CODEC.getHeaderWithoutHasMask())
- .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg7.class).build(),
+ .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg7.VALUE).build(),
NiciraMatchCodecs.REG7_CODEC.getHeaderWithoutHasMask())
.build();
NiciraMatchCodecs.OXM_OF_MPLS_LABEL.getHeaderWithoutHasMask())
.put(new DstOfIcmpTypeCaseBuilder().setOfIcmpType(Empty.value()).build(),
NiciraMatchCodecs.ICMP_TYPE_CODEC.getHeaderWithoutHasMask())
- .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg0.class).build(),
+ .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg0.VALUE).build(),
NiciraMatchCodecs.REG0_CODEC.getHeaderWithoutHasMask())
- .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg1.class).build(),
+ .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg1.VALUE).build(),
NiciraMatchCodecs.REG1_CODEC.getHeaderWithoutHasMask())
- .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg2.class).build(),
+ .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg2.VALUE).build(),
NiciraMatchCodecs.REG2_CODEC.getHeaderWithoutHasMask())
- .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg3.class).build(),
+ .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg3.VALUE).build(),
NiciraMatchCodecs.REG3_CODEC.getHeaderWithoutHasMask())
- .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg4.class).build(),
+ .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg4.VALUE).build(),
NiciraMatchCodecs.REG4_CODEC.getHeaderWithoutHasMask())
- .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg5.class).build(),
+ .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg5.VALUE).build(),
NiciraMatchCodecs.REG5_CODEC.getHeaderWithoutHasMask())
- .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg6.class).build(),
+ .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg6.VALUE).build(),
NiciraMatchCodecs.REG6_CODEC.getHeaderWithoutHasMask())
- .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg7.class).build(),
+ .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg7.VALUE).build(),
NiciraMatchCodecs.REG7_CODEC.getHeaderWithoutHasMask())
.build();
}
private static NxRegLoad resolveRegLoad(final MatchEntry matchEntry) {
- Class<? extends MatchField> oxmMatchField = matchEntry.getOxmMatchField();
+ MatchField oxmMatchField = matchEntry.getOxmMatchField();
ExperimenterIdCase experimenterIdCase = (ExperimenterIdCase) matchEntry.getMatchEntryValue();
OfjAugNxExpMatch ofjAugNxExpMatch = experimenterIdCase.augmentation(OfjAugNxExpMatch.class);
NxExpMatchEntryValue nxExpMatchEntryValue = ofjAugNxExpMatch.getNxExpMatchEntryValue();
}
private static NxRegLoad resolveRegLoad(
- final Class<? extends MatchField> oxmMatchField,
+ final MatchField oxmMatchField,
final NxExpMatchEntryValue value,
final DstBuilder dstBuilder) {
- if (NxmNxNshFlags.class.equals(oxmMatchField)) {
+ if (NxmNxNshFlags.VALUE.equals(oxmMatchField)) {
int valueLength = NiciraMatchCodecs.NSH_FLAGS_CODEC.getValueLength();
dstBuilder.setDstChoice(new DstNxNshFlagsCaseBuilder().setNxNshFlags(Empty.value()).build());
NshFlagsValues nshFlagsValues = ((NshFlagsCaseValue) value).getNshFlagsValues();
return resolveRegLoad(nshFlagsValues.getNshFlags(), nshFlagsValues.getMask(), valueLength, dstBuilder);
- }
- if (NxmNxNsp.class.equals(oxmMatchField)) {
+ } else if (NxmNxNsp.VALUE.equals(oxmMatchField)) {
int valueLength = NiciraMatchCodecs.NSP_CODEC.getValueLength();
dstBuilder.setDstChoice(new DstNxNspCaseBuilder().setNxNspDst(Empty.value()).build());
NspValues nspValues = ((NspCaseValue) value).getNspValues();
return resolveRegLoad(nspValues.getNsp(), nspValues.getMask(), valueLength, dstBuilder);
- }
- if (NxmNxNsi.class.equals(oxmMatchField)) {
+ } else if (NxmNxNsi.VALUE.equals(oxmMatchField)) {
int valueLength = NiciraMatchCodecs.NSI_CODEC.getValueLength();
dstBuilder.setDstChoice(new DstNxNsiCaseBuilder().setNxNsiDst(Empty.value()).build());
NsiValues nsiValues = ((NsiCaseValue) value).getNsiValues();
return resolveRegLoad(nsiValues.getNsi(), nsiValues.getMask(), valueLength, dstBuilder);
- }
- if (NxmNxNshc1.class.equals(oxmMatchField)) {
+ } else if (NxmNxNshc1.VALUE.equals(oxmMatchField)) {
int valueLength = NiciraMatchCodecs.NSC1_CODEC.getValueLength();
dstBuilder.setDstChoice(new DstNxNshc1CaseBuilder().setNxNshc1Dst(Empty.value()).build());
NshcCaseValue nshcCaseValue = (NshcCaseValue) value;
return resolveRegLoad(nshcCaseValue.getNshc(), nshcCaseValue.getMask(), valueLength, dstBuilder);
- }
- if (NxmNxNshc2.class.equals(oxmMatchField)) {
+ } else if (NxmNxNshc2.VALUE.equals(oxmMatchField)) {
int valueLength = NiciraMatchCodecs.NSC2_CODEC.getValueLength();
dstBuilder.setDstChoice(new DstNxNshc2CaseBuilder().setNxNshc2Dst(Empty.value()).build());
NshcCaseValue nshcCaseValue = (NshcCaseValue) value;
return resolveRegLoad(nshcCaseValue.getNshc(), nshcCaseValue.getMask(), valueLength, dstBuilder);
- }
- if (NxmNxNshc3.class.equals(oxmMatchField)) {
+ } else if (NxmNxNshc3.VALUE.equals(oxmMatchField)) {
int valueLength = NiciraMatchCodecs.NSC3_CODEC.getValueLength();
dstBuilder.setDstChoice(new DstNxNshc3CaseBuilder().setNxNshc3Dst(Empty.value()).build());
NshcCaseValue nshcCaseValue = (NshcCaseValue) value;
return resolveRegLoad(nshcCaseValue.getNshc(), nshcCaseValue.getMask(), valueLength, dstBuilder);
- }
- if (NxmNxNshc4.class.equals(oxmMatchField)) {
+ } else if (NxmNxNshc4.VALUE.equals(oxmMatchField)) {
int valueLength = NiciraMatchCodecs.NSC4_CODEC.getValueLength();
dstBuilder.setDstChoice(new DstNxNshc4CaseBuilder().setNxNshc4Dst(Empty.value()).build());
NshcCaseValue nshcCaseValue = (NshcCaseValue) value;
return resolveRegLoad(nshcCaseValue.getNshc(), nshcCaseValue.getMask(), valueLength, dstBuilder);
- }
- if (NxmNxNshTtl.class.equals(oxmMatchField)) {
+ } else if (NxmNxNshTtl.VALUE.equals(oxmMatchField)) {
int valueLength = NiciraMatchCodecs.NSH_TTL_CODEC.getValueLength();
dstBuilder.setDstChoice(new DstNxNshTtlCaseBuilder().setNxNshTtl(Empty.value()).build());
NshTtlValues nshTtlValues = ((NshTtlCaseValue) value).getNshTtlValues();
public ExtensionAugment<? extends Augmentation<Extension>> convert(final MatchEntry input, final MatchPath path) {
ArpOpCase arpOpCase = (ArpOpCase) input.getMatchEntryValue();
return resolveAugmentation(new NxmOfArpOpBuilder().setValue(arpOpCase.getArpOp().getOpCode()).build(), path,
- NxmOfArpOpKey.class);
+ NxmOfArpOpKey.VALUE);
}
@Override
arpOpCaseValueBuilder.setArpOpValues(new ArpOpValuesBuilder()
.setValue(value).build());
return MatchUtil.createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx
- .match.rev140421.NxmOfArpOp.class, Nxm0Class.class, arpOpCaseValueBuilder.build()).build();
+ .match.rev140421.NxmOfArpOp.VALUE, Nxm0Class.VALUE, arpOpCaseValueBuilder.build()).build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmOfArpOp value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
public ExtensionAugment<? extends Augmentation<Extension>> convert(final MatchEntry input, final MatchPath path) {
ArpShaCaseValue arpShaCaseValue = (ArpShaCaseValue) input.getMatchEntryValue();
return resolveAugmentation(new NxmNxArpShaBuilder().setMacAddress(arpShaCaseValue.getArpShaValues()
- .getMacAddress()).build(), path, NxmNxArpShaKey.class);
+ .getMacAddress()).build(), path, NxmNxArpShaKey.VALUE);
}
@Override
arpShaCaseValueBuilder.setArpShaValues(new ArpShaValuesBuilder()
.setMacAddress(macAddress).build());
return MatchUtil.createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx
- .match.rev140421.NxmNxArpSha.class, Nxm1Class.class, arpShaCaseValueBuilder.build()).build();
+ .match.rev140421.NxmNxArpSha.VALUE, Nxm1Class.VALUE, arpShaCaseValueBuilder.build()).build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmNxArpSha value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
ArpSpaCaseValue arpSpaCaseValue = (ArpSpaCaseValue) input.getMatchEntryValue();
Ipv4Address ipv4Address = IpConverter.longToIpv4Address(arpSpaCaseValue.getArpSpaValues().getValue().toJava());
return resolveAugmentation(new NxmOfArpSpaBuilder().setIpv4Address(ipv4Address).build(), path,
- NxmOfArpSpaKey.class);
+ NxmOfArpSpaKey.VALUE);
}
@Override
throw new CodecPreconditionException(extension);
}
return MatchUtil.createDefaultMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfArpSpa.class,
- Nxm0Class.class, new ArpSpaCaseValueBuilder()
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfArpSpa.VALUE,
+ Nxm0Class.VALUE, new ArpSpaCaseValueBuilder()
.setArpSpaValues(new ArpSpaValuesBuilder()
.setValue(Uint32.valueOf(IpConverter.ipv4AddressToLong(matchGrouping.get().getNxmOfArpSpa()
.getIpv4Address())))
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmOfArpSpa value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
ArpThaCaseValue arpThaCaseValue = (ArpThaCaseValue) input.getMatchEntryValue();
return resolveAugmentation(
new NxmNxArpThaBuilder().setMacAddress(arpThaCaseValue.getArpThaValues().getMacAddress()).build(), path,
- NxmNxArpThaKey.class);
+ NxmNxArpThaKey.VALUE);
}
@Override
arpThaCaseValueBuilder.setArpThaValues(new ArpThaValuesBuilder()
.setMacAddress(macAddress).build());
return MatchUtil.createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx
- .match.rev140421.NxmNxArpTha.class, Nxm1Class.class, arpThaCaseValueBuilder.build()).build();
+ .match.rev140421.NxmNxArpTha.VALUE, Nxm1Class.VALUE, arpThaCaseValueBuilder.build()).build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmNxArpTha value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
ArpTpaCaseValue arpTpaCaseValue = (ArpTpaCaseValue) input.getMatchEntryValue();
Ipv4Address ipv4Address = IpConverter.longToIpv4Address(arpTpaCaseValue.getArpTpaValues().getValue());
return resolveAugmentation(new NxmOfArpTpaBuilder().setIpv4Address(ipv4Address).build(), path,
- NxmOfArpTpaKey.class);
+ NxmOfArpTpaKey.VALUE);
}
@Override
throw new CodecPreconditionException(extension);
}
return MatchUtil.createDefaultMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfArpTpa.class,
- Nxm0Class.class, new ArpTpaCaseValueBuilder()
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfArpTpa.VALUE,
+ Nxm0Class.VALUE, new ArpTpaCaseValueBuilder()
.setArpTpaValues(new ArpTpaValuesBuilder()
.setValue(Uint32.valueOf(
IpConverter.ipv4AddressToLong(matchGrouping.get().getNxmOfArpTpa().getIpv4Address()))).build())
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmOfArpTpa value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
NxmNxCtMarkBuilder ctMarkBuilder = new NxmNxCtMarkBuilder();
ctMarkBuilder.setCtMark(ctMarkCaseValue.getCtMarkValues().getCtMark());
ctMarkBuilder.setMask(ctMarkCaseValue.getCtMarkValues().getMask());
- return resolveAugmentation(ctMarkBuilder.build(), path,
- NxmNxCtMarkKey.class);
+ return resolveAugmentation(ctMarkBuilder.build(), path, NxmNxCtMarkKey.VALUE);
}
/*
ctMarkCaseValueBuilder.setCtMarkValues(ctMarkValuesBuilder.build());
MatchEntryBuilder ofMatch = MatchUtil
.createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn
- .opendaylight.openflowjava.nx.match.rev140421.NxmNxCtMark.class,
- Nxm1Class.class, ctMarkCaseValueBuilder.build());
+ .opendaylight.openflowjava.nx.match.rev140421.NxmNxCtMark.VALUE,
+ Nxm1Class.VALUE, ctMarkCaseValueBuilder.build());
ofMatch.setHasMask(true);
return ofMatch.build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmNxCtMark value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
NxmNxCtStateBuilder ctStateBuilder = new NxmNxCtStateBuilder();
ctStateBuilder.setCtState(ctStateCaseValue.getCtStateValues().getCtState());
ctStateBuilder.setMask(ctStateCaseValue.getCtStateValues().getMask());
- return resolveAugmentation(ctStateBuilder.build(), path,
- NxmNxCtStateKey.class);
+ return resolveAugmentation(ctStateBuilder.build(), path, NxmNxCtStateKey.VALUE);
}
@Override
ctStateValuesBuilder.setMask(matchGrouping.get().getNxmNxCtState().getMask());
ctStateCaseValueBuilder.setCtStateValues(ctStateValuesBuilder.build());
MatchEntryBuilder ofMatch = MatchUtil.createDefaultMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxCtState.class,
- Nxm1Class.class, ctStateCaseValueBuilder.build());
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxCtState.VALUE,
+ Nxm1Class.VALUE, ctStateCaseValueBuilder.build());
ofMatch.setHasMask(true);
return ofMatch.build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmNxCtState value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
ctTpDstCaseValueBuilder.setCtTpDstValues(ctTpDstValuesBuilder.build());
MatchEntryBuilder ofMatch = MatchUtil
.createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn
- .opendaylight.openflowjava.nx.match.rev140421.NxmNxCtTpSrc.class,
- Nxm1Class.class, ctTpDstCaseValueBuilder.build());
+ .opendaylight.openflowjava.nx.match.rev140421.NxmNxCtTpSrc.VALUE,
+ Nxm1Class.VALUE, ctTpDstCaseValueBuilder.build());
return ofMatch.build();
}
CtTpDstCaseValue ctTpSrcCaseValue = (CtTpDstCaseValue) input.getMatchEntryValue();
NxmNxCtTpDstBuilder ctTpSrcBuilder = new NxmNxCtTpDstBuilder();
ctTpSrcBuilder.setCtTpDst(ctTpSrcCaseValue.getCtTpDstValues().getCtTpDst());
- return resolveAugmentation(ctTpSrcBuilder.build(), path,
- NxmNxCtTpDstKey.class);
+ return resolveAugmentation(ctTpSrcBuilder.build(), path, NxmNxCtTpDstKey.VALUE);
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmNxCtTpDst value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
ctTpSrcCaseValueBuilder.setCtTpSrcValues(ctTpSrcValuesBuilder.build());
MatchEntryBuilder ofMatch = MatchUtil
.createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn
- .opendaylight.openflowjava.nx.match.rev140421.NxmNxCtTpSrc.class,
- Nxm1Class.class, ctTpSrcCaseValueBuilder.build());
+ .opendaylight.openflowjava.nx.match.rev140421.NxmNxCtTpSrc.VALUE,
+ Nxm1Class.VALUE, ctTpSrcCaseValueBuilder.build());
return ofMatch.build();
}
CtTpSrcCaseValue ctTpSrcCaseValue = (CtTpSrcCaseValue) input.getMatchEntryValue();
NxmNxCtTpSrcBuilder ctTpSrcBuilder = new NxmNxCtTpSrcBuilder();
ctTpSrcBuilder.setCtTpSrc(ctTpSrcCaseValue.getCtTpSrcValues().getCtTpSrc());
- return resolveAugmentation(ctTpSrcBuilder.build(), path,
- NxmNxCtTpSrcKey.class);
+ return resolveAugmentation(ctTpSrcBuilder.build(), path, NxmNxCtTpSrcKey.VALUE);
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmNxCtTpSrc value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
CtZoneCaseValue ctZoneCaseValue = (CtZoneCaseValue) input.getMatchEntryValue();
NxmNxCtZoneBuilder ctZoneBuilder = new NxmNxCtZoneBuilder();
ctZoneBuilder.setCtZone(ctZoneCaseValue.getCtZoneValues().getCtZone());
- return resolveAugmentation(ctZoneBuilder.build(), path,
- NxmNxCtZoneKey.class);
+ return resolveAugmentation(ctZoneBuilder.build(), path, NxmNxCtZoneKey.VALUE);
}
@Override
ctZoneCaseValueBuilder.setCtZoneValues(ctZoneValuesBuilder.build());
MatchEntryBuilder ofMatch = MatchUtil
.createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn
- .opendaylight.openflowjava.nx.match.rev140421.NxmNxCtZone.class,
- Nxm1Class.class, ctZoneCaseValueBuilder.build());
+ .opendaylight.openflowjava.nx.match.rev140421.NxmNxCtZone.VALUE,
+ Nxm1Class.VALUE, ctZoneCaseValueBuilder.build());
return ofMatch.build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmNxCtZone value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
EthDstCaseValue ethDstCaseValue = (EthDstCaseValue) input.getMatchEntryValue();
return resolveAugmentation(
new NxmOfEthDstBuilder().setMacAddress(ethDstCaseValue.getEthDstValues().getMacAddress()).build(), path,
- NxmOfEthDstKey.class);
+ NxmOfEthDstKey.VALUE);
}
@Override
ethDstCaseValueBuilder.setEthDstValues(new EthDstValuesBuilder()
.setMacAddress(macAddress).build());
return MatchUtil.createDefaultMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthDst.class,
- Nxm0Class.class, ethDstCaseValueBuilder.build()).build();
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthDst.VALUE,
+ Nxm0Class.VALUE, ethDstCaseValueBuilder.build()).build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmOfEthDst value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
EthSrcCaseValue ethSrcCaseValue = (EthSrcCaseValue) input.getMatchEntryValue();
return resolveAugmentation(
new NxmOfEthSrcBuilder().setMacAddress(ethSrcCaseValue.getEthSrcValues().getMacAddress()).build(), path,
- NxmOfEthSrcKey.class);
+ NxmOfEthSrcKey.VALUE);
}
@Override
ethSrcCaseValueBuilder.setEthSrcValues(new EthSrcValuesBuilder()
.setMacAddress(macAddress).build());
return MatchUtil.createDefaultMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthSrc.class,
- Nxm0Class.class, ethSrcCaseValueBuilder.build()).build();
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthSrc.VALUE,
+ Nxm0Class.VALUE, ethSrcCaseValueBuilder.build()).build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmOfEthSrc value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
EthTypeCaseValue ethTypeCaseValue = (EthTypeCaseValue) input.getMatchEntryValue();
return resolveAugmentation(
new NxmOfEthTypeBuilder().setValue(ethTypeCaseValue.getEthTypeValues().getValue()).build(), path,
- NxmOfEthTypeKey.class);
+ NxmOfEthTypeKey.VALUE);
}
@Override
ethTypeCaseValueBuilder.setEthTypeValues(new EthTypeValuesBuilder()
.setValue(value).build());
return MatchUtil.createDefaultMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthType.class,
- Nxm0Class.class, ethTypeCaseValueBuilder.build()).build();
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthType.VALUE,
+ Nxm0Class.VALUE, ethTypeCaseValueBuilder.build()).build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmOfEthType value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
// Hidden on purpose
}
- public static MatchEntryBuilder createDefaultMatchEntryBuilder(final Class<? extends MatchField> matchField,
- final Class<? extends OxmClassBase> oxmClass,
+ public static MatchEntryBuilder createDefaultMatchEntryBuilder(final MatchField matchField,
+ final OxmClassBase oxmClass,
final MatchEntryValue matchEntryValue) {
return new MatchEntryBuilder()
.setHasMask(false)
}
public static <V extends Augmentation<ExperimenterIdCase>> MatchEntryBuilder createExperimenterMatchEntryBuilder(
- final Class<? extends MatchField> matchField,
+ final MatchField matchField,
final Uint32 experimenterId,
final NxExpMatchEntryValue value) {
- return createDefaultMatchEntryBuilder(matchField, ExperimenterClass.class, new ExperimenterIdCaseBuilder()
+ return createDefaultMatchEntryBuilder(matchField, ExperimenterClass.VALUE, new ExperimenterIdCaseBuilder()
.setExperimenter(new ExperimenterBuilder().setExperimenter(new ExperimenterId(experimenterId)).build())
.addAugmentation(new OfjAugNxExpMatchBuilder().setNxExpMatchEntryValue(value).build())
.build());
return resolveAugmentation(
nxmNxNshFlags,
path,
- NxmNxNshFlagsKey.class);
+ NxmNxNshFlagsKey.VALUE);
}
@Override
NshFlagsValues nshFlagsValues = new NshFlagsValuesBuilder().setNshFlags(flags).setMask(mask).build();
NxExpMatchEntryValue value = new NshFlagsCaseValueBuilder().setNshFlagsValues(nshFlagsValues).build();
return MatchUtil.createExperimenterMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshFlags.class,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshFlags.VALUE,
NiciraConstants.NX_NSH_VENDOR_ID,
value).setHasMask(mask != null).build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(
final NxmNxNshFlags value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
return resolveAugmentation(
nxmNxNshMdtype,
path,
- NxmNxNshMdtypeKey.class);
+ NxmNxNshMdtypeKey.VALUE);
}
@Override
NshMdtypeValues nshMdtypeValues = new NshMdtypeValuesBuilder().setValue(value).build();
NxExpMatchEntryValue entryValue = new NshMdtypeCaseValueBuilder().setNshMdtypeValues(nshMdtypeValues).build();
return MatchUtil.createExperimenterMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshMdtype.class,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshMdtype.VALUE,
NiciraConstants.NX_NSH_VENDOR_ID,
entryValue).setHasMask(mask != null).build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(
final NxmNxNshMdtype value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
return resolveAugmentation(
nxmNxNshNp,
path,
- NxmNxNshNpKey.class);
+ NxmNxNshNpKey.VALUE);
}
@Override
NshNpValues nshNpValues = new NshNpValuesBuilder().setValue(value).build();
NxExpMatchEntryValue entryValue = new NshNpCaseValueBuilder().setNshNpValues(nshNpValues).build();
return MatchUtil.createExperimenterMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshNp.class,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshNp.VALUE,
NiciraConstants.NX_NSH_VENDOR_ID,
entryValue).setHasMask(mask != null).build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(
- final NxmNxNshNp value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final NxmNxNshNp value, final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
return resolveAugmentation(
nxmNxNshTtl,
path,
- NxmNxNshTtlKey.class);
+ NxmNxNshTtlKey.VALUE);
}
@Override
NshTtlValues nshTtlValues = new NshTtlValuesBuilder().setNshTtl(flags).setMask(mask).build();
NxExpMatchEntryValue value = new NshTtlCaseValueBuilder().setNshTtlValues(nshTtlValues).build();
return MatchUtil.createExperimenterMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshTtl.class,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshTtl.VALUE,
NiciraConstants.NX_NSH_VENDOR_ID,
value).setHasMask(mask != null).build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(
- final NxmNxNshTtl value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final NxmNxNshTtl value, final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
.setValue(nshcCaseValue.getNshc())
.setMask(nshcCaseValue.getMask())
.build();
- return resolveAugmentation(nxmNxNshc1, path, NxmNxNshc1Key.class);
+ return resolveAugmentation(nxmNxNshc1, path, NxmNxNshc1Key.VALUE);
}
@Override
public static MatchEntry buildMatchEntry(final Uint32 value, final Uint32 mask) {
NshcCaseValue nshcCaseValue = new NshcCaseValueBuilder().setNshc(value).setMask(mask).build();
return MatchUtil.createExperimenterMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshc1.class,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshc1.VALUE,
NiciraConstants.NX_NSH_VENDOR_ID,
nshcCaseValue).setHasMask(mask != null).build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(
- final NxmNxNshc1 value, final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final NxmNxNshc1 value, final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
.setValue(nshcCaseValue.getNshc())
.setMask(nshcCaseValue.getMask())
.build();
- return resolveAugmentation(nxmNxNshc2, path, NxmNxNshc2Key.class);
+ return resolveAugmentation(nxmNxNshc2, path, NxmNxNshc2Key.VALUE);
}
@Override
public static MatchEntry buildMatchEntry(final Uint32 value, final Uint32 mask) {
NshcCaseValue nshcCaseValue = new NshcCaseValueBuilder().setNshc(value).setMask(mask).build();
return MatchUtil.createExperimenterMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshc2.class,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshc2.VALUE,
NiciraConstants.NX_NSH_VENDOR_ID,
nshcCaseValue).setHasMask(mask != null).build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(
- final NxmNxNshc2 value, final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final NxmNxNshc2 value, final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
.setValue(nshcCaseValue.getNshc())
.setMask(nshcCaseValue.getMask())
.build();
- return resolveAugmentation(nxmNxNshc3, path, NxmNxNshc3Key.class);
+ return resolveAugmentation(nxmNxNshc3, path, NxmNxNshc3Key.VALUE);
}
@Override
public static MatchEntry buildMatchEntry(final Uint32 value, final Uint32 mask) {
NshcCaseValue nshcCaseValue = new NshcCaseValueBuilder().setNshc(value).setMask(mask).build();
return MatchUtil.createExperimenterMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshc3.class,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshc3.VALUE,
NiciraConstants.NX_NSH_VENDOR_ID,
nshcCaseValue).setHasMask(mask != null).build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(
final NxmNxNshc3 value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
.setValue(nshcCaseValue.getNshc())
.setMask(nshcCaseValue.getMask())
.build();
- return resolveAugmentation(nxmNxNshc4, path, NxmNxNshc4Key.class);
+ return resolveAugmentation(nxmNxNshc4, path, NxmNxNshc4Key.VALUE);
}
@Override
public static MatchEntry buildMatchEntry(final Uint32 value, final Uint32 mask) {
NshcCaseValue nshcCaseValue = new NshcCaseValueBuilder().setNshc(value).setMask(mask).build();
return MatchUtil.createExperimenterMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshc4.class,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNshc4.VALUE,
NiciraConstants.NX_NSH_VENDOR_ID,
nshcCaseValue).setHasMask(mask != null).build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(
final NxmNxNshc4 value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
return resolveAugmentation(
new NxmNxNsiBuilder().setNsi(nshNsiCaseValue.getNsiValues().getNsi()).build(),
path,
- NxmNxNsiKey.class);
+ NxmNxNsiKey.VALUE);
}
@Override
NsiValues nsiValues = new NsiValuesBuilder().setNsi(nsi).setMask(mask).build();
NsiCaseValue nsiCaseValue = new NsiCaseValueBuilder().setNsiValues(nsiValues).build();
return MatchUtil.createExperimenterMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNsi.class,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNsi.VALUE,
NiciraConstants.NX_NSH_VENDOR_ID,
nsiCaseValue).setHasMask(mask != null).build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmNxNsi value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
return resolveAugmentation(
new NxmNxNspBuilder().setValue(nshNspCaseValue.getNspValues().getNsp()).build(),
path,
- NxmNxNspKey.class);
+ NxmNxNspKey.VALUE);
}
@Override
NspValues nspValues = new NspValuesBuilder().setNsp(nsp).setMask(mask).build();
NspCaseValue nspCaseValue = new NspCaseValueBuilder().setNspValues(nspValues).build();
return MatchUtil.createExperimenterMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNsp.class,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxNsp.VALUE,
NiciraConstants.NX_NSH_VENDOR_ID,
nspCaseValue).setHasMask(mask != null).build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmNxNsp value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
.getMatchEntryValue();
return NxmInPortConvertor.resolveAugmentation(new OfInPortBuilder()
.setValue(inPortCaseValue.getNxmOfInPortValues().getValue())
- .build(), path, NxmOfInPortKey.class);
+ .build(), path, NxmOfInPortKey.VALUE);
}
@Override
inPortCaseValueBuilder.setNxmOfInPortValues(
new NxmOfInPortValuesBuilder().setValue(value).build());
return MatchUtil.createDefaultMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfInPort.class,
- Nxm0Class.class, inPortCaseValueBuilder.build())
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfInPort.VALUE,
+ Nxm0Class.VALUE, inPortCaseValueBuilder.build())
.build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(
final org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.of
- .in.port.grouping.OfInPort value, final MatchPath path, final Class<? extends ExtensionKey> key) {
+ .in.port.grouping.OfInPort value, final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
pktMarkCaseValueBuilder.setPktMarkValues(pktMarkValuesBuilder.build());
MatchEntryBuilder ofMatch = MatchUtil
.createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn
- .opendaylight.openflowjava.nx.match.rev140421.NxmNxPktMark.class,
- Nxm1Class.class, pktMarkCaseValueBuilder.build());
+ .opendaylight.openflowjava.nx.match.rev140421.NxmNxPktMark.VALUE,
+ Nxm1Class.VALUE, pktMarkCaseValueBuilder.build());
return ofMatch.build();
}
NxmNxPktMarkBuilder pktMarkBuilder = new NxmNxPktMarkBuilder();
pktMarkBuilder.setPktMark(pktMarkCaseValue.getPktMarkValues().getPktMark());
pktMarkBuilder.setMask(pktMarkCaseValue.getPktMarkValues().getMask());
- return resolveAugmentation(pktMarkBuilder.build(), path,
- NxmNxPktMarkKey.class);
+ return resolveAugmentation(pktMarkBuilder.build(), path, NxmNxPktMarkKey.VALUE);
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmNxPktMark value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
@Override
public ExtensionAugment<? extends Augmentation<Extension>> convert(final MatchEntry input, final MatchPath path) {
NxmNxRegBuilder nxRegBuilder = new NxmNxRegBuilder();
- if (!org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg.class
- .isAssignableFrom(input.getOxmMatchField())) {
+ if (!(input.getOxmMatchField()
+ instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg)) {
String msg = input.getOxmMatchField()
+ " does not implement "
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg.class;
LOG.warn("Warning {}",msg);
throw new IllegalStateException(msg);
}
- nxRegBuilder.setReg((Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match
- .rev140421.NxmNxReg>) input.getOxmMatchField());
+ nxRegBuilder.setReg((org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg)
+ input.getOxmMatchField());
RegCaseValue regCaseValue = (RegCaseValue) input.getMatchEntryValue();
nxRegBuilder.setValue(regCaseValue.getRegValues().getValue());
RegCaseValueBuilder regCaseValueBuilder = new RegCaseValueBuilder();
regCaseValueBuilder.setRegValues(regValuesBuilder.build());
return MatchUtil.createDefaultMatchEntryBuilder(nxmNxReg.getReg(),
- Nxm1Class.class,
+ Nxm1Class.VALUE,
regCaseValueBuilder.build())
.setHasMask(nxmNxReg.getMask() != null)
.build();
}
- private static Class<? extends ExtensionKey> resolveRegKey(final Class<? extends MatchField> oxmMatchField) {
- if (NiciraMatchCodecs.REG0_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) {
- return NxmNxReg0Key.class;
+ private static ExtensionKey resolveRegKey(final MatchField oxmMatchField) {
+ // FIXME: Use direct field value equalitity
+ if (NiciraMatchCodecs.REG0_CODEC.getNxmField().equals(oxmMatchField)) {
+ return NxmNxReg0Key.VALUE;
}
- if (NiciraMatchCodecs.REG1_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) {
- return NxmNxReg1Key.class;
+ if (NiciraMatchCodecs.REG1_CODEC.getNxmField().equals(oxmMatchField)) {
+ return NxmNxReg1Key.VALUE;
}
- if (NiciraMatchCodecs.REG2_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) {
- return NxmNxReg2Key.class;
+ if (NiciraMatchCodecs.REG2_CODEC.getNxmField().equals(oxmMatchField)) {
+ return NxmNxReg2Key.VALUE;
}
- if (NiciraMatchCodecs.REG3_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) {
- return NxmNxReg3Key.class;
+ if (NiciraMatchCodecs.REG3_CODEC.getNxmField().equals(oxmMatchField)) {
+ return NxmNxReg3Key.VALUE;
}
- if (NiciraMatchCodecs.REG4_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) {
- return NxmNxReg4Key.class;
+ if (NiciraMatchCodecs.REG4_CODEC.getNxmField().equals(oxmMatchField)) {
+ return NxmNxReg4Key.VALUE;
}
- if (NiciraMatchCodecs.REG5_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) {
- return NxmNxReg5Key.class;
+ if (NiciraMatchCodecs.REG5_CODEC.getNxmField().equals(oxmMatchField)) {
+ return NxmNxReg5Key.VALUE;
}
- if (NiciraMatchCodecs.REG6_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) {
- return NxmNxReg6Key.class;
+ if (NiciraMatchCodecs.REG6_CODEC.getNxmField().equals(oxmMatchField)) {
+ return NxmNxReg6Key.VALUE;
}
- if (NiciraMatchCodecs.REG7_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) {
- return NxmNxReg7Key.class;
+ if (NiciraMatchCodecs.REG7_CODEC.getNxmField().equals(oxmMatchField)) {
+ return NxmNxReg7Key.VALUE;
}
throw new CodecPreconditionException("There is no key for " + oxmMatchField);
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmNxReg nxmNxReg,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
NxmOfTcpDstBuilder tcpDstBuilder = new NxmOfTcpDstBuilder();
tcpDstBuilder.setPort(tcpDstCaseValue.getTcpDstValues().getPort());
tcpDstBuilder.setMask(tcpDstCaseValue.getTcpDstValues().getMask());
- return resolveAugmentation(tcpDstBuilder.build(), path,
- NxmOfTcpDstKey.class);
+ return resolveAugmentation(tcpDstBuilder.build(), path, NxmOfTcpDstKey.VALUE);
}
@Override
tcpDstCaseValueBuilder.setTcpDstValues(tcpDstValuesBuilder.build());
MatchEntryBuilder ofMatch = MatchUtil
.createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn
- .opendaylight.openflowjava.nx.match.rev140421.NxmOfTcpDst.class,
- Nxm0Class.class, tcpDstCaseValueBuilder.build());
+ .opendaylight.openflowjava.nx.match.rev140421.NxmOfTcpDst.VALUE,
+ Nxm0Class.VALUE, tcpDstCaseValueBuilder.build());
ofMatch.setHasMask(true);
return ofMatch.build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmOfTcpDst value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
NxmOfTcpSrcBuilder tcpSrcBuilder = new NxmOfTcpSrcBuilder();
tcpSrcBuilder.setPort(tcpSrcCaseValue.getTcpSrcValues().getPort());
tcpSrcBuilder.setMask(tcpSrcCaseValue.getTcpSrcValues().getMask());
- return resolveAugmentation(tcpSrcBuilder.build(), path, NxmOfTcpSrcKey.class);
+ return resolveAugmentation(tcpSrcBuilder.build(), path, NxmOfTcpSrcKey.VALUE);
}
@Override
tcpSrcCaseValueBuilder.setTcpSrcValues(tcpSrcValuesBuilder.build());
MatchEntryBuilder ofMatch = MatchUtil
.createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn
- .opendaylight.openflowjava.nx.match.rev140421.NxmOfTcpSrc.class,
- Nxm0Class.class, tcpSrcCaseValueBuilder.build());
+ .opendaylight.openflowjava.nx.match.rev140421.NxmOfTcpSrc.VALUE,
+ Nxm0Class.VALUE, tcpSrcCaseValueBuilder.build());
ofMatch.setHasMask(true);
return ofMatch.build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmOfTcpSrc value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
public class TunIPv4DstConvertor implements ConvertorToOFJava<MatchEntry>, ConvertorFromOFJava<MatchEntry, MatchPath> {
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmNxTunIpv4Dst value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
TunIpv4DstCaseValue tunIpv4DstCaseValue = (TunIpv4DstCaseValue) input.getMatchEntryValue();
return resolveAugmentation(new NxmNxTunIpv4DstBuilder()
.setIpv4Address(MatchUtil.uint32ToIpv4Address(tunIpv4DstCaseValue.getTunIpv4DstValues().getValue()))
- .build(), path, NxmNxTunIpv4DstKey.class);
+ .build(), path, NxmNxTunIpv4DstKey.VALUE);
}
@Override
.getNxmNxTunIpv4Dst().getIpv4Address();
return MatchUtil.createDefaultMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxTunIpv4Dst.class,
- Nxm1Class.class, new TunIpv4DstCaseValueBuilder()
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxTunIpv4Dst.VALUE,
+ Nxm1Class.VALUE, new TunIpv4DstCaseValueBuilder()
.setTunIpv4DstValues(new TunIpv4DstValuesBuilder()
.setValue(MatchUtil.ipv4ToUint32(value))
.build())
public class TunIPv4SrcConvertor implements ConvertorToOFJava<MatchEntry>, ConvertorFromOFJava<MatchEntry, MatchPath> {
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmNxTunIpv4Src value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
TunIpv4SrcCaseValue tunIpv4SrcCaseValue = (TunIpv4SrcCaseValue) input.getMatchEntryValue();
return resolveAugmentation(new NxmNxTunIpv4SrcBuilder()
.setIpv4Address(MatchUtil.uint32ToIpv4Address(tunIpv4SrcCaseValue.getTunIpv4SrcValues().getValue()))
- .build(), path, NxmNxTunIpv4SrcKey.class);
+ .build(), path, NxmNxTunIpv4SrcKey.VALUE);
}
@Override
.getNxmNxTunIpv4Src().getIpv4Address();
return MatchUtil.createDefaultMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxTunIpv4Src.class,
- Nxm1Class.class, new TunIpv4SrcCaseValueBuilder()
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxTunIpv4Src.VALUE,
+ Nxm1Class.VALUE, new TunIpv4SrcCaseValueBuilder()
.setTunIpv4SrcValues(new TunIpv4SrcValuesBuilder()
.setValue(MatchUtil.ipv4ToUint32(value))
.build())
public ExtensionAugment<? extends Augmentation<Extension>> convert(final MatchEntry input, final MatchPath path) {
TunIdCaseValue tunnelIdCase = (TunIdCaseValue) input.getMatchEntryValue();
return resolveAugmentation(new NxmNxTunIdBuilder().setValue(tunnelIdCase.getTunIdValues().getValue()).build(),
- path, NxmNxTunIdKey.class);
+ path, NxmNxTunIdKey.VALUE);
}
@Override
tunnelIdCaseBuilder.setTunIdValues(tunnelIdBuilder.build());
return MatchUtil.createDefaultMatchEntryBuilder(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxTunId.class,
- Nxm1Class.class, tunnelIdCaseBuilder.build()).build();
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxTunId.VALUE,
+ Nxm1Class.VALUE, tunnelIdCaseBuilder.build()).build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmNxTunId value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
NxmOfUdpDstBuilder udpDstBuilder = new NxmOfUdpDstBuilder();
udpDstBuilder.setPort(udpDstCaseValue.getUdpDstValues().getPort());
udpDstBuilder.setMask(udpDstCaseValue.getUdpDstValues().getMask());
- return resolveAugmentation(udpDstBuilder.build(), path,
- NxmOfUdpDstKey.class);
+ return resolveAugmentation(udpDstBuilder.build(), path, NxmOfUdpDstKey.VALUE);
}
@Override
udpDstCaseValueBuilder.setUdpDstValues(udpDstValuesBuilder.build());
MatchEntryBuilder ofMatch = MatchUtil
.createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn.opendaylight
- .openflowjava.nx.match.rev140421.NxmOfUdpDst.class,
- Nxm0Class.class,udpDstCaseValueBuilder.build());
+ .openflowjava.nx.match.rev140421.NxmOfUdpDst.VALUE,
+ Nxm0Class.VALUE, udpDstCaseValueBuilder.build());
ofMatch.setHasMask(true);
return ofMatch.build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmOfUdpDst value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
NxmOfUdpSrcBuilder udpSrcBuilder = new NxmOfUdpSrcBuilder();
udpSrcBuilder.setPort(udpSrcCaseValue.getUdpSrcValues().getPort());
udpSrcBuilder.setMask(udpSrcCaseValue.getUdpSrcValues().getMask());
- return resolveAugmentation(udpSrcBuilder.build(), path,
- NxmOfUdpSrcKey.class);
+ return resolveAugmentation(udpSrcBuilder.build(), path, NxmOfUdpSrcKey.VALUE);
}
@Override
udpSrcCaseValueBuilder.setUdpSrcValues(udpSrcValuesBuilder.build());
MatchEntryBuilder ofMatch = MatchUtil
.createDefaultMatchEntryBuilder(org.opendaylight.yang.gen.v1.urn.opendaylight
- .openflowjava.nx.match.rev140421.NxmOfUdpSrc.class,
- Nxm0Class.class, udpSrcCaseValueBuilder.build());
+ .openflowjava.nx.match.rev140421.NxmOfUdpSrc.VALUE,
+ Nxm0Class.VALUE, udpSrcCaseValueBuilder.build());
ofMatch.setHasMask(true);
return ofMatch.build();
}
private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmOfUdpSrc value,
- final MatchPath path, final Class<? extends ExtensionKey> key) {
+ final MatchPath path, final ExtensionKey key) {
switch (path) {
case FLOWS_STATISTICS_UPDATE_MATCH:
return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,
import org.junit.Before;
import org.junit.Test;
import org.opendaylight.openflowplugin.extension.api.path.ActionPath;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.aug.nx.action.ActionConntrack;
final NxActionNatBuilder nxActionNatBuilder = new NxActionNatBuilder()
.setFlags(Uint16.ONE)
.setRangePresent(Uint16.TWO)
- .setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.0.0"))
- .setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.10.0"))
+ .setIpAddressMin(new IpAddress(new Ipv4Address("192.168.0.0")))
+ .setIpAddressMin(new IpAddress(new Ipv4Address("192.168.10.0")))
.setPortMin(Uint16.valueOf(3000))
.setPortMax(Uint16.valueOf(4000));
final CtActionsBuilder ctActionsBuilder = new CtActionsBuilder().setOfpactActions(new NxActionNatCaseBuilder()
.NxActionNatBuilder()
.setFlags(Uint16.ONE)
.setRangePresent(Uint16.TWO)
- .setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.0.0"))
- .setIpAddressMax(IpAddressBuilder.getDefaultInstance("192.168.10.0"))
+ .setIpAddressMin(new IpAddress(new Ipv4Address("192.168.0.0")))
+ .setIpAddressMax(new IpAddress(new Ipv4Address("192.168.10.0")))
.setPortMin(Uint16.valueOf(3000))
.setPortMax(Uint16.valueOf(4000));
org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping
},
{
NiciraMatchCodecs.REG0_CODEC.getHeaderWithoutHasMask(),
- new DstNxRegCaseBuilder().setNxReg(NxmNxReg0.class).build(),
- new DstNxRegCaseBuilder().setNxReg(NxmNxReg0.class).build(),
- new SrcNxRegCaseBuilder().setNxReg(NxmNxReg0.class).build(),
- new SrcNxRegCaseBuilder().setNxReg(NxmNxReg0.class).build()
+ new DstNxRegCaseBuilder().setNxReg(NxmNxReg0.VALUE).build(),
+ new DstNxRegCaseBuilder().setNxReg(NxmNxReg0.VALUE).build(),
+ new SrcNxRegCaseBuilder().setNxReg(NxmNxReg0.VALUE).build(),
+ new SrcNxRegCaseBuilder().setNxReg(NxmNxReg0.VALUE).build()
},
{
NiciraMatchCodecs.REG1_CODEC.getHeaderWithoutHasMask(),
- new DstNxRegCaseBuilder().setNxReg(NxmNxReg1.class).build(),
- new DstNxRegCaseBuilder().setNxReg(NxmNxReg1.class).build(),
- new SrcNxRegCaseBuilder().setNxReg(NxmNxReg1.class).build(),
- new SrcNxRegCaseBuilder().setNxReg(NxmNxReg1.class).build()
+ new DstNxRegCaseBuilder().setNxReg(NxmNxReg1.VALUE).build(),
+ new DstNxRegCaseBuilder().setNxReg(NxmNxReg1.VALUE).build(),
+ new SrcNxRegCaseBuilder().setNxReg(NxmNxReg1.VALUE).build(),
+ new SrcNxRegCaseBuilder().setNxReg(NxmNxReg1.VALUE).build()
},
{
NiciraMatchCodecs.REG2_CODEC.getHeaderWithoutHasMask(),
- new DstNxRegCaseBuilder().setNxReg(NxmNxReg2.class).build(),
- new DstNxRegCaseBuilder().setNxReg(NxmNxReg2.class).build(),
- new SrcNxRegCaseBuilder().setNxReg(NxmNxReg2.class).build(),
- new SrcNxRegCaseBuilder().setNxReg(NxmNxReg2.class).build()
+ new DstNxRegCaseBuilder().setNxReg(NxmNxReg2.VALUE).build(),
+ new DstNxRegCaseBuilder().setNxReg(NxmNxReg2.VALUE).build(),
+ new SrcNxRegCaseBuilder().setNxReg(NxmNxReg2.VALUE).build(),
+ new SrcNxRegCaseBuilder().setNxReg(NxmNxReg2.VALUE).build()
},
{
NiciraMatchCodecs.REG3_CODEC.getHeaderWithoutHasMask(),
- new DstNxRegCaseBuilder().setNxReg(NxmNxReg3.class).build(),
- new DstNxRegCaseBuilder().setNxReg(NxmNxReg3.class).build(),
- new SrcNxRegCaseBuilder().setNxReg(NxmNxReg3.class).build(),
- new SrcNxRegCaseBuilder().setNxReg(NxmNxReg3.class).build()
+ new DstNxRegCaseBuilder().setNxReg(NxmNxReg3.VALUE).build(),
+ new DstNxRegCaseBuilder().setNxReg(NxmNxReg3.VALUE).build(),
+ new SrcNxRegCaseBuilder().setNxReg(NxmNxReg3.VALUE).build(),
+ new SrcNxRegCaseBuilder().setNxReg(NxmNxReg3.VALUE).build()
},
{
NiciraMatchCodecs.REG4_CODEC.getHeaderWithoutHasMask(),
- new DstNxRegCaseBuilder().setNxReg(NxmNxReg4.class).build(),
- new DstNxRegCaseBuilder().setNxReg(NxmNxReg4.class).build(),
- new SrcNxRegCaseBuilder().setNxReg(NxmNxReg4.class).build(),
- new SrcNxRegCaseBuilder().setNxReg(NxmNxReg4.class).build()
+ new DstNxRegCaseBuilder().setNxReg(NxmNxReg4.VALUE).build(),
+ new DstNxRegCaseBuilder().setNxReg(NxmNxReg4.VALUE).build(),
+ new SrcNxRegCaseBuilder().setNxReg(NxmNxReg4.VALUE).build(),
+ new SrcNxRegCaseBuilder().setNxReg(NxmNxReg4.VALUE).build()
},
{
NiciraMatchCodecs.REG5_CODEC.getHeaderWithoutHasMask(),
- new DstNxRegCaseBuilder().setNxReg(NxmNxReg5.class).build(),
- new DstNxRegCaseBuilder().setNxReg(NxmNxReg5.class).build(),
- new SrcNxRegCaseBuilder().setNxReg(NxmNxReg5.class).build(),
- new SrcNxRegCaseBuilder().setNxReg(NxmNxReg5.class).build()
+ new DstNxRegCaseBuilder().setNxReg(NxmNxReg5.VALUE).build(),
+ new DstNxRegCaseBuilder().setNxReg(NxmNxReg5.VALUE).build(),
+ new SrcNxRegCaseBuilder().setNxReg(NxmNxReg5.VALUE).build(),
+ new SrcNxRegCaseBuilder().setNxReg(NxmNxReg5.VALUE).build()
},
{
NiciraMatchCodecs.REG6_CODEC.getHeaderWithoutHasMask(),
- new DstNxRegCaseBuilder().setNxReg(NxmNxReg6.class).build(),
- new DstNxRegCaseBuilder().setNxReg(NxmNxReg6.class).build(),
- new SrcNxRegCaseBuilder().setNxReg(NxmNxReg6.class).build(),
- new SrcNxRegCaseBuilder().setNxReg(NxmNxReg6.class).build()
+ new DstNxRegCaseBuilder().setNxReg(NxmNxReg6.VALUE).build(),
+ new DstNxRegCaseBuilder().setNxReg(NxmNxReg6.VALUE).build(),
+ new SrcNxRegCaseBuilder().setNxReg(NxmNxReg6.VALUE).build(),
+ new SrcNxRegCaseBuilder().setNxReg(NxmNxReg6.VALUE).build()
},
{
NiciraMatchCodecs.REG7_CODEC.getHeaderWithoutHasMask(),
- new DstNxRegCaseBuilder().setNxReg(NxmNxReg7.class).build(),
- new DstNxRegCaseBuilder().setNxReg(NxmNxReg7.class).build(),
- new SrcNxRegCaseBuilder().setNxReg(NxmNxReg7.class).build(),
- new SrcNxRegCaseBuilder().setNxReg(NxmNxReg7.class).build()
+ new DstNxRegCaseBuilder().setNxReg(NxmNxReg7.VALUE).build(),
+ new DstNxRegCaseBuilder().setNxReg(NxmNxReg7.VALUE).build(),
+ new SrcNxRegCaseBuilder().setNxReg(NxmNxReg7.VALUE).build(),
+ new SrcNxRegCaseBuilder().setNxReg(NxmNxReg7.VALUE).build()
}
});
}
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.of.arp.op.grouping.NxmOfArpOpBuilder;
import org.opendaylight.yangtools.yang.binding.Augmentation;
import org.opendaylight.yangtools.yang.common.Uint16;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Test for {@link ArpOpConvertor}.
*/
@RunWith(MockitoJUnitRunner.class)
public class ArpOpConvertorTest {
-
- private static final Logger LOG = LoggerFactory.getLogger(ArpOpConvertorTest.class);
-
@Mock
private Extension extension;
@Mock
MatchPath.PACKET_RECEIVED_MATCH);
Assert.assertEquals(arpOpCase.getArpOp().getOpCode(),
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfArpOp().getValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfArpOpKey.class);
+ Assert.assertEquals(NxmOfArpOpKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = arpOpConvertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
Assert.assertEquals(arpOpCase.getArpOp().getOpCode(),
((NxAugMatchNodesNodeTableFlow) extensionAugment1.getAugmentationObject()).getNxmOfArpOp().getValue());
- Assert.assertEquals(extensionAugment1.getKey(), NxmOfArpOpKey.class);
+ Assert.assertEquals(NxmOfArpOpKey.VALUE, extensionAugment1.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = arpOpConvertor.convert(matchEntry,
MatchPath.SWITCH_FLOW_REMOVED_MATCH);
Assert.assertEquals(arpOpCase.getArpOp().getOpCode(),
((NxAugMatchNotifSwitchFlowRemoved) extensionAugment2.getAugmentationObject()).getNxmOfArpOp()
.getValue());
- Assert.assertEquals(extensionAugment2.getKey(), NxmOfArpOpKey.class);
+ Assert.assertEquals(NxmOfArpOpKey.VALUE, extensionAugment2.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = arpOpConvertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_RPC_MATCH);
Assert.assertEquals(arpOpCase.getArpOp().getOpCode(),
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmOfArpOp().getValue());
- Assert.assertEquals(extensionAugment3.getKey(), NxmOfArpOpKey.class);
+ Assert.assertEquals(NxmOfArpOpKey.VALUE, extensionAugment3.getKey());
}
}
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxmNxArpShaKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.nx.arp.sha.grouping.NxmNxArpShaBuilder;
import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Test for {@link ArpShaConvertor}.
private ArpShaConvertor arpShaConvertor;
- private static final MacAddress MAC_ADDRESS = MacAddress.getDefaultInstance("01:23:45:67:89:AB");
-
- private static final Logger LOG = LoggerFactory.getLogger(ArpShaConvertorTest.class);
+ private static final MacAddress MAC_ADDRESS = new MacAddress("01:23:45:67:89:AB");
@Before
public void setUp() {
MatchPath.PACKET_RECEIVED_MATCH);
Assert.assertEquals(arpShaCaseValue.getArpShaValues().getMacAddress(),
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxArpSha().getMacAddress());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxArpShaKey.class);
+ Assert.assertEquals(NxmNxArpShaKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = arpShaConvertor
.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH);
Assert.assertEquals(arpShaCaseValue.getArpShaValues().getMacAddress(),
((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()).getNxmNxArpSha()
.getMacAddress());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxArpShaKey.class);
+ Assert.assertEquals(NxmNxArpShaKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = arpShaConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
Assert.assertEquals(arpShaCaseValue.getArpShaValues().getMacAddress(),
((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxArpSha()
.getMacAddress());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxArpShaKey.class);
+ Assert.assertEquals(NxmNxArpShaKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = arpShaConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH);
Assert.assertEquals(arpShaCaseValue.getArpShaValues().getMacAddress(),
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxArpSha()
.getMacAddress());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxArpShaKey.class);
+ Assert.assertEquals(NxmNxArpShaKey.VALUE, extensionAugment.getKey());
}
-
}
MatchPath.PACKET_RECEIVED_MATCH);
Assert.assertEquals(IPV4_ADDRESS,
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfArpSpa().getIpv4Address());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfArpSpaKey.class);
+ Assert.assertEquals(NxmOfArpSpaKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = arpSpaConvertor
.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH);
Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmOfArpSpa().getIpv4Address());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfArpSpaKey.class);
+ Assert.assertEquals(NxmOfArpSpaKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = arpSpaConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject())
.getNxmOfArpSpa().getIpv4Address());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfArpSpaKey.class);
+ Assert.assertEquals(NxmOfArpSpaKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = arpSpaConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH);
Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject())
.getNxmOfArpSpa().getIpv4Address());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfArpSpaKey.class);
+ Assert.assertEquals(NxmOfArpSpaKey.VALUE, extensionAugment.getKey());
}
}
MatchPath.PACKET_RECEIVED_MATCH);
Assert.assertEquals(arpThaCaseValue.getArpThaValues().getMacAddress(),
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxArpTha().getMacAddress());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxArpThaKey.class);
+ Assert.assertEquals(NxmNxArpThaKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = arpThaConvertor
.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH);
Assert.assertEquals(arpThaCaseValue.getArpThaValues().getMacAddress(),
((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()).getNxmNxArpTha()
.getMacAddress());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxArpThaKey.class);
+ Assert.assertEquals(NxmNxArpThaKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = arpThaConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
Assert.assertEquals(arpThaCaseValue.getArpThaValues().getMacAddress(),
((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxArpTha()
.getMacAddress());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxArpThaKey.class);
+ Assert.assertEquals(NxmNxArpThaKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = arpThaConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH);
Assert.assertEquals(arpThaCaseValue.getArpThaValues().getMacAddress(),
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxArpTha()
.getMacAddress());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxArpThaKey.class);
+ Assert.assertEquals(NxmNxArpThaKey.VALUE, extensionAugment.getKey());
}
}
@Mock
private MatchEntry matchEntry;
- private static final Ipv4Address IPV4_ADDRESS = Ipv4Address.getDefaultInstance("1.2.3.4");
+ private static final Ipv4Address IPV4_ADDRESS = new Ipv4Address("1.2.3.4");
private ArpTpaConvertor arpTpaConvertor;
MatchPath.PACKET_RECEIVED_MATCH);
Assert.assertEquals(IPV4_ADDRESS,
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfArpTpa().getIpv4Address());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfArpTpaKey.class);
+ Assert.assertEquals(NxmOfArpTpaKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = arpTpaConvertor
.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH);
Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmOfArpTpa().getIpv4Address());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfArpTpaKey.class);
+ Assert.assertEquals(NxmOfArpTpaKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = arpTpaConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject())
.getNxmOfArpTpa().getIpv4Address());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfArpTpaKey.class);
+ Assert.assertEquals(NxmOfArpTpaKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = arpTpaConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH);
Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject())
.getNxmOfArpTpa().getIpv4Address());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfArpTpaKey.class);
+ Assert.assertEquals(NxmOfArpTpaKey.VALUE, extensionAugment.getKey());
}
}
.getCtState().longValue());
Assert.assertEquals(4L, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxCtState()
.getMask().longValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxCtStateKey.class);
+ Assert.assertEquals(NxmNxCtStateKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = ctStateConvertor
.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH);
.getNxmNxCtState().getCtState().longValue());
Assert.assertEquals(4L, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmNxCtState().getMask().longValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxCtStateKey.class);
+ Assert.assertEquals(NxmNxCtStateKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = ctStateConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
.getNxmNxCtState().getCtState().longValue());
Assert.assertEquals(4L, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject())
.getNxmNxCtState().getMask().longValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxCtStateKey.class);
+ Assert.assertEquals(NxmNxCtStateKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = ctStateConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH);
.getNxmNxCtState().getCtState().longValue());
Assert.assertEquals(4L, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject())
.getNxmNxCtState().getMask().longValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxCtStateKey.class);
+ Assert.assertEquals(NxmNxCtStateKey.VALUE, extensionAugment.getKey());
}
}
MatchPath.PACKET_RECEIVED_MATCH);
Assert.assertEquals(2L, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxCtZone()
.getCtZone().longValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxCtZoneKey.class);
+ Assert.assertEquals(NxmNxCtZoneKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = ctZoneConvertor
.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH);
Assert.assertEquals(2L, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmNxCtZone().getCtZone().longValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxCtZoneKey.class);
+ Assert.assertEquals(NxmNxCtZoneKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = ctZoneConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
Assert.assertEquals(2L, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject())
.getNxmNxCtZone().getCtZone().longValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxCtZoneKey.class);
+ Assert.assertEquals(NxmNxCtZoneKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = ctZoneConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH);
Assert.assertEquals(2L, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxCtZone()
.getCtZone().longValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxCtZoneKey.class);
+ Assert.assertEquals(NxmNxCtZoneKey.VALUE, extensionAugment.getKey());
}
}
MatchPath.PACKET_RECEIVED_MATCH);
Assert.assertEquals(MAC_ADDRESS,
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfEthDst().getMacAddress());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfEthDstKey.class);
+ Assert.assertEquals(NxmOfEthDstKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = ethDstConvertor
.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH);
Assert.assertEquals(MAC_ADDRESS, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmOfEthDst().getMacAddress());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfEthDstKey.class);
+ Assert.assertEquals(NxmOfEthDstKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = ethDstConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
Assert.assertEquals(MAC_ADDRESS, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject())
.getNxmOfEthDst().getMacAddress());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfEthDstKey.class);
+ Assert.assertEquals(NxmOfEthDstKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = ethDstConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH);
Assert.assertEquals(MAC_ADDRESS, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject())
.getNxmOfEthDst().getMacAddress());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfEthDstKey.class);
+ Assert.assertEquals(NxmOfEthDstKey.VALUE, extensionAugment.getKey());
}
}
@Mock
private MatchEntry matchEntry;
- private static final MacAddress MAC_ADDRESS = MacAddress.getDefaultInstance("01:23:45:67:89:AB");
+ private static final MacAddress MAC_ADDRESS = new MacAddress("01:23:45:67:89:AB");
private EthSrcConvertor ethSrcConvertor;
MatchPath.PACKET_RECEIVED_MATCH);
Assert.assertEquals(MAC_ADDRESS,
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfEthSrc().getMacAddress());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfEthSrcKey.class);
+ Assert.assertEquals(NxmOfEthSrcKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = ethSrcConvertor
.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH);
Assert.assertEquals(MAC_ADDRESS, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmOfEthSrc().getMacAddress());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfEthSrcKey.class);
+ Assert.assertEquals(NxmOfEthSrcKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = ethSrcConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
Assert.assertEquals(MAC_ADDRESS, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject())
.getNxmOfEthSrc().getMacAddress());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfEthSrcKey.class);
+ Assert.assertEquals(NxmOfEthSrcKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = ethSrcConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH);
Assert.assertEquals(MAC_ADDRESS, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject())
.getNxmOfEthSrc().getMacAddress());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfEthSrcKey.class);
+ Assert.assertEquals(NxmOfEthSrcKey.VALUE, extensionAugment.getKey());
}
}
.convert(matchEntry, MatchPath.PACKET_RECEIVED_MATCH);
Assert.assertEquals(1, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfEthType()
.getValue().intValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfEthTypeKey.class);
+ Assert.assertEquals(NxmOfEthTypeKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = ethTypeConvertor
.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH);
Assert.assertEquals(1, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmOfEthType().getValue().intValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfEthTypeKey.class);
+ Assert.assertEquals(NxmOfEthTypeKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = ethTypeConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
Assert.assertEquals(1, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject())
.getNxmOfEthType().getValue().intValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfEthTypeKey.class);
+ Assert.assertEquals(NxmOfEthTypeKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = ethTypeConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH);
Assert.assertEquals(1, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmOfEthType()
.getValue().intValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfEthTypeKey.class);
+ Assert.assertEquals(NxmOfEthTypeKey.VALUE, extensionAugment.getKey());
}
}
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.match;
import static org.junit.Assert.assertEquals;
.getNxmNxNshFlags().getNshFlags());
assertEquals(MASK_VALUE, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject())
.getNxmNxNshFlags().getMask());
- assertEquals(extensionAugment.getKey(), NxmNxNshFlagsKey.class);
+ assertEquals(NxmNxNshFlagsKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = convertor.convert(matchEntry,
MatchPath.SWITCH_FLOW_REMOVED_MATCH);
.getNxmNxNshFlags().getNshFlags());
assertEquals(MASK_VALUE, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmNxNshFlags().getMask());
- assertEquals(extensionAugment.getKey(), NxmNxNshFlagsKey.class);
+ assertEquals(NxmNxNshFlagsKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = convertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
.getNxmNxNshFlags().getNshFlags());
assertEquals(MASK_VALUE, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject())
.getNxmNxNshFlags().getMask());
- assertEquals(extensionAugment.getKey(), NxmNxNshFlagsKey.class);
+ assertEquals(NxmNxNshFlagsKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = convertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_RPC_MATCH);
.getNxmNxNshFlags().getNshFlags());
assertEquals(MASK_VALUE, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject())
.getNxmNxNshFlags().getMask());
- assertEquals(extensionAugment.getKey(), NxmNxNshFlagsKey.class);
+ assertEquals(NxmNxNshFlagsKey.VALUE, extensionAugment.getKey());
}
}
\ No newline at end of file
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.match;
import static org.junit.Assert.assertEquals;
MatchPath.PACKET_RECEIVED_MATCH);
assertEquals(MDTYPE_VALUE, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject())
.getNxmNxNshMdtype().getValue());
- assertEquals(extensionAugment.getKey(), NxmNxNshMdtypeKey.class);
+ assertEquals(NxmNxNshMdtypeKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = convertor.convert(matchEntry,
MatchPath.SWITCH_FLOW_REMOVED_MATCH);
assertEquals(MDTYPE_VALUE, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmNxNshMdtype().getValue());
- assertEquals(extensionAugment.getKey(), NxmNxNshMdtypeKey.class);
+ assertEquals(NxmNxNshMdtypeKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = convertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
assertEquals(MDTYPE_VALUE, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject())
.getNxmNxNshMdtype().getValue());
- assertEquals(extensionAugment.getKey(), NxmNxNshMdtypeKey.class);
+ assertEquals(NxmNxNshMdtypeKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = convertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_RPC_MATCH);
assertEquals(MDTYPE_VALUE, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject())
.getNxmNxNshMdtype().getValue());
- assertEquals(extensionAugment.getKey(), NxmNxNshMdtypeKey.class);
+ assertEquals(NxmNxNshMdtypeKey.VALUE, extensionAugment.getKey());
}
}
\ No newline at end of file
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.match;
import static org.junit.Assert.assertEquals;
MatchPath.PACKET_RECEIVED_MATCH);
assertEquals(NP_VALUE, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject())
.getNxmNxNshNp().getValue());
- assertEquals(extensionAugment.getKey(), NxmNxNshNpKey.class);
+ assertEquals(NxmNxNshNpKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = convertor.convert(matchEntry,
MatchPath.SWITCH_FLOW_REMOVED_MATCH);
assertEquals(NP_VALUE, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmNxNshNp().getValue());
- assertEquals(extensionAugment.getKey(), NxmNxNshNpKey.class);
+ assertEquals(NxmNxNshNpKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = convertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
assertEquals(NP_VALUE, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject())
.getNxmNxNshNp().getValue());
- assertEquals(extensionAugment.getKey(), NxmNxNshNpKey.class);
+ assertEquals(NxmNxNshNpKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = convertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_RPC_MATCH);
assertEquals(NP_VALUE, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject())
.getNxmNxNshNp().getValue());
- assertEquals(extensionAugment.getKey(), NxmNxNshNpKey.class);
+ assertEquals(NxmNxNshNpKey.VALUE, extensionAugment.getKey());
}
}
\ No newline at end of file
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.match;
import static org.junit.Assert.assertEquals;
MatchPath.PACKET_RECEIVED_MATCH);
assertEquals(TTL_VALUE, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject())
.getNxmNxNshTtl().getNshTtl());
- assertEquals(extensionAugment.getKey(), NxmNxNshTtlKey.class);
+ assertEquals(NxmNxNshTtlKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = convertor.convert(matchEntry,
MatchPath.SWITCH_FLOW_REMOVED_MATCH);
assertEquals(TTL_VALUE, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmNxNshTtl().getNshTtl());
- assertEquals(extensionAugment.getKey(), NxmNxNshTtlKey.class);
+ assertEquals(NxmNxNshTtlKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = convertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
assertEquals(TTL_VALUE, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject())
.getNxmNxNshTtl().getNshTtl());
- assertEquals(extensionAugment.getKey(), NxmNxNshTtlKey.class);
+ assertEquals(NxmNxNshTtlKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = convertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_RPC_MATCH);
assertEquals(TTL_VALUE, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject())
.getNxmNxNshTtl().getNshTtl());
- assertEquals(extensionAugment.getKey(), NxmNxNshTtlKey.class);
+ assertEquals(NxmNxNshTtlKey.VALUE, extensionAugment.getKey());
}
}
\ No newline at end of file
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNshc1().getValue());
Assert.assertEquals(MASK_VALUE,
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNshc1().getMask());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc1Key.class);
+ Assert.assertEquals(NxmNxNshc1Key.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = nshc1Convertor.convert(matchEntry,
MatchPath.SWITCH_FLOW_REMOVED_MATCH);
Assert.assertEquals(MASK_VALUE,
((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmNxNshc1().getMask());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc1Key.class);
+ Assert.assertEquals(NxmNxNshc1Key.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = nshc1Convertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNshc1().getValue());
Assert.assertEquals(MASK_VALUE,
((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNshc1().getMask());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc1Key.class);
+ Assert.assertEquals(NxmNxNshc1Key.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = nshc1Convertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_RPC_MATCH);
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNshc1().getValue());
Assert.assertEquals(MASK_VALUE,
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNshc1().getMask());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc1Key.class);
+ Assert.assertEquals(NxmNxNshc1Key.VALUE, extensionAugment.getKey());
}
}
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNshc2().getValue());
Assert.assertEquals(MASK_VALUE,
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNshc2().getMask());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc2Key.class);
+ Assert.assertEquals(NxmNxNshc2Key.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = nshc2Convertor.convert(matchEntry,
MatchPath.SWITCH_FLOW_REMOVED_MATCH);
Assert.assertEquals(MASK_VALUE,
((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmNxNshc2().getMask());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc2Key.class);
+ Assert.assertEquals(NxmNxNshc2Key.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = nshc2Convertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNshc2().getValue());
Assert.assertEquals(MASK_VALUE,
((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNshc2().getMask());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc2Key.class);
+ Assert.assertEquals(NxmNxNshc2Key.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = nshc2Convertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_RPC_MATCH);
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNshc2().getValue());
Assert.assertEquals(MASK_VALUE,
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNshc2().getMask());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc2Key.class);
+ Assert.assertEquals(NxmNxNshc2Key.VALUE, extensionAugment.getKey());
}
}
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNshc3().getValue());
Assert.assertEquals(MASK_VALUE,
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNshc3().getMask());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc3Key.class);
+ Assert.assertEquals(NxmNxNshc3Key.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = nshc3Convertor.convert(matchEntry,
MatchPath.SWITCH_FLOW_REMOVED_MATCH);
Assert.assertEquals(MASK_VALUE,
((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmNxNshc3().getMask());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc3Key.class);
+ Assert.assertEquals(NxmNxNshc3Key.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = nshc3Convertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNshc3().getValue());
Assert.assertEquals(MASK_VALUE,
((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNshc3().getMask());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc3Key.class);
+ Assert.assertEquals(NxmNxNshc3Key.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = nshc3Convertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_RPC_MATCH);
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNshc3().getValue());
Assert.assertEquals(MASK_VALUE,
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNshc3().getMask());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc3Key.class);
+ Assert.assertEquals(NxmNxNshc3Key.VALUE, extensionAugment.getKey());
}
}
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNshc4().getValue());
Assert.assertEquals(MASK_VALUE,
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNshc4().getMask());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc4Key.class);
+ Assert.assertEquals(NxmNxNshc4Key.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = nshc4Convertor.convert(matchEntry,
MatchPath.SWITCH_FLOW_REMOVED_MATCH);
Assert.assertEquals(MASK_VALUE,
((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmNxNshc4().getMask());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc4Key.class);
+ Assert.assertEquals(NxmNxNshc4Key.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = nshc4Convertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNshc4().getValue());
Assert.assertEquals(MASK_VALUE,
((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNshc4().getMask());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc4Key.class);
+ Assert.assertEquals(NxmNxNshc4Key.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = nshc4Convertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_RPC_MATCH);
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNshc4().getValue());
Assert.assertEquals(MASK_VALUE,
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNshc4().getMask());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNshc4Key.class);
+ Assert.assertEquals(NxmNxNshc4Key.VALUE, extensionAugment.getKey());
}
}
MatchPath.PACKET_RECEIVED_MATCH);
Assert.assertEquals(NSI_VALUE,
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNsi().getNsi());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNsiKey.class);
+ Assert.assertEquals(NxmNxNsiKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = nsiConvertor.convert(matchEntry,
MatchPath.SWITCH_FLOW_REMOVED_MATCH);
Assert.assertEquals(NSI_VALUE,
((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()).getNxmNxNsi().getNsi());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNsiKey.class);
+ Assert.assertEquals(NxmNxNsiKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = nsiConvertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
Assert.assertEquals(NSI_VALUE,
((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNsi().getNsi());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNsiKey.class);
+ Assert.assertEquals(NxmNxNsiKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = nsiConvertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_RPC_MATCH);
Assert.assertEquals(NSI_VALUE,
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNsi().getNsi());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNsiKey.class);
+ Assert.assertEquals(NxmNxNsiKey.VALUE, extensionAugment.getKey());
}
}
MatchPath.PACKET_RECEIVED_MATCH);
Assert.assertEquals(NSP_VALUE,
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxNsp().getValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNspKey.class);
+ Assert.assertEquals(NxmNxNspKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = nspConvertor.convert(matchEntry,
MatchPath.SWITCH_FLOW_REMOVED_MATCH);
Assert.assertEquals(NSP_VALUE,
((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmNxNsp().getValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNspKey.class);
+ Assert.assertEquals(NxmNxNspKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = nspConvertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
Assert.assertEquals(NSP_VALUE,
((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxNsp().getValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNspKey.class);
+ Assert.assertEquals(NxmNxNspKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = nspConvertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_RPC_MATCH);
Assert.assertEquals(NSP_VALUE,
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxNsp().getValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxNspKey.class);
+ Assert.assertEquals(NxmNxNspKey.VALUE, extensionAugment.getKey());
}
}
.getMask().intValue());
Assert.assertEquals(DEFAULT_PORT,
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfTcpDst().getPort());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfTcpDstKey.class);
+ Assert.assertEquals(NxmOfTcpDstKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = tcpDstConvertor
.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH);
.getNxmOfTcpDst().getMask().intValue());
Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmOfTcpDst().getPort());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfTcpDstKey.class);
+ Assert.assertEquals(NxmOfTcpDstKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = tcpDstConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
.getNxmOfTcpDst().getMask().intValue());
Assert.assertEquals(DEFAULT_PORT,
((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmOfTcpDst().getPort());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfTcpDstKey.class);
+ Assert.assertEquals(NxmOfTcpDstKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = tcpDstConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH);
.getMask().intValue());
Assert.assertEquals(DEFAULT_PORT,
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmOfTcpDst().getPort());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfTcpDstKey.class);
+ Assert.assertEquals(NxmOfTcpDstKey.VALUE, extensionAugment.getKey());
}
}
.getMask().intValue());
Assert.assertEquals(DEFAULT_PORT,
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfTcpSrc().getPort());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfTcpSrcKey.class);
+ Assert.assertEquals(NxmOfTcpSrcKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = tcpSrcConvertor
.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH);
.getNxmOfTcpSrc().getMask().intValue());
Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmOfTcpSrc().getPort());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfTcpSrcKey.class);
+ Assert.assertEquals(NxmOfTcpSrcKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = tcpSrcConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
.getNxmOfTcpSrc().getMask().intValue());
Assert.assertEquals(DEFAULT_PORT,
((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmOfTcpSrc().getPort());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfTcpSrcKey.class);
+ Assert.assertEquals(NxmOfTcpSrcKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = tcpSrcConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH);
.getMask().intValue());
Assert.assertEquals(DEFAULT_PORT,
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmOfTcpSrc().getPort());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfTcpSrcKey.class);
+ Assert.assertEquals(NxmOfTcpSrcKey.VALUE, extensionAugment.getKey());
}
}
.convert(matchEntry, MatchPath.PACKET_RECEIVED_MATCH);
Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject())
.getNxmNxTunIpv4Dst().getIpv4Address());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4DstKey.class);
+ Assert.assertEquals(NxmNxTunIpv4DstKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = tunIPv4DstConvertor
.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH);
Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmNxTunIpv4Dst().getIpv4Address());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4DstKey.class);
+ Assert.assertEquals(NxmNxTunIpv4DstKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = tunIPv4DstConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject())
.getNxmNxTunIpv4Dst().getIpv4Address());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4DstKey.class);
+ Assert.assertEquals(NxmNxTunIpv4DstKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = tunIPv4DstConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH);
Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject())
.getNxmNxTunIpv4Dst().getIpv4Address());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4DstKey.class);
+ Assert.assertEquals(NxmNxTunIpv4DstKey.VALUE, extensionAugment.getKey());
}
}
@Mock
private MatchEntry matchEntry;
- private static final Ipv4Address IPV4_ADDRESS = Ipv4Address.getDefaultInstance("1.2.3.4");
+ private static final Ipv4Address IPV4_ADDRESS = new Ipv4Address("1.2.3.4");
private TunIPv4SrcConvertor tunIPv4DstConvertor;
.convert(matchEntry, MatchPath.PACKET_RECEIVED_MATCH);
Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject())
.getNxmNxTunIpv4Src().getIpv4Address());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4SrcKey.class);
+ Assert.assertEquals(NxmNxTunIpv4SrcKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = tunIPv4DstConvertor
.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH);
Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmNxTunIpv4Src().getIpv4Address());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4SrcKey.class);
+ Assert.assertEquals(NxmNxTunIpv4SrcKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = tunIPv4DstConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject())
.getNxmNxTunIpv4Src().getIpv4Address());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4SrcKey.class);
+ Assert.assertEquals(NxmNxTunIpv4SrcKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = tunIPv4DstConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH);
Assert.assertEquals(IPV4_ADDRESS, ((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject())
.getNxmNxTunIpv4Src().getIpv4Address());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIpv4SrcKey.class);
+ Assert.assertEquals(NxmNxTunIpv4SrcKey.VALUE, extensionAugment.getKey());
}
}
MatchPath.PACKET_RECEIVED_MATCH);
Assert.assertEquals(U64_TEN,
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmNxTunId().getValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIdKey.class);
+ Assert.assertEquals(NxmNxTunIdKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = tunIdConvertor.convert(matchEntry,
MatchPath.SWITCH_FLOW_REMOVED_MATCH);
Assert.assertEquals(U64_TEN,
((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()).getNxmNxTunId()
.getValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIdKey.class);
+ Assert.assertEquals(NxmNxTunIdKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = tunIdConvertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
Assert.assertEquals(U64_TEN,
((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmNxTunId().getValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIdKey.class);
+ Assert.assertEquals(NxmNxTunIdKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = tunIdConvertor.convert(matchEntry,
MatchPath.FLOWS_STATISTICS_RPC_MATCH);
Assert.assertEquals(U64_TEN,
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmNxTunId().getValue());
- Assert.assertEquals(extensionAugment.getKey(), NxmNxTunIdKey.class);
+ Assert.assertEquals(NxmNxTunIdKey.VALUE, extensionAugment.getKey());
}
}
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment = udpDstConvertor.convert(matchEntry,
MatchPath.PACKET_RECEIVED_MATCH);
- Assert.assertEquals(Uint16.valueOf(2),
+ Assert.assertEquals(Uint16.TWO,
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfUdpDst().getMask());
Assert.assertEquals(DEFAULT_PORT,
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfUdpDst().getPort());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfUdpDstKey.class);
+ Assert.assertEquals(NxmOfUdpDstKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = udpDstConvertor
.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH);
- Assert.assertEquals(Uint16.valueOf(2),
+ Assert.assertEquals(Uint16.TWO,
((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()).getNxmOfUdpDst()
.getMask());
Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmOfUdpDst().getPort());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfUdpDstKey.class);
+ Assert.assertEquals(NxmOfUdpDstKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = udpDstConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
- Assert.assertEquals(Uint16.valueOf(2),
+ Assert.assertEquals(Uint16.TWO,
((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmOfUdpDst().getMask());
Assert.assertEquals(DEFAULT_PORT,
((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmOfUdpDst().getPort());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfUdpDstKey.class);
+ Assert.assertEquals(NxmOfUdpDstKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = udpDstConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH);
- Assert.assertEquals(Uint16.valueOf(2),
+ Assert.assertEquals(Uint16.TWO,
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmOfUdpDst().getMask());
Assert.assertEquals(DEFAULT_PORT,
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmOfUdpDst().getPort());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfUdpDstKey.class);
+ Assert.assertEquals(NxmOfUdpDstKey.VALUE, extensionAugment.getKey());
}
}
@Test
public void testConvert() {
final MatchEntry converted = udpSrcConvertor.convert(extension);
- Assert.assertEquals(Uint16.valueOf(1),
+ Assert.assertEquals(Uint16.ONE,
((UdpSrcCaseValue) converted.getMatchEntryValue()).getUdpSrcValues().getMask());
Assert.assertEquals(DEFAULT_PORT,
((UdpSrcCaseValue) converted.getMatchEntryValue()).getUdpSrcValues().getPort());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment = udpSrcConvertor.convert(matchEntry,
MatchPath.PACKET_RECEIVED_MATCH);
- Assert.assertEquals(Uint16.valueOf(2),
+ Assert.assertEquals(Uint16.TWO,
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfUdpSrc().getMask());
Assert.assertEquals(DEFAULT_PORT,
((NxAugMatchNotifPacketIn) extensionAugment.getAugmentationObject()).getNxmOfUdpSrc().getPort());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfUdpSrcKey.class);
+ Assert.assertEquals(NxmOfUdpSrcKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment1 = udpSrcConvertor
.convert(matchEntry, MatchPath.SWITCH_FLOW_REMOVED_MATCH);
- Assert.assertEquals(Uint16.valueOf(2),
+ Assert.assertEquals(Uint16.TWO,
((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject()).getNxmOfUdpSrc()
.getMask());
Assert.assertEquals(DEFAULT_PORT, ((NxAugMatchNotifSwitchFlowRemoved) extensionAugment1.getAugmentationObject())
.getNxmOfUdpSrc().getPort());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfUdpSrcKey.class);
+ Assert.assertEquals(NxmOfUdpSrcKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment2 = udpSrcConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
- Assert.assertEquals(Uint16.valueOf(2),
+ Assert.assertEquals(Uint16.TWO,
((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmOfUdpSrc().getMask());
Assert.assertEquals(DEFAULT_PORT,
((NxAugMatchNodesNodeTableFlow) extensionAugment2.getAugmentationObject()).getNxmOfUdpSrc().getPort());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfUdpSrcKey.class);
+ Assert.assertEquals(NxmOfUdpSrcKey.VALUE, extensionAugment.getKey());
final ExtensionAugment<? extends Augmentation<Extension>> extensionAugment3 = udpSrcConvertor
.convert(matchEntry, MatchPath.FLOWS_STATISTICS_RPC_MATCH);
- Assert.assertEquals(Uint16.valueOf(2),
+ Assert.assertEquals(Uint16.TWO,
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmOfUdpSrc().getMask());
Assert.assertEquals(DEFAULT_PORT,
((NxAugMatchRpcGetFlowStats) extensionAugment3.getAugmentationObject()).getNxmOfUdpSrc().getPort());
- Assert.assertEquals(extensionAugment.getKey(), NxmOfUdpSrcKey.class);
+ Assert.assertEquals(NxmOfUdpSrcKey.VALUE, extensionAugment.getKey());
}
}
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
// vendor part
.setNxRegLoad(new NxRegLoadBuilder()
.setDst(new DstBuilder()
- .setDstChoice(new DstNxRegCaseBuilder().setNxReg(NxmNxReg0.class).build())
+ .setDstChoice(new DstNxRegCaseBuilder().setNxReg(NxmNxReg0.VALUE).build())
.setStart(Uint16.ZERO)
.setEnd(Uint16.valueOf(5))
.build())
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-artifacts</artifactId>
- <version>3.0.5</version>
+ <version>4.0.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-openflowplugin-libraries">
<feature name="odl-openflowplugin-libraries">
- <feature version="[10,11)">odl-apache-commons-lang3</feature>
- <feature version="[10,11)">odl-guava</feature>
+ <feature version="[11,12)">odl-apache-commons-lang3</feature>
+ <feature version="[11,12)">odl-guava</feature>
</feature>
</features>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>9.0.4</version>
+ <version>10.0.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>controller-artifacts</artifactId>
- <version>5.0.5</version>
+ <version>6.0.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<?xml version="1.0" encoding="UTF-8"?>
<features name="odl-openflowplugin-nsf-model-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
<feature name="odl-openflowplugin-nsf-model" version="${project.version}">
- <feature version="[9,10)">odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</feature>
- <feature version="[9,10)">odl-mdsal-model-odl-l2-types</feature>
+ <feature version="[10,11)">odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</feature>
+ <feature version="[10,11)">odl-mdsal-model-odl-l2-types</feature>
</feature>
</features>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>controller-artifacts</artifactId>
- <version>5.0.5</version>
+ <version>6.0.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.opendaylight.infrautils</groupId>
<artifactId>infrautils-artifacts</artifactId>
- <version>3.0.1</version>
+ <version>4.0.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<features name="openflowplugin-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
<feature name="odl-openflowplugin-southbound" version="${project.version}">
<configfile finalname="etc/org.opendaylight.openflowplugin.cfg">mvn:org.opendaylight.openflowplugin/openflowplugin-blueprint-config/${project.version}/cfg/config</configfile>
- <feature version="[5,6)">odl-mdsal-broker</feature>
- <feature version="[3,4)">odl-infrautils-diagstatus</feature>
+ <feature version="[6,7)">odl-mdsal-broker</feature>
+ <feature version="[4,5)">odl-infrautils-diagstatus</feature>
</feature>
</features>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<dependency>
<groupId>org.opendaylight.infrautils</groupId>
<artifactId>infrautils-artifacts</artifactId>
- <version>3.0.1</version>
+ <version>4.0.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
- <version>8.0.6</version>
+ <version>9.0.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>9.0.4</version>
+ <version>10.0.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<feature name='odl-openflowjava-protocol' version='${project.version}'>
<configfile finalname="etc/opendaylight/datastore/initial/config/default-openflow-connection-config.xml">mvn:org.opendaylight.openflowplugin.openflowjava/openflowjava-blueprint-config/${project.version}/xml/config</configfile>
<configfile finalname="etc/opendaylight/datastore/initial/config/legacy-openflow-connection-config.xml">mvn:org.opendaylight.openflowplugin.openflowjava/openflowjava-blueprint-config/${project.version}/xml/legacyConfig</configfile>
- <feature version="[8,9)">odl-yangtools-netty</feature>
- <feature version="[9,10)">odl-mdsal-model-rfc6991</feature>
- <feature version="[3,4)">odl-infrautils-diagstatus</feature>
+ <feature version="[9,10)">odl-yangtools-netty</feature>
+ <feature version="[10,11)">odl-mdsal-model-rfc6991</feature>
+ <feature version="[4,5)">odl-infrautils-diagstatus</feature>
</feature>
</features>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
* @author michal.polkorab
*/
public final class ExperimenterActionSerializerKey extends ActionSerializerKey<ExperimenterIdCase> {
-
- private final Class<? extends ExperimenterActionSubType> actionSubType;
+ private final ExperimenterActionSubType actionSubType;
/**
* Constructor.
* @param actionSubType vendor defined subtype
*/
public ExperimenterActionSerializerKey(final Uint8 msgVersion, final Uint32 experimenterId,
- final Class<? extends ExperimenterActionSubType> actionSubType) {
+ final ExperimenterActionSubType actionSubType) {
super(msgVersion, ExperimenterIdCase.class, experimenterId);
this.actionSubType = actionSubType;
}
* @author hyy on 2016/9/8.
*/
public class ExperimenterIdMeterSubTypeSerializerKey<T extends DataContainer> extends ExperimenterIdSerializerKey<T> {
- private final Class<? extends ExperimenterMeterBandSubType> meterSubType;
+ private final ExperimenterMeterBandSubType meterSubType;
/**
* Constructor.
* @param meterSubType vendor defined subtype
*/
public ExperimenterIdMeterSubTypeSerializerKey(final Uint8 msgVersion, final Uint32 experimenterId,
- final Class<T> objectClass, final Class<? extends ExperimenterMeterBandSubType> meterSubType) {
+ final Class<T> objectClass, final ExperimenterMeterBandSubType meterSubType) {
super(msgVersion, experimenterId, objectClass);
this.meterSubType = meterSubType;
}
public final class MatchEntrySerializerKey<C extends OxmClassBase, F extends MatchField>
extends MessageTypeKey<MatchEntry> implements ExperimenterSerializerKey {
- private final Class<C> oxmClass;
- private final Class<F> oxmField;
+ private final C oxmClass;
+ private final F oxmField;
private Uint32 experimenterId;
* @param oxmClass oxm_class (see specification)
* @param oxmField oxm_field (see specification)
*/
- public MatchEntrySerializerKey(final Uint8 msgVersion, final Class<C> oxmClass, final Class<F> oxmField) {
+ public MatchEntrySerializerKey(final Uint8 msgVersion, final C oxmClass, final F oxmField) {
super(msgVersion, MatchEntry.class);
this.oxmClass = oxmClass;
this.oxmField = oxmField;
@Override
public String toString() {
- return super.toString() + " oxm_class: " + oxmClass.getName() + " oxm_field: "
- + oxmField.getName() + " experimenterID: " + experimenterId;
+ return super.toString() + " oxm_class: " + oxmClass.implementedInterface().getName() + " oxm_field: "
+ + oxmField.implementedInterface().getName() + " experimenterID: " + experimenterId;
}
}
ActionSerializerKey<ExperimenterIdCase> actionSerializerKey = new ActionSerializerKey<>(
EncodeConstants.OF_VERSION_1_3, ExperimenterIdCase.class, Uint32.ONE);
ExperimenterActionSerializerKey experimenterActionSerializerKey = new ExperimenterActionSerializerKey(
- EncodeConstants.OF_VERSION_1_3, Uint32.ONE, ExpSubType.class);
+ EncodeConstants.OF_VERSION_1_3, Uint32.ONE, ExpSubType.VALUE);
Assert.assertFalse(actionSerializerKey.equals(experimenterActionSerializerKey));
Assert.assertFalse(experimenterActionSerializerKey.equals(actionSerializerKey));
Assert.assertEquals(instructionSerializerKey.hashCode(), experimenterInstructionSerializerKey.hashCode());
MatchEntrySerializerKey<OpenflowBasicClass, InPort> matchKey = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_0, OpenflowBasicClass.class, InPort.class);
+ EncodeConstants.OF_VERSION_1_0, OpenflowBasicClass.VALUE, InPort.VALUE);
MatchEntrySerializerKey<OpenflowBasicClass, InPort> matchKey2 = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_0, OpenflowBasicClass.class, InPort.class);
+ EncodeConstants.OF_VERSION_1_0, OpenflowBasicClass.VALUE, InPort.VALUE);
Assert.assertEquals(matchKey, matchKey2);
Assert.assertEquals(matchKey.hashCode(), matchKey2.hashCode());
}
private interface ExpSubType extends ExperimenterActionSubType {
- // empty class - only used in test for comparation
+ ExpSubType VALUE = () -> ExpSubType.class;
+
+ @Override
+ Class<? extends ExpSubType> implementedInterface();
}
}
@Test
public void test() {
MatchEntrySerializerKey<?, ?> key1 = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPort.class);
+ EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.VALUE, InPort.VALUE);
MatchEntrySerializerKey<?, ?> key2 = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPort.class);
+ EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.VALUE, InPort.VALUE);
Assert.assertTrue("Wrong equals", key1.equals(key2));
Assert.assertTrue("Wrong hashCode", key1.hashCode() == key2.hashCode());
key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3,
- OpenflowBasicClass.class, InPhyPort.class);
+ OpenflowBasicClass.VALUE, InPhyPort.VALUE);
Assert.assertFalse("Wrong equals", key1.equals(key2));
Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3,
- Nxm0Class.class, InPort.class);
+ Nxm0Class.VALUE, InPort.VALUE);
Assert.assertFalse("Wrong equals", key1.equals(key2));
Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_0,
- OpenflowBasicClass.class, InPhyPort.class);
+ OpenflowBasicClass.VALUE, InPhyPort.VALUE);
Assert.assertFalse("Wrong equals", key1.equals(key2));
Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3,
- OpenflowBasicClass.class, null);
+ OpenflowBasicClass.VALUE, null);
Assert.assertFalse("Wrong equals", key1.equals(key2));
Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3,
- null, InPhyPort.class);
+ null, InPhyPort.VALUE);
Assert.assertFalse("Wrong equals", key1.equals(key2));
Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
key2.setExperimenterId(Uint32.valueOf(42L));
public void testEquals() {
MatchEntrySerializerKey<?, ?> key1;
MatchEntrySerializerKey<?, ?> key2;
- key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPort.class);
- key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPort.class);
+ key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.VALUE, InPort.VALUE);
+ key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.VALUE, InPort.VALUE);
Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));
Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));
Uint32 expId1 = Uint32.valueOf(987654331L);
key1.setExperimenterId(expId1);
Assert.assertFalse("Wrong equal by experimenterId", key1.equals(key2));
- key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, null, InPort.class);
+ key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, null, InPort.VALUE);
key1.setExperimenterId(expId2);
Assert.assertFalse("Wrong equal by oxmClass", key1.equals(key2));
- key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, null, InPort.class);
+ key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, null, InPort.VALUE);
key2.setExperimenterId(expId2);
Assert.assertTrue("Wrong equal by oxmClass", key1.equals(key2));
- key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, null);
+ key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.VALUE, null);
key1.setExperimenterId(expId2);
Assert.assertFalse("Wrong equal by oxmField", key1.equals(key2));
- key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, null);
+ key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.VALUE, null);
key2.setExperimenterId(expId2);
Assert.assertTrue("Wrong equal by oxmField", key1.equals(key2));
}
@Test
public void testToString() {
MatchEntrySerializerKey<?, ?> key1;
- key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPort.class);
+ key1 = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.VALUE, InPort.VALUE);
- Assert.assertEquals("Wrong toString()", "msgVersion: 4 objectType: org.opendaylight.yang.gen.v1.urn"
- + ".opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry"
- + " oxm_class: org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225"
- + ".OpenflowBasicClass oxm_field: org.opendaylight.yang.gen.v1.urn.opendaylight.openflow"
- + ".oxm.rev150225.InPort experimenterID: null", key1.toString());
+ Assert.assertEquals("Wrong toString()", """
+ msgVersion: 4 objectType: org.opendaylight.yang.gen.v1.urn\
+ .opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry \
+ oxm_class: org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225\
+ .OpenflowBasicClass oxm_field: org.opendaylight.yang.gen.v1.urn.opendaylight.openflow\
+ .oxm.rev150225.InPort experimenterID: null""", key1.toString());
}
}
@Test
public void test() {
ExperimenterActionSerializerKey key1 =
- new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, TestSubType.class);
+ new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, TestSubType.VALUE);
ExperimenterActionSerializerKey key2 =
- new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, TestSubType.class);
+ new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, TestSubType.VALUE);
Assert.assertTrue("Wrong equals", key1.equals(key2));
Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode());
- key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_3, FORTY_TWO, TestSubType.class);
+ key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_3, FORTY_TWO, TestSubType.VALUE);
Assert.assertFalse("Wrong equals", key1.equals(key2));
Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
- key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, (Uint32) null, TestSubType.class);
+ key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, (Uint32) null, TestSubType.VALUE);
Assert.assertFalse("Wrong equals", key1.equals(key2));
Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
- key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FIFTY_FIVE, TestSubType.class);
+ key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FIFTY_FIVE, TestSubType.VALUE);
Assert.assertFalse("Wrong equals", key1.equals(key2));
Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FIFTY_FIVE, null);
Assert.assertFalse("Wrong equals", key1.equals(key2));
Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
- key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FIFTY_FIVE, TestSubType2.class);
+ key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FIFTY_FIVE, TestSubType2.VALUE);
Assert.assertFalse("Wrong equals", key1.equals(key2));
Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
}
ExperimenterActionSerializerKey key2;
key1 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, null);
Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));
- key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, TestSubType2.class);
+ key2 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, TestSubType2.VALUE);
Assert.assertFalse("Wrong equal by actionSubType.", key1.equals(key2));
- key1 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, TestSubType.class);
+ key1 = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, FORTY_TWO, TestSubType.VALUE);
Assert.assertFalse("Wrong equal by actionSubType.", key1.equals(key2));
}
private interface TestSubType extends ExperimenterActionSubType {
+ TestSubType VALUE = () -> TestSubType.class;
+
+ @Override
+ Class<? extends TestSubType> implementedInterface();
// empty class - only used in test for comparation
}
private interface TestSubType2 extends ExperimenterActionSubType {
- // empty class - only used in test for comparation
+ TestSubType2 VALUE = () -> TestSubType2.class;
+
+ @Override
+ Class<? extends TestSubType2> implementedInterface();
}
}
<artifactId>org.osgi.service.component.annotations</artifactId>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
try {
address = getInetAddress(config.getAddress());
} catch (UnknownHostException e) {
- throw new RuntimeException(e);
+ throw new IllegalStateException(e);
}
}
*/
public abstract class AbstractOxmMatchEntryDeserializer
implements HeaderDeserializer<MatchEntry>, OFDeserializer<MatchEntry> {
- private final @NonNull Class<? extends OxmClassBase> oxmClass;
- private final @NonNull Class<? extends MatchField> oxmField;
+ private final @NonNull OxmClassBase oxmClass;
+ private final @NonNull MatchField oxmField;
- protected AbstractOxmMatchEntryDeserializer(final Class<? extends OxmClassBase> oxmClass,
- final Class<? extends MatchField> oxmField) {
+ protected AbstractOxmMatchEntryDeserializer(final OxmClassBase oxmClass,
+ final MatchField oxmField) {
this.oxmClass = requireNonNull(oxmClass);
this.oxmField = requireNonNull(oxmField);
}
- protected AbstractOxmMatchEntryDeserializer(final Class<? extends MatchField> oxmField) {
- this(OpenflowBasicClass.class, oxmField);
+ protected AbstractOxmMatchEntryDeserializer(final MatchField oxmField) {
+ this(OpenflowBasicClass.VALUE, oxmField);
}
@Override
*/
public class OxmArpOpDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmArpOpDeserializer() {
- super(ArpOp.class);
+ super(ArpOp.VALUE);
}
@Override
*/
public class OxmArpShaDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmArpShaDeserializer() {
- super(ArpSha.class);
+ super(ArpSha.VALUE);
}
@Override
*/
public class OxmArpSpaDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmArpSpaDeserializer() {
- super(ArpSpa.class);
+ super(ArpSpa.VALUE);
}
-
@Override
protected void deserialize(final ByteBuf input, final MatchEntryBuilder builder) {
final ArpSpaBuilder arpBuilder = new ArpSpaBuilder()
*/
public class OxmArpThaDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmArpThaDeserializer() {
- super(ArpTha.class);
+ super(ArpTha.VALUE);
}
@Override
*/
public class OxmArpTpaDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmArpTpaDeserializer() {
- super(ArpTpa.class);
+ super(ArpTpa.VALUE);
}
@Override
*/
public class OxmEthDstDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmEthDstDeserializer() {
- super(EthDst.class);
+ super(EthDst.VALUE);
}
@Override
*/
public class OxmEthSrcDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmEthSrcDeserializer() {
- super(EthSrc.class);
+ super(EthSrc.VALUE);
}
@Override
*/
public class OxmEthTypeDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmEthTypeDeserializer() {
- super(EthType.class);
+ super(EthType.VALUE);
}
@Override
*/
public class OxmIcmpv4CodeDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmIcmpv4CodeDeserializer() {
- super(Icmpv4Code.class);
+ super(Icmpv4Code.VALUE);
}
@Override
*/
public class OxmIcmpv4TypeDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmIcmpv4TypeDeserializer() {
- super(Icmpv4Type.class);
+ super(Icmpv4Type.VALUE);
}
@Override
*/
public class OxmIcmpv6CodeDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmIcmpv6CodeDeserializer() {
- super(Icmpv6Code.class);
+ super(Icmpv6Code.VALUE);
}
@Override
*/
public class OxmIcmpv6TypeDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmIcmpv6TypeDeserializer() {
- super(Icmpv6Type.class);
+ super(Icmpv6Type.VALUE);
}
@Override
*/
public class OxmInPhyPortDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmInPhyPortDeserializer() {
- super(InPhyPort.class);
+ super(InPhyPort.VALUE);
}
@Override
*/
public class OxmInPortDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmInPortDeserializer() {
- super(InPort.class);
+ super(InPort.VALUE);
}
@Override
*/
public class OxmIpDscpDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmIpDscpDeserializer() {
- super(IpDscp.class);
+ super(IpDscp.VALUE);
}
@Override
*/
public class OxmIpEcnDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmIpEcnDeserializer() {
- super(IpEcn.class);
+ super(IpEcn.VALUE);
}
@Override
*/
public class OxmIpProtoDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmIpProtoDeserializer() {
- super(IpProto.class);
+ super(IpProto.VALUE);
}
@Override
*/
public class OxmIpv4DstDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmIpv4DstDeserializer() {
- super(Ipv4Dst.class);
+ super(Ipv4Dst.VALUE);
}
@Override
*/
public class OxmIpv4SrcDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmIpv4SrcDeserializer() {
- super(Ipv4Src.class);
+ super(Ipv4Src.VALUE);
}
@Override
*/
public class OxmIpv6DstDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmIpv6DstDeserializer() {
- super(Ipv6Dst.class);
+ super(Ipv6Dst.VALUE);
}
@Override
*/
public class OxmIpv6ExtHdrDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmIpv6ExtHdrDeserializer() {
- super(Ipv6Exthdr.class);
+ super(Ipv6Exthdr.VALUE);
}
@Override
*/
public class OxmIpv6FlabelDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmIpv6FlabelDeserializer() {
- super(Ipv6Flabel.class);
+ super(Ipv6Flabel.VALUE);
}
@Override
*/
public class OxmIpv6NdSllDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmIpv6NdSllDeserializer() {
- super(Ipv6NdSll.class);
+ super(Ipv6NdSll.VALUE);
}
@Override
*/
public class OxmIpv6NdTargetDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmIpv6NdTargetDeserializer() {
- super(Ipv6NdTarget.class);
+ super(Ipv6NdTarget.VALUE);
}
@Override
*/
public class OxmIpv6NdTllDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmIpv6NdTllDeserializer() {
- super(Ipv6NdTll.class);
+ super(Ipv6NdTll.VALUE);
}
@Override
*/
public class OxmIpv6SrcDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmIpv6SrcDeserializer() {
- super(Ipv6Src.class);
+ super(Ipv6Src.VALUE);
}
@Override
*/
public class OxmMetadataDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmMetadataDeserializer() {
- super(Metadata.class);
+ super(Metadata.VALUE);
}
@Override
*/
public class OxmMplsBosDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmMplsBosDeserializer() {
- super(MplsBos.class);
+ super(MplsBos.VALUE);
}
@Override
*/
public class OxmMplsLabelDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmMplsLabelDeserializer() {
- super(MplsLabel.class);
+ super(MplsLabel.VALUE);
}
@Override
*/
public class OxmMplsTcDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmMplsTcDeserializer() {
- super(MplsTc.class);
+ super(MplsTc.VALUE);
}
@Override
public class OxmPacketTypeDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmPacketTypeDeserializer() {
- super(PacketType.class);
+ super(PacketType.VALUE);
}
@Override
*/
public class OxmPbbIsidDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmPbbIsidDeserializer() {
- super(PbbIsid.class);
+ super(PbbIsid.VALUE);
}
@Override
*/
public class OxmSctpDstDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmSctpDstDeserializer() {
- super(SctpDst.class);
+ super(SctpDst.VALUE);
}
@Override
*/
public class OxmSctpSrcDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmSctpSrcDeserializer() {
- super(SctpSrc.class);
+ super(SctpSrc.VALUE);
}
@Override
*/
public class OxmTcpDstDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmTcpDstDeserializer() {
- super(TcpDst.class);
+ super(TcpDst.VALUE);
}
@Override
*/
public class OxmTcpSrcDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmTcpSrcDeserializer() {
- super(TcpSrc.class);
+ super(TcpSrc.VALUE);
}
@Override
*/
public class OxmTunnelIdDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmTunnelIdDeserializer() {
- super(TunnelId.class);
+ super(TunnelId.VALUE);
}
@Override
*/
public class OxmUdpDstDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmUdpDstDeserializer() {
- super(UdpDst.class);
+ super(UdpDst.VALUE);
}
@Override
*/
public class OxmUdpSrcDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmUdpSrcDeserializer() {
- super(UdpSrc.class);
+ super(UdpSrc.VALUE);
}
@Override
*/
public class OxmVlanPcpDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmVlanPcpDeserializer() {
- super(VlanPcp.class);
+ super(VlanPcp.VALUE);
}
@Override
*/
public class OxmVlanVidDeserializer extends AbstractOxmMatchEntryDeserializer {
public OxmVlanVidDeserializer() {
- super(VlanVid.class);
+ super(VlanVid.VALUE);
}
@Override
public abstract class AbstractOxmExperimenterMatchEntryDeserializer<F extends MatchField>
extends AbstractOxmMatchEntryDeserializer {
- protected AbstractOxmExperimenterMatchEntryDeserializer(final Class<? extends MatchField> oxmField) {
- super(ExperimenterClass.class, oxmField);
+ protected AbstractOxmExperimenterMatchEntryDeserializer(final MatchField oxmField) {
+ super(ExperimenterClass.VALUE, oxmField);
}
protected ExperimenterIdCaseBuilder createExperimenterIdCase(final MatchEntryBuilder entryBuilder,
*/
public class OnfOxmTcpFlagsDeserializer extends AbstractOxmExperimenterMatchEntryDeserializer<TcpFlags> {
public OnfOxmTcpFlagsDeserializer() {
- super(TcpFlags.class);
+ super(TcpFlags.VALUE);
}
@Override
*/
public static void registerMatchEntrySerializers(final SerializerRegistry serializerRegistry) {
// register OF v1.3 OpenflowBasicClass match entry serializers
- Class<OpenflowBasicClass> oxmClass = OpenflowBasicClass.class;
+ OpenflowBasicClass oxmClass = OpenflowBasicClass.VALUE;
MatchEntrySerializerRegistryHelper<OpenflowBasicClass> helper =
new MatchEntrySerializerRegistryHelper<>(EncodeConstants.OF_VERSION_1_3,
oxmClass, serializerRegistry);
- helper.registerSerializer(InPort.class, new OxmInPortSerializer());
- helper.registerSerializer(InPhyPort.class, new OxmInPhyPortSerializer());
- helper.registerSerializer(Metadata.class, new OxmMetadataSerializer());
- helper.registerSerializer(PacketType.class, new OxmPacketTypeSerializer());
- helper.registerSerializer(EthDst.class, new OxmEthDstSerializer());
- helper.registerSerializer(EthSrc.class, new OxmEthSrcSerializer());
- helper.registerSerializer(EthType.class, new OxmEthTypeSerializer());
- helper.registerSerializer(VlanVid.class, new OxmVlanVidSerializer());
- helper.registerSerializer(VlanPcp.class, new OxmVlanPcpSerializer());
- helper.registerSerializer(IpDscp.class, new OxmIpDscpSerializer());
- helper.registerSerializer(IpEcn.class, new OxmIpEcnSerializer());
- helper.registerSerializer(IpProto.class, new OxmIpProtoSerializer());
- helper.registerSerializer(Ipv4Src.class, new OxmIpv4SrcSerializer());
- helper.registerSerializer(Ipv4Dst.class, new OxmIpv4DstSerializer());
- helper.registerSerializer(TcpSrc.class, new OxmTcpSrcSerializer());
- helper.registerSerializer(TcpDst.class, new OxmTcpDstSerializer());
- helper.registerSerializer(UdpSrc.class, new OxmUdpSrcSerializer());
- helper.registerSerializer(UdpDst.class, new OxmUdpDstSerializer());
- helper.registerSerializer(SctpSrc.class, new OxmSctpSrcSerializer());
- helper.registerSerializer(SctpDst.class, new OxmSctpDstSerializer());
- helper.registerSerializer(Icmpv4Type.class, new OxmIcmpv4TypeSerializer());
- helper.registerSerializer(Icmpv4Code.class, new OxmIcmpv4CodeSerializer());
- helper.registerSerializer(ArpOp.class, new OxmArpOpSerializer());
- helper.registerSerializer(ArpSpa.class, new OxmArpSpaSerializer());
- helper.registerSerializer(ArpTpa.class, new OxmArpTpaSerializer());
- helper.registerSerializer(ArpSha.class, new OxmArpShaSerializer());
- helper.registerSerializer(ArpTha.class, new OxmArpThaSerializer());
- helper.registerSerializer(Ipv6Src.class, new OxmIpv6SrcSerializer());
- helper.registerSerializer(Ipv6Dst.class, new OxmIpv6DstSerializer());
- helper.registerSerializer(Ipv6Flabel.class, new OxmIpv6FlabelSerializer());
- helper.registerSerializer(Icmpv6Type.class, new OxmIcmpv6TypeSerializer());
- helper.registerSerializer(Icmpv6Code.class, new OxmIcmpv6CodeSerializer());
- helper.registerSerializer(Ipv6NdTarget.class, new OxmIpv6NdTargetSerializer());
- helper.registerSerializer(Ipv6NdSll.class, new OxmIpv6NdSllSerializer());
- helper.registerSerializer(Ipv6NdTll.class, new OxmIpv6NdTllSerializer());
- helper.registerSerializer(MplsLabel.class, new OxmMplsLabelSerializer());
- helper.registerSerializer(MplsTc.class, new OxmMplsTcSerializer());
- helper.registerSerializer(MplsBos.class, new OxmMplsBosSerializer());
- helper.registerSerializer(PbbIsid.class, new OxmPbbIsidSerializer());
- helper.registerSerializer(TunnelId.class, new OxmTunnelIdSerializer());
- helper.registerSerializer(Ipv6Exthdr.class, new OxmIpv6ExtHdrSerializer());
+ helper.registerSerializer(InPort.VALUE, new OxmInPortSerializer());
+ helper.registerSerializer(InPhyPort.VALUE, new OxmInPhyPortSerializer());
+ helper.registerSerializer(Metadata.VALUE, new OxmMetadataSerializer());
+ helper.registerSerializer(PacketType.VALUE, new OxmPacketTypeSerializer());
+ helper.registerSerializer(EthDst.VALUE, new OxmEthDstSerializer());
+ helper.registerSerializer(EthSrc.VALUE, new OxmEthSrcSerializer());
+ helper.registerSerializer(EthType.VALUE, new OxmEthTypeSerializer());
+ helper.registerSerializer(VlanVid.VALUE, new OxmVlanVidSerializer());
+ helper.registerSerializer(VlanPcp.VALUE, new OxmVlanPcpSerializer());
+ helper.registerSerializer(IpDscp.VALUE, new OxmIpDscpSerializer());
+ helper.registerSerializer(IpEcn.VALUE, new OxmIpEcnSerializer());
+ helper.registerSerializer(IpProto.VALUE, new OxmIpProtoSerializer());
+ helper.registerSerializer(Ipv4Src.VALUE, new OxmIpv4SrcSerializer());
+ helper.registerSerializer(Ipv4Dst.VALUE, new OxmIpv4DstSerializer());
+ helper.registerSerializer(TcpSrc.VALUE, new OxmTcpSrcSerializer());
+ helper.registerSerializer(TcpDst.VALUE, new OxmTcpDstSerializer());
+ helper.registerSerializer(UdpSrc.VALUE, new OxmUdpSrcSerializer());
+ helper.registerSerializer(UdpDst.VALUE, new OxmUdpDstSerializer());
+ helper.registerSerializer(SctpSrc.VALUE, new OxmSctpSrcSerializer());
+ helper.registerSerializer(SctpDst.VALUE, new OxmSctpDstSerializer());
+ helper.registerSerializer(Icmpv4Type.VALUE, new OxmIcmpv4TypeSerializer());
+ helper.registerSerializer(Icmpv4Code.VALUE, new OxmIcmpv4CodeSerializer());
+ helper.registerSerializer(ArpOp.VALUE, new OxmArpOpSerializer());
+ helper.registerSerializer(ArpSpa.VALUE, new OxmArpSpaSerializer());
+ helper.registerSerializer(ArpTpa.VALUE, new OxmArpTpaSerializer());
+ helper.registerSerializer(ArpSha.VALUE, new OxmArpShaSerializer());
+ helper.registerSerializer(ArpTha.VALUE, new OxmArpThaSerializer());
+ helper.registerSerializer(Ipv6Src.VALUE, new OxmIpv6SrcSerializer());
+ helper.registerSerializer(Ipv6Dst.VALUE, new OxmIpv6DstSerializer());
+ helper.registerSerializer(Ipv6Flabel.VALUE, new OxmIpv6FlabelSerializer());
+ helper.registerSerializer(Icmpv6Type.VALUE, new OxmIcmpv6TypeSerializer());
+ helper.registerSerializer(Icmpv6Code.VALUE, new OxmIcmpv6CodeSerializer());
+ helper.registerSerializer(Ipv6NdTarget.VALUE, new OxmIpv6NdTargetSerializer());
+ helper.registerSerializer(Ipv6NdSll.VALUE, new OxmIpv6NdSllSerializer());
+ helper.registerSerializer(Ipv6NdTll.VALUE, new OxmIpv6NdTllSerializer());
+ helper.registerSerializer(MplsLabel.VALUE, new OxmMplsLabelSerializer());
+ helper.registerSerializer(MplsTc.VALUE, new OxmMplsTcSerializer());
+ helper.registerSerializer(MplsBos.VALUE, new OxmMplsBosSerializer());
+ helper.registerSerializer(PbbIsid.VALUE, new OxmPbbIsidSerializer());
+ helper.registerSerializer(TunnelId.VALUE, new OxmTunnelIdSerializer());
+ helper.registerSerializer(Ipv6Exthdr.VALUE, new OxmIpv6ExtHdrSerializer());
// Register approved openflow match entry serializers
- helper.registerExperimenterSerializer(TcpFlags.class, EncodeConstants.ONF_EXPERIMENTER_ID,
+ helper.registerExperimenterSerializer(TcpFlags.VALUE, EncodeConstants.ONF_EXPERIMENTER_ID,
new OnfOxmTcpFlagsSerializer());
}
}
.getMatchEntry().get(0);
MatchEntrySerializerKey<?, ?> key = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3, entry.getOxmClass(), entry.getOxmMatchField());
- if (entry.getOxmClass().equals(ExperimenterClass.class)) {
+ if (ExperimenterClass.VALUE.equals(entry.getOxmClass())) {
ExperimenterIdCase experimenterIdCase = (ExperimenterIdCase) entry.getMatchEntryValue();
key.setExperimenterId(experimenterIdCase.getExperimenter().getExperimenter().getValue());
} else {
experimenterBand.augmentation(ExperimenterIdMeterBand.class);
if (expIdMeterBand != null) {
Uint32 expId = expIdMeterBand.getExperimenter().getValue();
- Class<? extends ExperimenterMeterBandSubType> meterBandSubType = expIdMeterBand.getSubType();
+ ExperimenterMeterBandSubType meterBandSubType = expIdMeterBand.getSubType();
try {
OFSerializer<MeterBandExperimenterCase> serializer = registry.getSerializer(
ExperimenterSerializerKeyFactory.createMeterBandSerializerKey(
int length = input.readUnsignedShort();
switch (type) {
case 0:
- builder.setType(StandardMatchType.class);
+ builder.setType(StandardMatchType.VALUE);
break;
case 1:
- builder.setType(OxmMatchType.class);
+ builder.setType(OxmMatchType.VALUE);
break;
default:
break;
@Override
public void injectDeserializerRegistry(final DeserializerRegistry deserializerRegistry) {
- this.registry = deserializerRegistry;
+ registry = deserializerRegistry;
}
}
public class MatchEntrySerializerRegistryHelper<C extends OxmClassBase> {
private final Uint8 version;
- private final Class<C> generalClass;
+ private final C generalClass;
private final SerializerRegistry serializerRegistry;
/**
* @param generalClass class that will be used for match entry serializer registration
* @param serializerRegistry registry to be filled with message serializers
*/
- public MatchEntrySerializerRegistryHelper(final Uint8 version, final Class<C> generalClass,
+ public MatchEntrySerializerRegistryHelper(final Uint8 version, final C generalClass,
final SerializerRegistry serializerRegistry) {
this.version = requireNonNull(version);
this.generalClass = generalClass;
* @param serializer the serializer instance
*/
public <F extends MatchField> void registerSerializer(
- final Class<F> specificClass, final OFGeneralSerializer serializer) {
+ final F specificClass, final OFGeneralSerializer serializer) {
MatchEntrySerializerKey<?, ?> key = new MatchEntrySerializerKey<>(version, generalClass, specificClass);
key.setExperimenterId(null);
serializerRegistry.registerSerializer(key, serializer);
* @param serializer the serializer instance
*/
public <F extends MatchField> void registerExperimenterSerializer(
- final Class<F> specificClass, final Uint32 expId, final OFGeneralSerializer serializer) {
+ final F specificClass, final Uint32 expId, final OFGeneralSerializer serializer) {
MatchEntrySerializerKey<?, ?> key = new MatchEntrySerializerKey<>(
- version, ExperimenterClass.class, specificClass);
+ version, ExperimenterClass.VALUE, specificClass);
key.setExperimenterId(expId);
serializerRegistry.registerSerializer(key, serializer);
}
}
private static void serializeType(final Match match, final ByteBuf out) {
- if (match.getType().isAssignableFrom(StandardMatchType.class)) {
+ if (match.getType() instanceof StandardMatchType) {
out.writeShort(STANDARD_MATCH_TYPE_CODE);
- } else if (match.getType().isAssignableFrom(OxmMatchType.class)) {
+ } else if (match.getType() instanceof OxmMatchType) {
out.writeShort(OXM_MATCH_TYPE_CODE);
}
}
MatchEntrySerializerKey<?, ?> key = new MatchEntrySerializerKey<>(
EncodeConstants.OF_VERSION_1_3, entry.getOxmClass(), entry.getOxmMatchField());
- if (entry.getOxmClass().equals(ExperimenterClass.class)) {
+ if (ExperimenterClass.VALUE.equals(entry.getOxmClass())) {
ExperimenterIdCase entryValue = (ExperimenterIdCase) entry.getMatchEntryValue();
key.setExperimenterId(entryValue.getExperimenter().getExperimenter().getValue());
} else {
@Override
public void injectSerializerRegistry(final SerializerRegistry serializerRegistry) {
- this.registry = serializerRegistry;
+ registry = serializerRegistry;
}
}
MatchEntrySerializerKey<?, ?> key;
key = new MatchEntrySerializerKey<>(getVersion(), entry.getOxmClass(),
entry.getOxmMatchField());
- if (entry.getOxmClass().equals(ExperimenterClass.class)) {
+ if (ExperimenterClass.VALUE.equals(entry.getOxmClass())) {
ExperimenterIdCase entryValue = (ExperimenterIdCase) entry.getMatchEntryValue();
key.setExperimenterId(entryValue.getExperimenter().getExperimenter().getValue());
return key;
public void testUnregisterExistingKeys() throws UnknownHostException {
startUp(TransportProtocol.TCP);
// -- registerActionSerializer
- final ExperimenterActionSerializerKey key1
- = new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42),
- TestSubType.class);
+ final ExperimenterActionSerializerKey key1 =
+ new ExperimenterActionSerializerKey(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42), TestSubType.VALUE);
provider.registerActionSerializer(key1, serializer);
Assert.assertTrue("Wrong -- unregister ActionSerializer", provider.unregisterSerializer(key1));
Assert.assertFalse("Wrong -- unregister ActionSerializer by not existing key",
Assert.assertFalse("Wrong -- unregister ActionDeserializer by not existing key",
provider.unregisterDeserializer(key2));
// -- registerInstructionSerializer
- final ExperimenterInstructionSerializerKey key3
- = new ExperimenterInstructionSerializerKey(EncodeConstants.OF_VERSION_1_0, 42L);
+ final ExperimenterInstructionSerializerKey key3 =
+ new ExperimenterInstructionSerializerKey(EncodeConstants.OF_VERSION_1_0, 42L);
provider.registerInstructionSerializer(key3, serializer);
Assert.assertTrue("Wrong -- unregister InstructionSerializer", provider.unregisterSerializer(key3));
Assert.assertFalse("Wrong -- unregister InstructionSerializer by not existing key",
provider.unregisterSerializer(key3));
// -- registerInstructionDeserializer
- final ExperimenterInstructionDeserializerKey key4
- = new ExperimenterInstructionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 42L);
+ final ExperimenterInstructionDeserializerKey key4 =
+ new ExperimenterInstructionDeserializerKey(EncodeConstants.OF_VERSION_1_0, 42L);
provider.registerInstructionDeserializer(key4, deserializer);
Assert.assertTrue("Wrong -- unregister InstructionDeserializer", provider.unregisterDeserializer(key4));
Assert.assertFalse("Wrong -- unregister InstructionDeserializer by not existing key",
provider.unregisterDeserializer(key4));
// -- registerMatchEntryDeserializer
- final MatchEntryDeserializerKey key5
- = new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_0, 0x8000, 42);
+ final MatchEntryDeserializerKey key5 =
+ new MatchEntryDeserializerKey(EncodeConstants.OF_VERSION_1_0, 0x8000, 42);
provider.registerMatchEntryDeserializer(key5, deserializer);
Assert.assertTrue("Wrong -- unregister MatchEntryDeserializer", provider.unregisterDeserializer(key5));
Assert.assertFalse("Wrong -- unregister MatchEntryDeserializer by not existing key",
Assert.assertFalse("Wrong -- unregister MeterBandDeserializer by not existing key",
provider.unregisterDeserializer(key11));
// -- registerExperimenterMessageSerializer
- ExperimenterIdSerializerKey<ExperimenterDataOfChoice> key12
- = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42),
- ExperimenterDataOfChoice.class);
+ ExperimenterIdSerializerKey<ExperimenterDataOfChoice> key12 =
+ new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42),
+ ExperimenterDataOfChoice.class);
provider.registerExperimenterMessageSerializer(key12, serializerExperimenterInput);
Assert.assertTrue("Wrong -- unregister ExperimenterMessageSerializer", provider.unregisterSerializer(key12));
Assert.assertFalse("Wrong -- unregister ExperimenterMessageSerializer by not existing key",
provider.unregisterSerializer(key12));
//registerMultipartRequestSerializer
- ExperimenterIdSerializerKey<ExperimenterDataOfChoice> key13
- = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42),
- ExperimenterDataOfChoice.class);
+ ExperimenterIdSerializerKey<ExperimenterDataOfChoice> key13 =
+ new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42),
+ ExperimenterDataOfChoice.class);
provider.registerMultipartRequestSerializer(key13, serializerMultipartRequestExpCase);
Assert.assertTrue("Wrong -- unregister MultipartRequestSerializer", provider.unregisterSerializer(key13));
Assert.assertFalse("Wrong -- unregister MultipartRequestSerializer by not existing key",
provider.unregisterSerializer(key13));
// -- registerMultipartRequestTFSerializer
- final ExperimenterIdSerializerKey<TableFeatureProperties> key14
- = new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42),
- TableFeatureProperties.class);
+ final ExperimenterIdSerializerKey<TableFeatureProperties> key14 =
+ new ExperimenterIdSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42),
+ TableFeatureProperties.class);
provider.registerMultipartRequestTFSerializer(key14, serializer);
Assert.assertTrue("Wrong -- unregister MultipartRequestTFSerializer", provider.unregisterSerializer(key14));
Assert.assertFalse("Wrong -- unregister MultipartRequestTFSerializer by not existing key",
provider.unregisterSerializer(key14));
// -- registerMeterBandSerializer
- final ExperimenterIdMeterSubTypeSerializerKey<MeterBandExperimenterCase> key15
- = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42),
- MeterBandExperimenterCase.class,null);
+ final ExperimenterIdMeterSubTypeSerializerKey<MeterBandExperimenterCase> key15 =
+ new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0, Uint32.valueOf(42),
+ MeterBandExperimenterCase.class,null);
provider.registerMeterBandSerializer(key15, serializerMeterBandExpCase);
Assert.assertTrue("Wrong -- unregister MeterBandSerializer", provider.unregisterSerializer(key15));
Assert.assertFalse("Wrong -- unregister MeterBandSerializer by not existing key",
provider.unregisterSerializer(key15));
// -- registerMatchEntrySerializer
- final MatchEntrySerializerKey<OpenflowBasicClass, InPort> key16
- = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.class, InPort.class);
+ final MatchEntrySerializerKey<OpenflowBasicClass, InPort> key16 =
+ new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3, OpenflowBasicClass.VALUE, InPort.VALUE);
provider.registerMatchEntrySerializer(key16, serializer);
Assert.assertTrue("Wrong -- unregister MatchEntrySerializer", provider.unregisterSerializer(key16));
Assert.assertFalse("Wrong -- unregister MatchEntrySerializer by not existing key",
}
private interface TestSubType extends ExperimenterActionSubType {
- // empty class - only used in test for comparation
+ TestSubType VALUE = () -> TestSubType.class;
}
}
private static Match createMatch() {
MatchBuilder matchBuilder = new MatchBuilder();
- matchBuilder.setType(OxmMatchType.class);
+ matchBuilder.setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(InPhyPort.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(InPhyPort.VALUE);
entriesBuilder.setHasMask(false);
InPhyPortCaseBuilder inPhyPortCaseBuilder = new InPhyPortCaseBuilder();
InPhyPortBuilder inPhyPortBuilder = new InPhyPortBuilder();
inPhyPortCaseBuilder.setInPhyPort(inPhyPortBuilder.build());
entriesBuilder.setMatchEntryValue(inPhyPortCaseBuilder.build());
entries.add(entriesBuilder.build());
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(IpEcn.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(IpEcn.VALUE);
entriesBuilder.setHasMask(false);
IpEcnCaseBuilder ipEcnCaseBuilder = new IpEcnCaseBuilder();
IpEcnBuilder ipEcnBuilder = new IpEcnBuilder();
matchBuilder.setMatchEntry(entries);
return matchBuilder.build();
}
-
}
Assert.assertTrue("Wrong setFieldType", message.getGroupDesc().get(0).getBucketsList().get(0)
.getAction().get(1).getActionChoice() instanceof SetFieldCase);
- Assert.assertEquals("Wrong setFieldOXMClass", OpenflowBasicClass.class,
+ Assert.assertEquals("Wrong setFieldOXMClass", OpenflowBasicClass.VALUE,
((SetFieldCase) message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1)
.getActionChoice()).getSetFieldAction().getMatchEntry().get(0).getOxmClass());
- Assert.assertEquals("Wrong setFieldOXMField", InPort.class,
+ Assert.assertEquals("Wrong setFieldOXMField", InPort.VALUE,
((SetFieldCase) message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1)
.getActionChoice()).getSetFieldAction().getMatchEntry().get(0).getOxmMatchField());
public List<MatchEntry> createMatchEntries() {
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(InPhyPort.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(InPhyPort.VALUE);
entriesBuilder.setHasMask(false);
entries.add(entriesBuilder.build());
return entries;
Assert.assertEquals("Wrong cookie", Uint64.valueOf("FF01010101010101", 16), flowStats1.getCookie());
Assert.assertEquals("Wrong packetCount", Uint64.valueOf("EF01010101010101", 16), flowStats1.getPacketCount());
Assert.assertEquals("Wrong byteCount", Uint64.valueOf("7F01010101010101", 16), flowStats1.getByteCount());
- Assert.assertEquals("Wrong match type", OxmMatchType.class, flowStats1.getMatch().getType());
+ Assert.assertEquals("Wrong match type", OxmMatchType.VALUE, flowStats1.getMatch().getType());
flowStats1 = message.getFlowStats().get(1);
Assert.assertEquals("Wrong tableId", 8, flowStats1.getTableId().intValue());
Assert.assertEquals("Wrong durationSec", 9, flowStats1.getDurationSec().intValue());
Assert.assertEquals("Wrong cookie", Uint64.valueOf("FF01010101010101", 16), flowStats1.getCookie());
Assert.assertEquals("Wrong packetCount", Uint64.valueOf("EF01010101010101", 16), flowStats1.getPacketCount());
Assert.assertEquals("Wrong byteCount", Uint64.valueOf("7F01010101010101", 16), flowStats1.getByteCount());
- Assert.assertEquals("Wrong match type", OxmMatchType.class, flowStats1.getMatch().getType());
+ Assert.assertEquals("Wrong match type", OxmMatchType.VALUE, flowStats1.getMatch().getType());
}
}
OxmIpv6ExtHdrDeserializer deserializer = new OxmIpv6ExtHdrDeserializer();
MatchEntry entry = deserializer.deserialize(buffer);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass());
- Assert.assertEquals("Wrong entry field", Ipv6Exthdr.class, entry.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry.getOxmClass());
+ Assert.assertEquals("Wrong entry field", Ipv6Exthdr.VALUE, entry.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry.getHasMask());
Assert.assertEquals("Wrong entry value",
new Ipv6ExthdrFlags(true, true, true, true, true, true, true, true, true),
OxmIpv6FlabelDeserializer deserializer = new OxmIpv6FlabelDeserializer();
MatchEntry entry = deserializer.deserialize(buffer);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass());
- Assert.assertEquals("Wrong entry field", Ipv6Flabel.class, entry.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry.getOxmClass());
+ Assert.assertEquals("Wrong entry field", Ipv6Flabel.VALUE, entry.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry.getHasMask());
Assert.assertEquals("Wrong entry value", 2,
((Ipv6FlabelCase) entry.getMatchEntryValue()).getIpv6Flabel()
OxmIpv6FlabelDeserializer deserializer = new OxmIpv6FlabelDeserializer();
MatchEntry entry = deserializer.deserialize(buffer);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass());
- Assert.assertEquals("Wrong entry field", Ipv6Flabel.class, entry.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry.getOxmClass());
+ Assert.assertEquals("Wrong entry field", Ipv6Flabel.VALUE, entry.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", true, entry.getHasMask());
Assert.assertEquals("Wrong entry value", 2,
((Ipv6FlabelCase) entry.getMatchEntryValue()).getIpv6Flabel()
OxmMetadataDeserializer deserializer = new OxmMetadataDeserializer();
MatchEntry entry = deserializer.deserialize(buffer);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass());
- Assert.assertEquals("Wrong entry field", Metadata.class, entry.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry.getOxmClass());
+ Assert.assertEquals("Wrong entry field", Metadata.VALUE, entry.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry.getHasMask());
Assert.assertArrayEquals("Wrong entry value", ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 03"),
((MetadataCase) entry.getMatchEntryValue()).getMetadata().getMetadata());
OxmMplsBosDeserializer deserializer = new OxmMplsBosDeserializer();
MatchEntry entry = deserializer.deserialize(buffer);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass());
- Assert.assertEquals("Wrong entry field", MplsBos.class, entry.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry.getOxmClass());
+ Assert.assertEquals("Wrong entry field", MplsBos.VALUE, entry.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry.getHasMask());
Assert.assertEquals("Wrong entry value", false,
((MplsBosCase) entry.getMatchEntryValue()).getMplsBos().getBos());
OxmPacketTypeDeserializer deserializer = new OxmPacketTypeDeserializer();
MatchEntry entry = deserializer.deserialize(buffer);
- Assert.assertEquals(OpenflowBasicClass.class, entry.getOxmClass());
- Assert.assertEquals(PacketType.class, entry.getOxmMatchField());
- Assert.assertEquals(false, entry.getHasMask());
+ Assert.assertEquals(OpenflowBasicClass.VALUE, entry.getOxmClass());
+ Assert.assertEquals(PacketType.VALUE, entry.getOxmMatchField());
+ Assert.assertFalse(entry.getHasMask());
PacketTypeCase packetTypeCase = (PacketTypeCase) entry.getMatchEntryValue();
Assert.assertEquals(0x1894f, packetTypeCase.getPacketType().getPacketType().longValue());
OxmPbbIsidDeserializer deserializer = new OxmPbbIsidDeserializer();
MatchEntry entry = deserializer.deserialize(buffer);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass());
- Assert.assertEquals("Wrong entry field", PbbIsid.class, entry.getOxmMatchField());
- Assert.assertEquals("Wrong entry hasMask", false, entry.getHasMask());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry.getOxmClass());
+ Assert.assertEquals("Wrong entry field", PbbIsid.VALUE, entry.getOxmMatchField());
+ Assert.assertFalse("Wrong entry hasMask", entry.getHasMask());
Assert.assertEquals("Wrong entry value", 2, ((PbbIsidCase) entry.getMatchEntryValue())
.getPbbIsid().getIsid().intValue());
}
OxmVlanVidDeserializer deserializer = new OxmVlanVidDeserializer();
MatchEntry entry = deserializer.deserialize(buffer);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass());
- Assert.assertEquals("Wrong entry field", VlanVid.class, entry.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry.getOxmClass());
+ Assert.assertEquals("Wrong entry field", VlanVid.VALUE, entry.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry.getHasMask());
Assert.assertEquals("Wrong entry value", 10,
((VlanVidCase) entry.getMatchEntryValue()).getVlanVid().getVlanVid().intValue());
expBuilder.setExperimenter(new ExperimenterId(experimenterId));
expCaseBuilder.setExperimenter(expBuilder.build());
MatchEntryBuilder meb = new MatchEntryBuilder();
- meb.setOxmClass(ExperimenterClass.class);
- meb.setOxmMatchField(OxmMatchFieldClass.class);
+ meb.setOxmClass(ExperimenterClass.VALUE);
+ meb.setOxmMatchField(OxmMatchFieldClass.VALUE);
meb.setMatchEntryValue(expCaseBuilder.build());
List<MatchEntry> matchEntry = new ArrayList<>();
MatchEntry me = meb.build();
caseBuilder.setSetFieldAction(setFieldBuilder.build());
actionBuilder.setActionChoice(caseBuilder.build());
MatchEntrySerializerKey<?, ?> key = new MatchEntrySerializerKey<>(
- EncodeConstants.OF_VERSION_1_3, ExperimenterClass.class, OxmMatchFieldClass.class);
+ EncodeConstants.OF_VERSION_1_3, ExperimenterClass.VALUE, OxmMatchFieldClass.VALUE);
key.setExperimenterId(experimenterId);
registry.registerSerializer(key, serializerMock);
ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
builder.setOutGroup(Uint32.valueOf(98));
builder.setFlags(new FlowModFlags(true, false, true, false, true));
MatchBuilder matchBuilder = new MatchBuilder();
- matchBuilder.setType(OxmMatchType.class);
+ matchBuilder.setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(InPhyPort.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(InPhyPort.VALUE);
entriesBuilder.setHasMask(false);
InPhyPortCaseBuilder inPhyPortCaseBuilder = new InPhyPortCaseBuilder();
InPhyPortBuilder inPhyPortBuilder = new InPhyPortBuilder();
inPhyPortCaseBuilder.setInPhyPort(inPhyPortBuilder.build());
entriesBuilder.setMatchEntryValue(inPhyPortCaseBuilder.build());
entries.add(entriesBuilder.build());
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(IpEcn.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(IpEcn.VALUE);
entriesBuilder.setHasMask(false);
IpEcnCaseBuilder ipEcnCaseBuilder = new IpEcnCaseBuilder();
IpEcnBuilder ipEcnBuilder = new IpEcnBuilder();
builder.setPacketCount(Uint64.valueOf(1234));
builder.setByteCount(Uint64.valueOf(1234));
MatchBuilder matchBuilder = new MatchBuilder();
- matchBuilder.setType(OxmMatchType.class);
+ matchBuilder.setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(InPhyPort.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(InPhyPort.VALUE);
entriesBuilder.setHasMask(false);
InPhyPortCaseBuilder inPhyPortCaseBuilder = new InPhyPortCaseBuilder();
InPhyPortBuilder inPhyPortBuilder = new InPhyPortBuilder();
inPhyPortCaseBuilder.setInPhyPort(inPhyPortBuilder.build());
entriesBuilder.setMatchEntryValue(inPhyPortCaseBuilder.build());
entries.add(entriesBuilder.build());
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(IpEcn.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(IpEcn.VALUE);
entriesBuilder.setHasMask(false);
IpEcnCaseBuilder ipEcnCaseBuilder = new IpEcnCaseBuilder();
IpEcnBuilder ipEcnBuilder = new IpEcnBuilder();
propBuilder = new TableFeaturePropertiesBuilder();
propBuilder.setType(TableFeaturesPropType.OFPTFPTMATCH);
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(InPhyPort.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(InPhyPort.VALUE);
entriesBuilder.setHasMask(false);
List<MatchEntry> entries = new ArrayList<>();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(InPort.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(InPort.VALUE);
entriesBuilder.setHasMask(false);
entries.add(entriesBuilder.build());
propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build());
propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYSETFIELD);
entries = new ArrayList<>();
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(IpProto.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(IpProto.VALUE);
entriesBuilder.setHasMask(false);
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(IpEcn.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(IpEcn.VALUE);
entriesBuilder.setHasMask(false);
entries.add(entriesBuilder.build());
propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build());
builder.setPacketCount(Uint64.valueOf(1234));
builder.setByteCount(Uint64.valueOf(1234));
MatchBuilder matchBuilder = new MatchBuilder();
- matchBuilder.setType(OxmMatchType.class);
+ matchBuilder.setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(InPhyPort.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(InPhyPort.VALUE);
entriesBuilder.setHasMask(false);
InPhyPortCaseBuilder inPhyPortCaseBuilder = new InPhyPortCaseBuilder();
InPhyPortBuilder inPhyPortBuilder = new InPhyPortBuilder();
inPhyPortCaseBuilder.setInPhyPort(inPhyPortBuilder.build());
entriesBuilder.setMatchEntryValue(inPhyPortCaseBuilder.build());
entries.add(entriesBuilder.build());
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(IpEcn.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(IpEcn.VALUE);
entriesBuilder.setHasMask(false);
IpEcnCaseBuilder ipEcnCaseBuilder = new IpEcnCaseBuilder();
IpEcnBuilder ipEcnBuilder = new IpEcnBuilder();
builder.setTableId(new TableId(Uint32.ONE));
builder.setCookie(Uint64.valueOf("FF01040106000701", 16));
MatchBuilder matchBuilder = new MatchBuilder();
- matchBuilder.setType(OxmMatchType.class);
+ matchBuilder.setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(InPhyPort.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(InPhyPort.VALUE);
entriesBuilder.setHasMask(false);
InPhyPortCaseBuilder inPhyPortCaseBuilder = new InPhyPortCaseBuilder();
InPhyPortBuilder inPhyPortBuilder = new InPhyPortBuilder();
inPhyPortCaseBuilder.setInPhyPort(inPhyPortBuilder.build());
entriesBuilder.setMatchEntryValue(inPhyPortCaseBuilder.build());
entries.add(entriesBuilder.build());
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(IpEcn.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(IpEcn.VALUE);
entriesBuilder.setHasMask(false);
IpEcnCaseBuilder ipEcnCaseBuilder = new IpEcnCaseBuilder();
IpEcnBuilder ipEcnBuilder = new IpEcnBuilder();
propBuilder = new TableFeaturePropertiesBuilder();
propBuilder.setType(TableFeaturesPropType.OFPTFPTMATCH);
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(InPhyPort.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(InPhyPort.VALUE);
entriesBuilder.setHasMask(false);
List<MatchEntry> entries = new ArrayList<>();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(InPort.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(InPort.VALUE);
entriesBuilder.setHasMask(false);
entries.add(entriesBuilder.build());
propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build());
propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYSETFIELD);
entries = new ArrayList<>();
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(IpProto.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(IpProto.VALUE);
entriesBuilder.setHasMask(false);
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(IpEcn.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(IpEcn.VALUE);
entriesBuilder.setHasMask(false);
entries.add(entriesBuilder.build());
propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build());
assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareArpOpMatchEntry(Uint16 value) {
+ private static MatchEntryBuilder prepareArpOpMatchEntry(final Uint16 value) {
MatchEntryBuilder builder = prepareArpOpHeader(false);
ArpOpCaseBuilder casebuilder = new ArpOpCaseBuilder();
ArpOpBuilder valueBuilder = new ArpOpBuilder();
return builder;
}
- private static MatchEntryBuilder prepareArpOpHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareArpOpHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(ArpOp.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(ArpOp.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.ARP_OP, fieldAndMask >>> 1);
assertEquals("Wrong value length", EncodeConstants.MAC_ADDRESS_LENGTH, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, String value) {
+ private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final String value) {
final MatchEntryBuilder builder = prepareHeader(hasMask);
ArpShaCaseBuilder casebuilder = new ArpShaCaseBuilder();
ArpShaBuilder valueBuilder = new ArpShaBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(ArpSha.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(ArpSha.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.ARP_SHA, fieldAndMask >>> 1);
assertEquals("Wrong value length", Integer.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, String value) {
+ private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final String value) {
final MatchEntryBuilder builder = prepareHeader(hasMask);
ArpSpaCaseBuilder casebuilder = new ArpSpaCaseBuilder();
ArpSpaBuilder valueBuilder = new ArpSpaBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(ArpSpa.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(ArpSpa.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.ARP_SPA, fieldAndMask >>> 1);
assertEquals("Wrong value length", EncodeConstants.MAC_ADDRESS_LENGTH, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, String value) {
+ private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final String value) {
final MatchEntryBuilder builder = prepareHeader(hasMask);
ArpThaCaseBuilder casebuilder = new ArpThaCaseBuilder();
ArpThaBuilder valueBuilder = new ArpThaBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(ArpTha.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(ArpTha.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.ARP_THA, fieldAndMask >>> 1);
assertEquals("Wrong value length", Integer.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, String value) {
+ private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final String value) {
final MatchEntryBuilder builder = prepareHeader(hasMask);
ArpTpaCaseBuilder casebuilder = new ArpTpaCaseBuilder();
ArpTpaBuilder valueBuilder = new ArpTpaBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(ArpTpa.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(ArpTpa.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.ARP_TPA, fieldAndMask >>> 1);
assertEquals("Wrong value length", EncodeConstants.MAC_ADDRESS_LENGTH, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, String value) {
+ private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final String value) {
final MatchEntryBuilder builder = prepareHeader(hasMask);
EthDstCaseBuilder casebuilder = new EthDstCaseBuilder();
EthDstBuilder valueBuilder = new EthDstBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(EthDst.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(EthDst.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.ETH_DST, fieldAndMask >>> 1);
assertEquals("Wrong value length", EncodeConstants.MAC_ADDRESS_LENGTH, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, String value) {
+ private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final String value) {
final MatchEntryBuilder builder = prepareHeader(hasMask);
EthSrcCaseBuilder casebuilder = new EthSrcCaseBuilder();
EthSrcBuilder valueBuilder = new EthSrcBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(EthSrc.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(EthSrc.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.ETH_SRC, fieldAndMask >>> 1);
assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareEthTypeMatchEntry(Uint16 type) {
+ private static MatchEntryBuilder prepareEthTypeMatchEntry(final Uint16 type) {
MatchEntryBuilder builder = prepareEthTypeHeader(false);
EthTypeCaseBuilder casebuilder = new EthTypeCaseBuilder();
EthTypeBuilder valueBuilder = new EthTypeBuilder();
return builder;
}
- private static MatchEntryBuilder prepareEthTypeHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareEthTypeHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(EthType.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(EthType.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.ETH_TYPE, fieldAndMask >>> 1);
assertEquals("Wrong value length", Byte.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareIcmpv4CodeMatchEntry(Uint8 value) {
+ private static MatchEntryBuilder prepareIcmpv4CodeMatchEntry(final Uint8 value) {
MatchEntryBuilder builder = prepareIcmpv4CodeHeader(false);
Icmpv4CodeCaseBuilder casebuilder = new Icmpv4CodeCaseBuilder();
Icmpv4CodeBuilder valueBuilder = new Icmpv4CodeBuilder();
return builder;
}
- private static MatchEntryBuilder prepareIcmpv4CodeHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareIcmpv4CodeHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(Icmpv4Code.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(Icmpv4Code.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.ICMPV4_CODE, fieldAndMask >>> 1);
assertEquals("Wrong value length", Byte.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareIcmpv4TypeMatchEntry(Uint8 value) {
+ private static MatchEntryBuilder prepareIcmpv4TypeMatchEntry(final Uint8 value) {
MatchEntryBuilder builder = prepareIcmpv4TypeHeader(false);
Icmpv4TypeCaseBuilder casebuilder = new Icmpv4TypeCaseBuilder();
Icmpv4TypeBuilder valueBuilder = new Icmpv4TypeBuilder();
return builder;
}
- private static MatchEntryBuilder prepareIcmpv4TypeHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareIcmpv4TypeHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(Icmpv4Type.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(Icmpv4Type.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.ICMPV4_TYPE, fieldAndMask >>> 1);
assertEquals("Wrong value length", Byte.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareIcmpv6CodeMatchEntry(Uint8 value) {
+ private static MatchEntryBuilder prepareIcmpv6CodeMatchEntry(final Uint8 value) {
MatchEntryBuilder builder = prepareIcmpv6CodeHeader(false);
Icmpv6CodeCaseBuilder casebuilder = new Icmpv6CodeCaseBuilder();
Icmpv6CodeBuilder valueBuilder = new Icmpv6CodeBuilder();
return builder;
}
- private static MatchEntryBuilder prepareIcmpv6CodeHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareIcmpv6CodeHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(Icmpv6Code.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(Icmpv6Code.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.ICMPV6_CODE, fieldAndMask >>> 1);
assertEquals("Wrong value length", Byte.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareIcmpv6TypeMatchEntry(Uint8 value) {
+ private static MatchEntryBuilder prepareIcmpv6TypeMatchEntry(final Uint8 value) {
MatchEntryBuilder builder = prepareIcmpv6TypeHeader(false);
Icmpv6TypeCaseBuilder casebuilder = new Icmpv6TypeCaseBuilder();
Icmpv6TypeBuilder valueBuilder = new Icmpv6TypeBuilder();
return builder;
}
- private static MatchEntryBuilder prepareIcmpv6TypeHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareIcmpv6TypeHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(Icmpv6Type.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(Icmpv6Type.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.ICMPV6_TYPE, fieldAndMask >>> 1);
assertEquals("Wrong value length", Byte.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareIpDscpMatchEntry(Uint8 value) {
+ private static MatchEntryBuilder prepareIpDscpMatchEntry(final Uint8 value) {
MatchEntryBuilder builder = prepareIpDscpHeader(false);
IpDscpCaseBuilder casebuilder = new IpDscpCaseBuilder();
IpDscpBuilder dscpBuilder = new IpDscpBuilder();
return builder;
}
- private static MatchEntryBuilder prepareIpDscpHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareIpDscpHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(IpDscp.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(IpDscp.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.IP_DSCP, fieldAndMask >>> 1);
assertEquals("Wrong value length", Byte.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMatchEntry(Uint8 value) {
+ private static MatchEntryBuilder prepareMatchEntry(final Uint8 value) {
MatchEntryBuilder builder = prepareHeader(false);
IpProtoCaseBuilder casebuilder = new IpProtoCaseBuilder();
IpProtoBuilder protoBuilder = new IpProtoBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(IpProto.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(IpProto.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.IP_PROTO, fieldAndMask >>> 1);
assertEquals("Wrong value length", Integer.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, String value) {
+ private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final String value) {
final MatchEntryBuilder builder = prepareHeader(hasMask);
Ipv4DstCaseBuilder casebuilder = new Ipv4DstCaseBuilder();
Ipv4DstBuilder valueBuilder = new Ipv4DstBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(Ipv4Dst.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(Ipv4Dst.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.IPV4_DST, fieldAndMask >>> 1);
assertEquals("Wrong value length", Integer.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, String value) {
+ private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final String value) {
final MatchEntryBuilder builder = prepareHeader(hasMask);
Ipv4SrcCaseBuilder casebuilder = new Ipv4SrcCaseBuilder();
Ipv4SrcBuilder valueBuilder = new Ipv4SrcBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(Ipv4Src.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(Ipv4Src.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.IPV4_SRC, fieldAndMask >>> 1);
assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareIpv6ExtHdrMatchEntry(boolean hasMask, Ipv6ExthdrFlags flags) {
+ private static MatchEntryBuilder prepareIpv6ExtHdrMatchEntry(final boolean hasMask, final Ipv6ExthdrFlags flags) {
final MatchEntryBuilder builder = prepareIpv6ExtHdrHeader(hasMask);
Ipv6ExthdrCaseBuilder casebuilder = new Ipv6ExthdrCaseBuilder();
Ipv6ExthdrBuilder valueBuilder = new Ipv6ExthdrBuilder();
return builder;
}
- private static MatchEntryBuilder prepareIpv6ExtHdrHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareIpv6ExtHdrHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(Ipv6Exthdr.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(Ipv6Exthdr.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.IPV6_EXTHDR, fieldAndMask >>> 1);
assertEquals("Wrong value length", EncodeConstants.MAC_ADDRESS_LENGTH, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMatchEntry(String value) {
+ private static MatchEntryBuilder prepareMatchEntry(final String value) {
MatchEntryBuilder builder = prepareHeader(false);
Ipv6NdSllCaseBuilder casebuilder = new Ipv6NdSllCaseBuilder();
Ipv6NdSllBuilder valueBuilder = new Ipv6NdSllBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(Ipv6NdSll.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(Ipv6NdSll.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.IPV6_ND_SLL, fieldAndMask >>> 1);
assertEquals("Wrong value length", EncodeConstants.MAC_ADDRESS_LENGTH, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMatchEntry(String value) {
+ private static MatchEntryBuilder prepareMatchEntry(final String value) {
MatchEntryBuilder builder = prepareHeader(false);
Ipv6NdTllCaseBuilder casebuilder = new Ipv6NdTllCaseBuilder();
Ipv6NdTllBuilder valueBuilder = new Ipv6NdTllBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(Ipv6NdTll.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(Ipv6NdTll.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.IPV6_ND_TLL, fieldAndMask >>> 1);
assertTrue("Unexpected data", buffer.readableBytes() == 0);
}
- private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, String value) {
+ private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final String value) {
final MatchEntryBuilder builder = prepareHeader(hasMask);
Ipv6SrcCaseBuilder caseBuilder = new Ipv6SrcCaseBuilder();
Ipv6SrcBuilder srcBuilder = new Ipv6SrcBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(Ipv6Src.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(Ipv6Src.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.IPV6_SRC, fieldAndMask >>> 1);
assertEquals("Wrong value length", Long.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, byte[] value) {
+ private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final byte[] value) {
final MatchEntryBuilder builder = prepareHeader(hasMask);
MetadataCaseBuilder casebuilder = new MetadataCaseBuilder();
MetadataBuilder valueBuilder = new MetadataBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(Metadata.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(Metadata.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.METADATA, fieldAndMask >>> 1);
assertEquals("Wrong value length", Byte.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMplsBosMatchEntry(boolean bos) {
+ private static MatchEntryBuilder prepareMplsBosMatchEntry(final boolean bos) {
MatchEntryBuilder builder = prepareMplsBosHeader(false);
MplsBosCaseBuilder casebuilder = new MplsBosCaseBuilder();
MplsBosBuilder valueBuilder = new MplsBosBuilder();
return builder;
}
- private static MatchEntryBuilder prepareMplsBosHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareMplsBosHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(MplsBos.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(MplsBos.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.MPLS_BOS, fieldAndMask >>> 1);
assertEquals("Wrong value length", Integer.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMplsLabelMatchEntry(Uint32 label) {
+ private static MatchEntryBuilder prepareMplsLabelMatchEntry(final Uint32 label) {
MatchEntryBuilder builder = prepareMplsLabelHeader(false);
MplsLabelCaseBuilder casebuilder = new MplsLabelCaseBuilder();
MplsLabelBuilder valueBuilder = new MplsLabelBuilder();
return builder;
}
- private static MatchEntryBuilder prepareMplsLabelHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareMplsLabelHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(MplsLabel.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(MplsLabel.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.MPLS_LABEL, fieldAndMask >>> 1);
assertEquals("Wrong value length", Byte.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMplsTcMatchEntry(Uint8 value) {
+ private static MatchEntryBuilder prepareMplsTcMatchEntry(final Uint8 value) {
MatchEntryBuilder builder = prepareMplsTcHeader(false);
MplsTcCaseBuilder casebuilder = new MplsTcCaseBuilder();
MplsTcBuilder valueBuilder = new MplsTcBuilder();
return builder;
}
- private static MatchEntryBuilder prepareMplsTcHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareMplsTcHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(MplsTc.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(MplsTc.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.MPLS_TC, fieldAndMask >>> 1);
assertEquals(packetType, buffer.readUnsignedInt());
}
- private static MatchEntry createMatchEntry(Uint32 packetType) {
+ private static MatchEntry createMatchEntry(final Uint32 packetType) {
PacketTypeCase packetTypeCase = new PacketTypeCaseBuilder()
.setPacketType(new PacketTypeBuilder().setPacketType(packetType).build())
.build();
return new MatchEntryBuilder()
- .setOxmClass(OpenflowBasicClass.class)
- .setOxmMatchField(PacketType.class)
+ .setOxmClass(OpenflowBasicClass.VALUE)
+ .setOxmMatchField(PacketType.VALUE)
.setHasMask(false)
.setMatchEntryValue(packetTypeCase)
.build();
assertEquals("Wrong value length", EncodeConstants.SIZE_OF_3_BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder preparePbbIsidMatchEntry(boolean hasMask, int value) {
+ private static MatchEntryBuilder preparePbbIsidMatchEntry(final boolean hasMask, final int value) {
final MatchEntryBuilder builder = preparePbbIsidHeader(hasMask);
PbbIsidCaseBuilder casebuilder = new PbbIsidCaseBuilder();
PbbIsidBuilder valueBuilder = new PbbIsidBuilder();
return builder;
}
- private static MatchEntryBuilder preparePbbIsidHeader(boolean hasMask) {
+ private static MatchEntryBuilder preparePbbIsidHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(PbbIsid.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(PbbIsid.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.PBB_ISID, fieldAndMask >>> 1);
assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMatchEntry(int value) {
+ private static MatchEntryBuilder prepareMatchEntry(final int value) {
MatchEntryBuilder builder = prepareHeader(false);
SctpDstCaseBuilder casebuilder = new SctpDstCaseBuilder();
SctpDstBuilder valueBuilder = new SctpDstBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(SctpDst.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(SctpDst.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.SCTP_DST, fieldAndMask >>> 1);
assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMatchEntry(int value) {
+ private static MatchEntryBuilder prepareMatchEntry(final int value) {
MatchEntryBuilder builder = prepareHeader(false);
SctpSrcCaseBuilder casebuilder = new SctpSrcCaseBuilder();
SctpSrcBuilder valueBuilder = new SctpSrcBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(SctpSrc.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(SctpSrc.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.SCTP_SRC, fieldAndMask >>> 1);
assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMatchEntry(int value) {
+ private static MatchEntryBuilder prepareMatchEntry(final int value) {
MatchEntryBuilder builder = prepareHeader(false);
TcpDstCaseBuilder casebuilder = new TcpDstCaseBuilder();
TcpDstBuilder valueBuilder = new TcpDstBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(TcpDst.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(TcpDst.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.TCP_DST, fieldAndMask >>> 1);
assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMatchEntry(int value) {
+ private static MatchEntryBuilder prepareMatchEntry(final int value) {
MatchEntryBuilder builder = prepareHeader(false);
TcpSrcCaseBuilder casebuilder = new TcpSrcCaseBuilder();
TcpSrcBuilder valueBuilder = new TcpSrcBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(TcpSrc.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(TcpSrc.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.TCP_SRC, fieldAndMask >>> 1);
assertEquals("Wrong value length", Long.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, byte[] value) {
+ private static MatchEntryBuilder prepareMatchEntry(final boolean hasMask, final byte[] value) {
final MatchEntryBuilder builder = prepareHeader(hasMask);
TunnelIdCaseBuilder casebuilder = new TunnelIdCaseBuilder();
TunnelIdBuilder valueBuilder = new TunnelIdBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(TunnelId.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(TunnelId.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.TUNNEL_ID, fieldAndMask >>> 1);
assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMatchEntry(int value) {
+ private static MatchEntryBuilder prepareMatchEntry(final int value) {
MatchEntryBuilder builder = prepareHeader(false);
UdpDstCaseBuilder casebuilder = new UdpDstCaseBuilder();
UdpDstBuilder valueBuilder = new UdpDstBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(UdpDst.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(UdpDst.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.UDP_DST, fieldAndMask >>> 1);
assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareMatchEntry(int value) {
+ private static MatchEntryBuilder prepareMatchEntry(final int value) {
MatchEntryBuilder builder = prepareHeader(false);
UdpSrcCaseBuilder casebuilder = new UdpSrcCaseBuilder();
UdpSrcBuilder valueBuilder = new UdpSrcBuilder();
return builder;
}
- private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(UdpSrc.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(UdpSrc.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.UDP_SRC, fieldAndMask >>> 1);
assertEquals("Wrong value length", Byte.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareVlanPcpMatchEntry(Uint8 value) {
+ private static MatchEntryBuilder prepareVlanPcpMatchEntry(final Uint8 value) {
MatchEntryBuilder builder = prepareVlanPcpHeader(false);
VlanPcpCaseBuilder casebuilder = new VlanPcpCaseBuilder();
VlanPcpBuilder valueBuilder = new VlanPcpBuilder();
return builder;
}
- private static MatchEntryBuilder prepareVlanPcpHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareVlanPcpHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(VlanPcp.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(VlanPcp.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.VLAN_PCP, fieldAndMask >>> 1);
assertEquals("Wrong value length", Short.BYTES, serializer.getValueLength());
}
- private static MatchEntryBuilder prepareVlanVidMatchEntry(boolean hasMask, boolean cfiBit) {
+ private static MatchEntryBuilder prepareVlanVidMatchEntry(final boolean hasMask, final boolean cfiBit) {
final MatchEntryBuilder builder = prepareVlanVidHeader(hasMask);
final VlanVidCaseBuilder casebuilder = new VlanVidCaseBuilder();
VlanVidBuilder valueBuilder = new VlanVidBuilder();
return builder;
}
- private static MatchEntryBuilder prepareVlanVidHeader(boolean hasMask) {
+ private static MatchEntryBuilder prepareVlanVidHeader(final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(VlanVid.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(VlanVid.VALUE);
builder.setHasMask(hasMask);
return builder;
}
- private static void checkHeader(ByteBuf buffer, boolean hasMask) {
+ private static void checkHeader(final ByteBuf buffer, final boolean hasMask) {
assertEquals("Wrong oxm-class", OxmMatchConstants.OPENFLOW_BASIC_CLASS, buffer.readUnsignedShort());
short fieldAndMask = buffer.readUnsignedByte();
assertEquals("Wrong oxm-field", OxmMatchConstants.VLAN_VID, fieldAndMask >>> 1);
.getSetFieldAction().getMatchEntry();
Assert.assertEquals("Wrong number of fields", 1, entries.size());
Assert.assertEquals("Wrong match entry class", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow."
- + "oxm.rev150225.OpenflowBasicClass", entries.get(0).getOxmClass().getName());
+ + "oxm.rev150225.OpenflowBasicClass", entries.get(0).getOxmClass().implementedInterface().getName());
Assert.assertEquals("Wrong match entry field", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow."
- + "oxm.rev150225.InPhyPort", entries.get(0).getOxmMatchField().getName());
+ + "oxm.rev150225.InPhyPort", entries.get(0).getOxmMatchField().implementedInterface().getName());
Assert.assertEquals("Wrong match entry mask", false, entries.get(0).getHasMask());
Assert.assertEquals("Wrong match entry value", 11,
((InPhyPortCase) entries.get(0).getMatchEntryValue()).getInPhyPort().getPortNumber()
+ "80 00 58 04 00 01 89 4f");
Match match = matchDeserializer.deserialize(buffer);
- Assert.assertEquals("Wrong match type", OxmMatchType.class, match.getType());
+ Assert.assertEquals("Wrong match type", OxmMatchType.VALUE, match.getType());
Assert.assertEquals("Wrong match entries size", 41, match.getMatchEntry().size());
List<MatchEntry> entries = match.getMatchEntry();
MatchEntry entry0 = entries.get(0);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry0.getOxmClass());
- Assert.assertEquals("Wrong entry field", InPort.class, entry0.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry0.getOxmClass());
+ Assert.assertEquals("Wrong entry field", InPort.VALUE, entry0.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry0.getHasMask());
Assert.assertEquals("Wrong entry value", 1,
((InPortCase) entry0.getMatchEntryValue()).getInPort().getPortNumber().getValue().intValue());
MatchEntry entry1 = entries.get(1);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry1.getOxmClass());
- Assert.assertEquals("Wrong entry field", InPhyPort.class, entry1.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry1.getOxmClass());
+ Assert.assertEquals("Wrong entry field", InPhyPort.VALUE, entry1.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry1.getHasMask());
Assert.assertEquals("Wrong entry value", 2,
((InPhyPortCase) entry1.getMatchEntryValue()).getInPhyPort().getPortNumber().getValue().intValue());
MatchEntry entry2 = entries.get(2);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry2.getOxmClass());
- Assert.assertEquals("Wrong entry field", Metadata.class, entry2.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry2.getOxmClass());
+ Assert.assertEquals("Wrong entry field", Metadata.VALUE, entry2.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", true, entry2.getHasMask());
Assert.assertArrayEquals("Wrong entry value", ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 03"),
((MetadataCase) entry2.getMatchEntryValue()).getMetadata().getMetadata());
Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 04"),
((MetadataCase) entry2.getMatchEntryValue()).getMetadata().getMask());
MatchEntry entry3 = entries.get(3);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry3.getOxmClass());
- Assert.assertEquals("Wrong entry field", EthDst.class, entry3.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry3.getOxmClass());
+ Assert.assertEquals("Wrong entry field", EthDst.VALUE, entry3.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", true, entry3.getHasMask());
Assert.assertEquals("Wrong entry value", new MacAddress("00:00:00:00:00:05"),
((EthDstCase) entry3.getMatchEntryValue()).getEthDst().getMacAddress());
Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 06"),
((EthDstCase) entry3.getMatchEntryValue()).getEthDst().getMask());
MatchEntry entry4 = entries.get(4);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry4.getOxmClass());
- Assert.assertEquals("Wrong entry field", EthSrc.class, entry4.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry4.getOxmClass());
+ Assert.assertEquals("Wrong entry field", EthSrc.VALUE, entry4.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", true, entry4.getHasMask());
Assert.assertEquals("Wrong entry value", new MacAddress("00:00:00:00:00:07"),
((EthSrcCase) entry4.getMatchEntryValue()).getEthSrc().getMacAddress());
Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 08"),
((EthSrcCase) entry4.getMatchEntryValue()).getEthSrc().getMask());
MatchEntry entry5 = entries.get(5);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry5.getOxmClass());
- Assert.assertEquals("Wrong entry field", EthType.class, entry5.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry5.getOxmClass());
+ Assert.assertEquals("Wrong entry field", EthType.VALUE, entry5.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry5.getHasMask());
Assert.assertEquals("Wrong entry value", 9,
((EthTypeCase) entry5.getMatchEntryValue()).getEthType().getEthType().getValue().intValue());
MatchEntry entry6 = entries.get(6);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry6.getOxmClass());
- Assert.assertEquals("Wrong entry field", VlanVid.class, entry6.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry6.getOxmClass());
+ Assert.assertEquals("Wrong entry field", VlanVid.VALUE, entry6.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", true, entry6.getHasMask());
Assert.assertEquals("Wrong entry value", 10,
((VlanVidCase) entry6.getMatchEntryValue()).getVlanVid().getVlanVid().intValue());
Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 0B"),
((VlanVidCase) entry6.getMatchEntryValue()).getVlanVid().getMask());
MatchEntry entry7 = entries.get(7);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry7.getOxmClass());
- Assert.assertEquals("Wrong entry field", VlanPcp.class, entry7.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry7.getOxmClass());
+ Assert.assertEquals("Wrong entry field", VlanPcp.VALUE, entry7.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry7.getHasMask());
Assert.assertEquals("Wrong entry value", 12,
((VlanPcpCase) entry7.getMatchEntryValue()).getVlanPcp().getVlanPcp().intValue());
MatchEntry entry8 = entries.get(8);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry8.getOxmClass());
- Assert.assertEquals("Wrong entry field", IpDscp.class, entry8.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry8.getOxmClass());
+ Assert.assertEquals("Wrong entry field", IpDscp.VALUE, entry8.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry8.getHasMask());
Assert.assertEquals("Wrong entry value", 13,
((IpDscpCase) entry8.getMatchEntryValue()).getIpDscp().getDscp().getValue().intValue());
MatchEntry entry9 = entries.get(9);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry9.getOxmClass());
- Assert.assertEquals("Wrong entry field", IpEcn.class, entry9.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry9.getOxmClass());
+ Assert.assertEquals("Wrong entry field", IpEcn.VALUE, entry9.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry9.getHasMask());
Assert.assertEquals("Wrong entry value", 14,
((IpEcnCase) entry9.getMatchEntryValue()).getIpEcn().getEcn().intValue());
MatchEntry entry10 = entries.get(10);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry10.getOxmClass());
- Assert.assertEquals("Wrong entry field", IpProto.class, entry10.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry10.getOxmClass());
+ Assert.assertEquals("Wrong entry field", IpProto.VALUE, entry10.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry10.getHasMask());
Assert.assertEquals("Wrong entry value", 15,
((IpProtoCase) entry10.getMatchEntryValue()).getIpProto().getProtocolNumber().intValue());
MatchEntry entry11 = entries.get(11);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry11.getOxmClass());
- Assert.assertEquals("Wrong entry field", Ipv4Src.class, entry11.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry11.getOxmClass());
+ Assert.assertEquals("Wrong entry field", Ipv4Src.VALUE, entry11.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", true, entry11.getHasMask());
Assert.assertEquals("Wrong entry value", new Ipv4Address("10.0.0.1"),
((Ipv4SrcCase) entry11.getMatchEntryValue()).getIpv4Src().getIpv4Address());
Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 FF 00"),
((Ipv4SrcCase) entry11.getMatchEntryValue()).getIpv4Src().getMask());
MatchEntry entry12 = entries.get(12);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry12.getOxmClass());
- Assert.assertEquals("Wrong entry field", Ipv4Dst.class, entry12.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry12.getOxmClass());
+ Assert.assertEquals("Wrong entry field", Ipv4Dst.VALUE, entry12.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", true, entry12.getHasMask());
Assert.assertEquals("Wrong entry value", new Ipv4Address("10.0.0.2"),
((Ipv4DstCase) entry12.getMatchEntryValue()).getIpv4Dst().getIpv4Address());
Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 FF"),
((Ipv4DstCase) entry12.getMatchEntryValue()).getIpv4Dst().getMask());
MatchEntry entry13 = entries.get(13);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry13.getOxmClass());
- Assert.assertEquals("Wrong entry field", TcpSrc.class, entry13.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry13.getOxmClass());
+ Assert.assertEquals("Wrong entry field", TcpSrc.VALUE, entry13.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry13.getHasMask());
Assert.assertEquals("Wrong entry value", 3,
((TcpSrcCase) entry13.getMatchEntryValue()).getTcpSrc().getPort().getValue().intValue());
MatchEntry entry14 = entries.get(14);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry14.getOxmClass());
- Assert.assertEquals("Wrong entry field", TcpDst.class, entry14.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry14.getOxmClass());
+ Assert.assertEquals("Wrong entry field", TcpDst.VALUE, entry14.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry14.getHasMask());
Assert.assertEquals("Wrong entry value", 4,
((TcpDstCase) entry14.getMatchEntryValue()).getTcpDst().getPort().getValue().intValue());
MatchEntry entry15 = entries.get(15);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry15.getOxmClass());
- Assert.assertEquals("Wrong entry field", UdpSrc.class, entry15.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry15.getOxmClass());
+ Assert.assertEquals("Wrong entry field", UdpSrc.VALUE, entry15.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry15.getHasMask());
Assert.assertEquals("Wrong entry value", 5,
((UdpSrcCase) entry15.getMatchEntryValue()).getUdpSrc().getPort().getValue().intValue());
MatchEntry entry16 = entries.get(16);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry16.getOxmClass());
- Assert.assertEquals("Wrong entry field", UdpDst.class, entry16.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry16.getOxmClass());
+ Assert.assertEquals("Wrong entry field", UdpDst.VALUE, entry16.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry16.getHasMask());
Assert.assertEquals("Wrong entry value", 6,
((UdpDstCase) entry16.getMatchEntryValue()).getUdpDst().getPort().getValue().intValue());
MatchEntry entry17 = entries.get(17);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry17.getOxmClass());
- Assert.assertEquals("Wrong entry field", SctpSrc.class, entry17.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry17.getOxmClass());
+ Assert.assertEquals("Wrong entry field", SctpSrc.VALUE, entry17.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry17.getHasMask());
Assert.assertEquals("Wrong entry value", 7,
((SctpSrcCase) entry17.getMatchEntryValue()).getSctpSrc().getPort().getValue().intValue());
MatchEntry entry18 = entries.get(18);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry18.getOxmClass());
- Assert.assertEquals("Wrong entry field", SctpDst.class, entry18.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry18.getOxmClass());
+ Assert.assertEquals("Wrong entry field", SctpDst.VALUE, entry18.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry18.getHasMask());
Assert.assertEquals("Wrong entry value", 8,
((SctpDstCase) entry18.getMatchEntryValue()).getSctpDst().getPort().getValue().intValue());
MatchEntry entry19 = entries.get(19);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry19.getOxmClass());
- Assert.assertEquals("Wrong entry field", Icmpv4Type.class, entry19.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry19.getOxmClass());
+ Assert.assertEquals("Wrong entry field", Icmpv4Type.VALUE, entry19.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry19.getHasMask());
Assert.assertEquals("Wrong entry value", 5,
((Icmpv4TypeCase) entry19.getMatchEntryValue()).getIcmpv4Type().getIcmpv4Type().intValue());
MatchEntry entry20 = entries.get(20);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry20.getOxmClass());
- Assert.assertEquals("Wrong entry field", Icmpv4Code.class, entry20.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry20.getOxmClass());
+ Assert.assertEquals("Wrong entry field", Icmpv4Code.VALUE, entry20.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry20.getHasMask());
Assert.assertEquals("Wrong entry value", 7,
((Icmpv4CodeCase) entry20.getMatchEntryValue()).getIcmpv4Code().getIcmpv4Code().intValue());
MatchEntry entry21 = entries.get(21);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry21.getOxmClass());
- Assert.assertEquals("Wrong entry field", ArpOp.class, entry21.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry21.getOxmClass());
+ Assert.assertEquals("Wrong entry field", ArpOp.VALUE, entry21.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry21.getHasMask());
Assert.assertEquals("Wrong entry value", 16,
((ArpOpCase) entry21.getMatchEntryValue()).getArpOp().getOpCode().intValue());
MatchEntry entry22 = entries.get(22);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry22.getOxmClass());
- Assert.assertEquals("Wrong entry field", ArpSpa.class, entry22.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry22.getOxmClass());
+ Assert.assertEquals("Wrong entry field", ArpSpa.VALUE, entry22.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", true, entry22.getHasMask());
Assert.assertEquals("Wrong entry value", new Ipv4Address("10.0.0.9"),
((ArpSpaCase) entry22.getMatchEntryValue()).getArpSpa().getIpv4Address());
Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 FF 00"),
((ArpSpaCase) entry22.getMatchEntryValue()).getArpSpa().getMask());
MatchEntry entry23 = entries.get(23);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry23.getOxmClass());
- Assert.assertEquals("Wrong entry field", ArpTpa.class, entry23.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry23.getOxmClass());
+ Assert.assertEquals("Wrong entry field", ArpTpa.VALUE, entry23.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", true, entry23.getHasMask());
Assert.assertEquals("Wrong entry value", new Ipv4Address("10.0.0.10"),
((ArpTpaCase) entry23.getMatchEntryValue()).getArpTpa().getIpv4Address());
Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 FF"),
((ArpTpaCase) entry23.getMatchEntryValue()).getArpTpa().getMask());
MatchEntry entry24 = entries.get(24);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry24.getOxmClass());
- Assert.assertEquals("Wrong entry field", ArpSha.class, entry24.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry24.getOxmClass());
+ Assert.assertEquals("Wrong entry field", ArpSha.VALUE, entry24.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", true, entry24.getHasMask());
Assert.assertEquals("Wrong entry value", new MacAddress("00:00:00:00:00:01"),
((ArpShaCase) entry24.getMatchEntryValue()).getArpSha().getMacAddress());
Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 03"),
((ArpShaCase) entry24.getMatchEntryValue()).getArpSha().getMask());
MatchEntry entry25 = entries.get(25);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry25.getOxmClass());
- Assert.assertEquals("Wrong entry field", ArpTha.class, entry25.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry25.getOxmClass());
+ Assert.assertEquals("Wrong entry field", ArpTha.VALUE, entry25.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", true, entry25.getHasMask());
Assert.assertEquals("Wrong entry value", new MacAddress("00:00:00:00:00:02"),
((ArpThaCase) entry25.getMatchEntryValue()).getArpTha().getMacAddress());
Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 04"),
((ArpThaCase) entry25.getMatchEntryValue()).getArpTha().getMask());
MatchEntry entry26 = entries.get(26);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry26.getOxmClass());
- Assert.assertEquals("Wrong entry field", Ipv6Src.class, entry26.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry26.getOxmClass());
+ Assert.assertEquals("Wrong entry field", Ipv6Src.VALUE, entry26.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", true, entry26.getHasMask());
Assert.assertEquals("Wrong entry value", new Ipv6Address("::15"),
((Ipv6SrcCase) entry26.getMatchEntryValue()).getIpv6Src().getIpv6Address());
ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 16"),
((Ipv6SrcCase) entry26.getMatchEntryValue()).getIpv6Src().getMask());
MatchEntry entry27 = entries.get(27);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry27.getOxmClass());
- Assert.assertEquals("Wrong entry field", Ipv6Dst.class, entry27.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry27.getOxmClass());
+ Assert.assertEquals("Wrong entry field", Ipv6Dst.VALUE, entry27.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", true, entry27.getHasMask());
Assert.assertEquals("Wrong entry value", new Ipv6Address("::17"),
((Ipv6DstCase) entry27.getMatchEntryValue()).getIpv6Dst().getIpv6Address());
ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 18"),
((Ipv6DstCase) entry27.getMatchEntryValue()).getIpv6Dst().getMask());
MatchEntry entry28 = entries.get(28);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry28.getOxmClass());
- Assert.assertEquals("Wrong entry field", Ipv6Flabel.class, entry28.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry28.getOxmClass());
+ Assert.assertEquals("Wrong entry field", Ipv6Flabel.VALUE, entry28.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry28.getHasMask());
Assert.assertEquals("Wrong entry value", 2,
((Ipv6FlabelCase) entry28.getMatchEntryValue()).getIpv6Flabel().getIpv6Flabel()
.getValue().intValue());
MatchEntry entry29 = entries.get(29);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry29.getOxmClass());
- Assert.assertEquals("Wrong entry field", Icmpv6Type.class, entry29.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry29.getOxmClass());
+ Assert.assertEquals("Wrong entry field", Icmpv6Type.VALUE, entry29.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry29.getHasMask());
Assert.assertEquals("Wrong entry value", 21,
((Icmpv6TypeCase) entry29.getMatchEntryValue()).getIcmpv6Type().getIcmpv6Type().intValue());
MatchEntry entry30 = entries.get(30);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry30.getOxmClass());
- Assert.assertEquals("Wrong entry field", Icmpv6Code.class, entry30.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry30.getOxmClass());
+ Assert.assertEquals("Wrong entry field", Icmpv6Code.VALUE, entry30.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry30.getHasMask());
Assert.assertEquals("Wrong entry value", 23,
((Icmpv6CodeCase) entry30.getMatchEntryValue()).getIcmpv6Code().getIcmpv6Code().intValue());
MatchEntry entry31 = entries.get(31);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry31.getOxmClass());
- Assert.assertEquals("Wrong entry field", Ipv6NdTarget.class, entry31.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry31.getOxmClass());
+ Assert.assertEquals("Wrong entry field", Ipv6NdTarget.VALUE, entry31.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry31.getHasMask());
Assert.assertEquals("Wrong entry value", new Ipv6Address("::20"),
((Ipv6NdTargetCase) entry31.getMatchEntryValue()).getIpv6NdTarget().getIpv6Address());
MatchEntry entry32 = entries.get(32);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry32.getOxmClass());
- Assert.assertEquals("Wrong entry field", Ipv6NdSll.class, entry32.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry32.getOxmClass());
+ Assert.assertEquals("Wrong entry field", Ipv6NdSll.VALUE, entry32.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry32.getHasMask());
Assert.assertEquals("Wrong entry value", new MacAddress("00:05:00:00:00:01"),
((Ipv6NdSllCase) entry32.getMatchEntryValue()).getIpv6NdSll().getMacAddress());
MatchEntry entry33 = entries.get(33);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry33.getOxmClass());
- Assert.assertEquals("Wrong entry field", Ipv6NdTll.class, entry33.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry33.getOxmClass());
+ Assert.assertEquals("Wrong entry field", Ipv6NdTll.VALUE, entry33.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry33.getHasMask());
Assert.assertEquals("Wrong entry value", new MacAddress("00:05:00:00:00:02"),
((Ipv6NdTllCase) entry33.getMatchEntryValue()).getIpv6NdTll().getMacAddress());
MatchEntry entry34 = entries.get(34);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry34.getOxmClass());
- Assert.assertEquals("Wrong entry field", MplsLabel.class, entry34.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry34.getOxmClass());
+ Assert.assertEquals("Wrong entry field", MplsLabel.VALUE, entry34.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry34.getHasMask());
Assert.assertEquals("Wrong entry value", 515,
((MplsLabelCase) entry34.getMatchEntryValue()).getMplsLabel().getMplsLabel().intValue());
MatchEntry entry35 = entries.get(35);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry35.getOxmClass());
- Assert.assertEquals("Wrong entry field", MplsTc.class, entry35.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry35.getOxmClass());
+ Assert.assertEquals("Wrong entry field", MplsTc.VALUE, entry35.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry35.getHasMask());
Assert.assertEquals("Wrong entry value", 3,
((MplsTcCase) entry35.getMatchEntryValue()).getMplsTc().getTc().intValue());
MatchEntry entry36 = entries.get(36);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry36.getOxmClass());
- Assert.assertEquals("Wrong entry field", MplsBos.class, entry36.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry36.getOxmClass());
+ Assert.assertEquals("Wrong entry field", MplsBos.VALUE, entry36.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry36.getHasMask());
Assert.assertEquals("Wrong entry value", true,
((MplsBosCase) entry36.getMatchEntryValue()).getMplsBos().getBos());
MatchEntry entry37 = entries.get(37);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry37.getOxmClass());
- Assert.assertEquals("Wrong entry field", PbbIsid.class, entry37.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry37.getOxmClass());
+ Assert.assertEquals("Wrong entry field", PbbIsid.VALUE, entry37.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", true, entry37.getHasMask());
Assert.assertEquals("Wrong entry value", 2,
((PbbIsidCase) entry37.getMatchEntryValue()).getPbbIsid().getIsid().intValue());
Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 01"),
((PbbIsidCase) entry37.getMatchEntryValue()).getPbbIsid().getMask());
MatchEntry entry38 = entries.get(38);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry38.getOxmClass());
- Assert.assertEquals("Wrong entry field", TunnelId.class, entry38.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry38.getOxmClass());
+ Assert.assertEquals("Wrong entry field", TunnelId.VALUE, entry38.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", true, entry38.getHasMask());
Assert.assertArrayEquals("Wrong entry value", ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 07"),
((TunnelIdCase) entry38.getMatchEntryValue()).getTunnelId().getTunnelId());
Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 FF"),
((TunnelIdCase) entry38.getMatchEntryValue()).getTunnelId().getMask());
MatchEntry entry39 = entries.get(39);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry39.getOxmClass());
- Assert.assertEquals("Wrong entry field", Ipv6Exthdr.class, entry39.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry39.getOxmClass());
+ Assert.assertEquals("Wrong entry field", Ipv6Exthdr.VALUE, entry39.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", true, entry39.getHasMask());
Assert.assertEquals("Wrong entry value",
new Ipv6ExthdrFlags(false, false, false, false, false, false, false, false, false),
((Ipv6ExthdrCase) entry39.getMatchEntryValue()).getIpv6Exthdr().getMask());
Assert.assertTrue("Unread data", buffer.readableBytes() == 0);
MatchEntry entry40 = entries.get(40);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry40.getOxmClass());
- Assert.assertEquals("Wrong entry field", PacketType.class, entry40.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry40.getOxmClass());
+ Assert.assertEquals("Wrong entry field", PacketType.VALUE, entry40.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry40.getHasMask());
Assert.assertEquals("Wrong entry value", 0x1894f,
((PacketTypeCase) entry40.getMatchEntryValue()).getPacketType().getPacketType().longValue());
key.setExperimenterId(null);
HeaderDeserializer<MatchEntry> entryDeserializer = registry.getDeserializer(key);
MatchEntry entry = entryDeserializer.deserializeHeader(buffer);
- Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass());
- Assert.assertEquals("Wrong entry field", Ipv4Dst.class, entry.getOxmMatchField());
+ Assert.assertEquals("Wrong entry class", OpenflowBasicClass.VALUE, entry.getOxmClass());
+ Assert.assertEquals("Wrong entry field", Ipv4Dst.VALUE, entry.getOxmMatchField());
Assert.assertEquals("Wrong entry hasMask", false, entry.getHasMask());
Assert.assertNull("Wrong Ipv4 address", entry.getMatchEntryValue());
}
Match match = matchDeserializer.deserialize(buffer);
- Assert.assertEquals("Wrong match type", StandardMatchType.class, match.getType());
+ Assert.assertEquals("Wrong match type", StandardMatchType.VALUE, match.getType());
Assert.assertEquals("Wrong match entries size", 1, match.getMatchEntry().size());
}
}
actions.add(actionBuilder.build());
actionBuilder = new ActionBuilder();
MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
- matchBuilder.setOxmClass(OpenflowBasicClass.class);
- matchBuilder.setOxmMatchField(InPort.class);
+ matchBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchBuilder.setOxmMatchField(InPort.VALUE);
matchBuilder.setHasMask(false);
InPortCaseBuilder inPortCaseBuilder = new InPortCaseBuilder();
InPortBuilder inPortBuilder = new InPortBuilder();
actions.add(actionBuilder.build());
actionBuilder = new ActionBuilder();
MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
- matchBuilder.setOxmClass(OpenflowBasicClass.class);
- matchBuilder.setOxmMatchField(InPort.class);
+ matchBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchBuilder.setOxmMatchField(InPort.VALUE);
matchBuilder.setHasMask(false);
InPortCaseBuilder inPortCaseBuilder = new InPortCaseBuilder();
InPortBuilder inPortBuilder = new InPortBuilder();
@Test
public void testEmptyMatch() {
MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ builder.setType(OxmMatchType.VALUE);
Match match = builder.build();
ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
@Test
public void test() {
MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ builder.setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(InPort.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(InPort.VALUE);
entryBuilder.setHasMask(false);
InPortCaseBuilder inPortCaseBuilder = new InPortCaseBuilder();
InPortBuilder inPortBuilder = new InPortBuilder();
entryBuilder.setMatchEntryValue(inPortCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(InPhyPort.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(InPhyPort.VALUE);
entryBuilder.setHasMask(false);
InPhyPortCaseBuilder inPhyPortCaseBuilder = new InPhyPortCaseBuilder();
InPhyPortBuilder inPhyPortBuilder = new InPhyPortBuilder();
entryBuilder.setMatchEntryValue(inPhyPortCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(Metadata.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(Metadata.VALUE);
entryBuilder.setHasMask(true);
MetadataCaseBuilder metaCaseBuilder = new MetadataCaseBuilder();
MetadataBuilder metadataBuilder = new MetadataBuilder();
entryBuilder.setMatchEntryValue(metaCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(EthDst.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(EthDst.VALUE);
entryBuilder.setHasMask(true);
EthDstCaseBuilder ethDstCaseBuilder = new EthDstCaseBuilder();
EthDstBuilder ethDstBuilder = new EthDstBuilder();
entryBuilder.setMatchEntryValue(ethDstCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(EthSrc.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(EthSrc.VALUE);
entryBuilder.setHasMask(true);
EthSrcCaseBuilder ethSrcCaseBuilder = new EthSrcCaseBuilder();
EthSrcBuilder ethSrcBuilder = new EthSrcBuilder();
entryBuilder.setMatchEntryValue(ethSrcCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(EthType.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(EthType.VALUE);
entryBuilder.setHasMask(false);
EthTypeCaseBuilder ethTypeCaseBuilder = new EthTypeCaseBuilder();
EthTypeBuilder ethTypeBuilder = new EthTypeBuilder();
entryBuilder.setMatchEntryValue(ethTypeCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(VlanVid.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(VlanVid.VALUE);
entryBuilder.setHasMask(true);
final VlanVidCaseBuilder vlanVidCaseBuilder = new VlanVidCaseBuilder();
VlanVidBuilder vlanVidBuilder = new VlanVidBuilder();
entryBuilder.setMatchEntryValue(vlanVidCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(VlanPcp.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(VlanPcp.VALUE);
entryBuilder.setHasMask(false);
VlanPcpCaseBuilder vlanPcpCaseBuilder = new VlanPcpCaseBuilder();
VlanPcpBuilder vlanPcpBuilder = new VlanPcpBuilder();
entryBuilder.setMatchEntryValue(vlanPcpCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(IpDscp.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(IpDscp.VALUE);
entryBuilder.setHasMask(false);
IpDscpCaseBuilder ipDscpCaseBuilder = new IpDscpCaseBuilder();
IpDscpBuilder ipDscpBuilder = new IpDscpBuilder();
entryBuilder.setMatchEntryValue(ipDscpCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(IpEcn.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(IpEcn.VALUE);
entryBuilder.setHasMask(false);
IpEcnCaseBuilder ipEcnCaseBuilder = new IpEcnCaseBuilder();
IpEcnBuilder ipEcnBuilder = new IpEcnBuilder();
entryBuilder.setMatchEntryValue(ipEcnCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(IpProto.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(IpProto.VALUE);
entryBuilder.setHasMask(false);
IpProtoCaseBuilder ipProtoCaseBuilder = new IpProtoCaseBuilder();
IpProtoBuilder ipProtoBuilder = new IpProtoBuilder();
entryBuilder.setMatchEntryValue(ipProtoCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(Ipv4Src.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(Ipv4Src.VALUE);
entryBuilder.setHasMask(true);
Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();
Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();
entryBuilder.setMatchEntryValue(ipv4SrcCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(Ipv4Dst.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(Ipv4Dst.VALUE);
entryBuilder.setHasMask(true);
Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();
Ipv4DstBuilder ipv4DstBuilder = new Ipv4DstBuilder();
entryBuilder.setMatchEntryValue(ipv4DstCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(TcpSrc.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(TcpSrc.VALUE);
entryBuilder.setHasMask(false);
TcpSrcCaseBuilder tcpSrcCaseBuilder = new TcpSrcCaseBuilder();
TcpSrcBuilder tcpSrcBuilder = new TcpSrcBuilder();
entryBuilder.setMatchEntryValue(tcpSrcCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(TcpDst.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(TcpDst.VALUE);
entryBuilder.setHasMask(false);
TcpDstCaseBuilder tcpDstCaseBuilder = new TcpDstCaseBuilder();
TcpDstBuilder tcpDstBuilder = new TcpDstBuilder();
entryBuilder.setMatchEntryValue(tcpDstCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(UdpSrc.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(UdpSrc.VALUE);
entryBuilder.setHasMask(false);
UdpSrcCaseBuilder udpSrcCaseBuilder = new UdpSrcCaseBuilder();
UdpSrcBuilder udpSrcBuilder = new UdpSrcBuilder();
entryBuilder.setMatchEntryValue(udpSrcCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(UdpDst.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(UdpDst.VALUE);
entryBuilder.setHasMask(false);
UdpDstCaseBuilder udpDstCaseBuilder = new UdpDstCaseBuilder();
UdpDstBuilder udpDstBuilder = new UdpDstBuilder();
entryBuilder.setMatchEntryValue(udpDstCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(SctpSrc.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(SctpSrc.VALUE);
entryBuilder.setHasMask(false);
SctpSrcCaseBuilder sctpSrcCaseBuilder = new SctpSrcCaseBuilder();
SctpSrcBuilder sctpSrcBuilder = new SctpSrcBuilder();
entryBuilder.setMatchEntryValue(sctpSrcCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(SctpDst.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(SctpDst.VALUE);
entryBuilder.setHasMask(false);
SctpDstCaseBuilder sctpDstCaseBuilder = new SctpDstCaseBuilder();
SctpDstBuilder sctpDstBuilder = new SctpDstBuilder();
entryBuilder.setMatchEntryValue(sctpDstCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(Icmpv4Type.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(Icmpv4Type.VALUE);
entryBuilder.setHasMask(false);
Icmpv4TypeCaseBuilder icmpv4TypeCaseBuilder = new Icmpv4TypeCaseBuilder();
Icmpv4TypeBuilder icmpv4TypeBuilder = new Icmpv4TypeBuilder();
entryBuilder.setMatchEntryValue(icmpv4TypeCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(Icmpv4Code.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(Icmpv4Code.VALUE);
entryBuilder.setHasMask(false);
Icmpv4CodeCaseBuilder icmpv4CodeCaseBuilder = new Icmpv4CodeCaseBuilder();
Icmpv4CodeBuilder icmpv4CodeBuilder = new Icmpv4CodeBuilder();
entryBuilder.setMatchEntryValue(icmpv4CodeCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(ArpOp.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(ArpOp.VALUE);
entryBuilder.setHasMask(false);
ArpOpCaseBuilder arpOpCaseBuilder = new ArpOpCaseBuilder();
ArpOpBuilder arpOpBuilder = new ArpOpBuilder();
entryBuilder.setMatchEntryValue(arpOpCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(ArpSpa.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(ArpSpa.VALUE);
entryBuilder.setHasMask(true);
ArpSpaCaseBuilder arpSpaCaseBuilder = new ArpSpaCaseBuilder();
ArpSpaBuilder arpSpaBuilder = new ArpSpaBuilder();
entryBuilder.setMatchEntryValue(arpSpaCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(ArpTpa.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(ArpTpa.VALUE);
entryBuilder.setHasMask(true);
ArpTpaCaseBuilder arpTpaCaseBuilder = new ArpTpaCaseBuilder();
ArpTpaBuilder arpTpaBuilder = new ArpTpaBuilder();
entryBuilder.setMatchEntryValue(arpTpaCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(ArpSha.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(ArpSha.VALUE);
entryBuilder.setHasMask(true);
ArpShaCaseBuilder arpShaCaseBuilder = new ArpShaCaseBuilder();
ArpShaBuilder arpShaBuilder = new ArpShaBuilder();
entryBuilder.setMatchEntryValue(arpShaCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(ArpTha.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(ArpTha.VALUE);
entryBuilder.setHasMask(true);
ArpThaCaseBuilder arpThaCaseBuilder = new ArpThaCaseBuilder();
ArpThaBuilder arpThaBuilder = new ArpThaBuilder();
entryBuilder.setMatchEntryValue(arpThaCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(Ipv6Src.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(Ipv6Src.VALUE);
entryBuilder.setHasMask(true);
Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder();
Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder();
entryBuilder.setMatchEntryValue(ipv6SrcCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(Ipv6Dst.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(Ipv6Dst.VALUE);
entryBuilder.setHasMask(true);
Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder();
Ipv6DstBuilder ipv6DstBuilder = new Ipv6DstBuilder();
entryBuilder.setMatchEntryValue(ipv6DstCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(Ipv6Flabel.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(Ipv6Flabel.VALUE);
entryBuilder.setHasMask(false);
Ipv6FlabelCaseBuilder ipv6FlabelCaseBuilder = new Ipv6FlabelCaseBuilder();
Ipv6FlabelBuilder ipv6FlabelBuilder = new Ipv6FlabelBuilder();
entryBuilder.setMatchEntryValue(ipv6FlabelCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(Icmpv6Type.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(Icmpv6Type.VALUE);
entryBuilder.setHasMask(false);
Icmpv6TypeCaseBuilder icmpv6TypeCaseBuilder = new Icmpv6TypeCaseBuilder();
Icmpv6TypeBuilder icmpv6TypeBuilder = new Icmpv6TypeBuilder();
entryBuilder.setMatchEntryValue(icmpv6TypeCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(Icmpv6Code.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(Icmpv6Code.VALUE);
entryBuilder.setHasMask(false);
Icmpv6CodeCaseBuilder icmpv6CodeCaseBuilder = new Icmpv6CodeCaseBuilder();
Icmpv6CodeBuilder icmpv6CodeBuilder = new Icmpv6CodeBuilder();
icmpv6CodeCaseBuilder.setIcmpv6Code(icmpv6CodeBuilder.build());
entryBuilder.setMatchEntryValue(icmpv6CodeCaseBuilder.build());
entries.add(entryBuilder.build());
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(Ipv6NdTarget.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(Ipv6NdTarget.VALUE);
entryBuilder.setHasMask(false);
Ipv6NdTargetCaseBuilder ipv6NdTargetCaseBuilder = new Ipv6NdTargetCaseBuilder();
Ipv6NdTargetBuilder ipv6NdTargetBuilder = new Ipv6NdTargetBuilder();
entryBuilder.setMatchEntryValue(ipv6NdTargetCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(Ipv6NdSll.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(Ipv6NdSll.VALUE);
entryBuilder.setHasMask(false);
Ipv6NdSllCaseBuilder ipv6NdSllCaseBuilder = new Ipv6NdSllCaseBuilder();
Ipv6NdSllBuilder ipv6NdSllBuilder = new Ipv6NdSllBuilder();
entryBuilder.setMatchEntryValue(ipv6NdSllCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(Ipv6NdTll.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(Ipv6NdTll.VALUE);
entryBuilder.setHasMask(false);
Ipv6NdTllCaseBuilder ipv6NdTllCaseBuilder = new Ipv6NdTllCaseBuilder();
Ipv6NdTllBuilder ipv6NdTllBuilder = new Ipv6NdTllBuilder();
entryBuilder.setMatchEntryValue(ipv6NdTllCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(MplsLabel.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(MplsLabel.VALUE);
entryBuilder.setHasMask(false);
MplsLabelCaseBuilder mplsLabelCaseBuilder = new MplsLabelCaseBuilder();
MplsLabelBuilder mplsLabelBuilder = new MplsLabelBuilder();
entryBuilder.setMatchEntryValue(mplsLabelCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(MplsTc.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(MplsTc.VALUE);
entryBuilder.setHasMask(false);
MplsTcCaseBuilder mplsTcCaseBuilder = new MplsTcCaseBuilder();
MplsTcBuilder mplsTcBuilder = new MplsTcBuilder();
entryBuilder.setMatchEntryValue(mplsTcCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(MplsBos.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(MplsBos.VALUE);
entryBuilder.setHasMask(false);
MplsBosCaseBuilder mplsBosCaseBuilder = new MplsBosCaseBuilder();
MplsBosBuilder mplsBosBuilder = new MplsBosBuilder();
entryBuilder.setMatchEntryValue(mplsBosCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(PbbIsid.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(PbbIsid.VALUE);
entryBuilder.setHasMask(true);
PbbIsidCaseBuilder pbbIsidCaseBuilder = new PbbIsidCaseBuilder();
PbbIsidBuilder pbbIsidBuilder = new PbbIsidBuilder();
entryBuilder.setMatchEntryValue(pbbIsidCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(TunnelId.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(TunnelId.VALUE);
entryBuilder.setHasMask(true);
TunnelIdCaseBuilder tunnelIdCaseBuilder = new TunnelIdCaseBuilder();
TunnelIdBuilder tunnelIdBuilder = new TunnelIdBuilder();
entryBuilder.setMatchEntryValue(tunnelIdCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(Ipv6Exthdr.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(Ipv6Exthdr.VALUE);
entryBuilder.setHasMask(true);
Ipv6ExthdrCaseBuilder ipv6ExthdrCaseBuilder = new Ipv6ExthdrCaseBuilder();
Ipv6ExthdrBuilder ipv6ExthdrBuilder = new Ipv6ExthdrBuilder();
entryBuilder.setMatchEntryValue(ipv6ExthdrCaseBuilder.build());
entries.add(entryBuilder.build());
entryBuilder = new MatchEntryBuilder();
- entryBuilder.setOxmClass(OpenflowBasicClass.class);
- entryBuilder.setOxmMatchField(PacketType.class);
+ entryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entryBuilder.setOxmMatchField(PacketType.VALUE);
entryBuilder.setHasMask(false);
PacketTypeCaseBuilder packetTypeCaseBuilder = new PacketTypeCaseBuilder();
PacketTypeBuilder packetTypeBuilder = new PacketTypeBuilder();
@Test
public void testIpv4Src() {
MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ builder.setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv4Src.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv4Src.VALUE);
entriesBuilder.setHasMask(false);
Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();
Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();
@Test
public void testIpv6Various() {
MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ builder.setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
// ipv6 match entry with correct Ipv6 address
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Src.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Src.VALUE);
entriesBuilder.setHasMask(false);
Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder();
Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder();
entries.add(entriesBuilder.build());
// ipv6 match entry with abbreviated Ipv6 address
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6NdTarget.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6NdTarget.VALUE);
entriesBuilder.setHasMask(false);
Ipv6NdTargetCaseBuilder ipv6NdTargetCaseBuilder = new Ipv6NdTargetCaseBuilder();
Ipv6NdTargetBuilder ipv6NdTargetBuilder = new Ipv6NdTargetBuilder();
entries.add(entriesBuilder.build());
// ipv6 match entry with abbreviated Ipv6 address
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Dst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Dst.VALUE);
entriesBuilder.setHasMask(false);
Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder();
Ipv6DstBuilder ipv6DstBuilder = new Ipv6DstBuilder();
entries.add(entriesBuilder.build());
// ipv6 match entry with abbreviated Ipv6 address
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Dst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Dst.VALUE);
entriesBuilder.setHasMask(false);
ipv6DstCaseBuilder = new Ipv6DstCaseBuilder();
ipv6DstBuilder = new Ipv6DstBuilder();
entries.add(entriesBuilder.build());
// ipv6 match entry with abbreviated Ipv6 address
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Dst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Dst.VALUE);
entriesBuilder.setHasMask(false);
ipv6DstCaseBuilder = new Ipv6DstCaseBuilder();
ipv6DstBuilder = new Ipv6DstBuilder();
@Test(expected = IllegalArgumentException.class)
public void testIpv6Incorrect() {
MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ builder.setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
// ipv6 match entry with incorrect Ipv6 address
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Src.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Src.VALUE);
entriesBuilder.setHasMask(false);
Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder();
Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder();
private static Match buildIpv6FLabelMatch(final long labelValue, final boolean hasMask, final byte[] mask) {
MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ builder.setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Flabel.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Flabel.VALUE);
entriesBuilder.setHasMask(hasMask);
Ipv6FlabelCaseBuilder ipv6FlabelCaseBuilder = new Ipv6FlabelCaseBuilder();
Ipv6FlabelBuilder ipv6FlabelBuilder = new Ipv6FlabelBuilder();
@Test
public void testStandardMatchType() {
MatchBuilder builder = new MatchBuilder();
- builder.setType(StandardMatchType.class);
+ builder.setType(StandardMatchType.VALUE);
Match match = builder.build();
ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
public void testSerializeExperimenterMatchEntry() {
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(ExperimenterClass.class);
- builder.setOxmMatchField(OxmMatchFieldClass.class);
+ builder.setOxmClass(ExperimenterClass.VALUE);
+ builder.setOxmMatchField(OxmMatchFieldClass.VALUE);
builder.setHasMask(true);
ExperimenterIdCaseBuilder caseBuilder = new ExperimenterIdCaseBuilder();
ExperimenterBuilder expBuilder = new ExperimenterBuilder();
Assert.assertNotNull("Null keyMaker", keyMaker);
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(InPort.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(InPort.VALUE);
builder.setHasMask(true);
MatchEntry entry = builder.build();
MessageTypeKey<?> key = keyMaker.make(entry);
Assert.assertNotNull("Null key", key);
MatchEntrySerializerKey<?, ?> comparationKey = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3,
- OpenflowBasicClass.class, InPort.class);
+ OpenflowBasicClass.VALUE, InPort.VALUE);
Assert.assertEquals("Wrong key", comparationKey, key);
}
Assert.assertNotNull("Null keyMaker", keyMaker);
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(ExperimenterClass.class);
- builder.setOxmMatchField(OxmMatchFieldClass.class);
+ builder.setOxmClass(ExperimenterClass.VALUE);
+ builder.setOxmMatchField(OxmMatchFieldClass.VALUE);
builder.setHasMask(true);
ExperimenterIdCaseBuilder caseBuilder = new ExperimenterIdCaseBuilder();
ExperimenterBuilder expBuilder = new ExperimenterBuilder();
Assert.assertNotNull("Null key", key);
MatchEntrySerializerKey<?, ?> comparationKey = new MatchEntrySerializerKey<>(EncodeConstants.OF_VERSION_1_3,
- ExperimenterClass.class, OxmMatchFieldClass.class);
+ ExperimenterClass.VALUE, OxmMatchFieldClass.VALUE);
comparationKey.setExperimenterId(Uint32.valueOf(42L));
Assert.assertEquals("Wrong key", comparationKey, key);
}
public static ExperimenterIdSerializerKey<MeterBandExperimenterCase> createMeterBandSerializerKey(
final Uint8 msgVersion, final Uint32 experimenterId,
- final Class<? extends ExperimenterMeterBandSubType> meterSubType) {
+ final ExperimenterMeterBandSubType meterSubType) {
return new ExperimenterIdMeterSubTypeSerializerKey<>(msgVersion, experimenterId,
MeterBandExperimenterCase.class, meterSubType);
}
final ExperimenterIdSerializerKey<?> comparationKey5;
createdKey = ExperimenterSerializerKeyFactory.createMeterBandSerializerKey(EncodeConstants.OF_VERSION_1_0,
- Uint32.valueOf(43), ExperimenterMeterBandSubType.class);
+ Uint32.valueOf(43), ExperimenterMeterBandSubType.VALUE);
comparationKey1 = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_3,
- Uint32.valueOf(43), MeterBandExperimenterCase.class, ExperimenterMeterBandSubType.class);
+ Uint32.valueOf(43), MeterBandExperimenterCase.class, ExperimenterMeterBandSubType.VALUE);
comparationKey2 = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0,
- Uint32.valueOf(42), MeterBandExperimenterCase.class, ExperimenterMeterBandSubType.class);
+ Uint32.valueOf(42), MeterBandExperimenterCase.class, ExperimenterMeterBandSubType.VALUE);
comparationKey3 = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0,
- Uint32.valueOf(43), null, ExperimenterMeterBandSubType.class);
+ Uint32.valueOf(43), null, ExperimenterMeterBandSubType.VALUE);
comparationKey4 = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0,
Uint32.valueOf(43), MeterBandExperimenterCase.class, null);
comparationKey5 = new ExperimenterIdMeterSubTypeSerializerKey<>(EncodeConstants.OF_VERSION_1_0,
- Uint32.valueOf(43), MeterBandExperimenterCase.class, ExperimenterMeterBandSubType.class);
+ Uint32.valueOf(43), MeterBandExperimenterCase.class, ExperimenterMeterBandSubType.VALUE);
Assert.assertNotEquals("Wrong key created", comparationKey1, createdKey);
Assert.assertNotEquals("Wrong key created", comparationKey2, createdKey);
Assert.assertNotEquals("Wrong key created", comparationKey3, createdKey);
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
.getMultipartReplyGroupFeatures();
final var replyTypes = replyBody.getTypes();
- final var supportedGroups = ImmutableSet.<Class<? extends GroupType>>builder();
+ final var supportedGroups = ImmutableSet.<GroupType>builder();
if (replyTypes.getOFPGTALL()) {
- supportedGroups.add(GroupAll.class);
+ supportedGroups.add(GroupAll.VALUE);
}
if (replyTypes.getOFPGTSELECT()) {
- supportedGroups.add(GroupSelect.class);
+ supportedGroups.add(GroupSelect.VALUE);
}
if (replyTypes.getOFPGTINDIRECT()) {
- supportedGroups.add(GroupIndirect.class);
+ supportedGroups.add(GroupIndirect.VALUE);
}
if (replyTypes.getOFPGTFF()) {
- supportedGroups.add(GroupFf.class);
+ supportedGroups.add(GroupFf.VALUE);
}
final var replyCapabilities = replyBody.getCapabilities();
- final var supportedCapabilities = ImmutableSet.<Class<? extends GroupCapability>>builder();
+ final var supportedCapabilities = ImmutableSet.<GroupCapability>builder();
if (replyCapabilities.getOFPGFCCHAINING()) {
- supportedCapabilities.add(Chaining.class);
+ supportedCapabilities.add(Chaining.VALUE);
}
if (replyCapabilities.getOFPGFCCHAININGCHECKS()) {
- supportedCapabilities.add(ChainingChecks.class);
+ supportedCapabilities.add(ChainingChecks.VALUE);
}
if (replyCapabilities.getOFPGFCSELECTLIVENESS()) {
- supportedCapabilities.add(SelectLiveness.class);
+ supportedCapabilities.add(SelectLiveness.VALUE);
}
if (replyCapabilities.getOFPGFCSELECTWEIGHT()) {
- supportedCapabilities.add(SelectWeight.class);
+ supportedCapabilities.add(SelectWeight.VALUE);
}
return new MultipartReplyGroupFeaturesBuilder()
MultipartReplyMeterFeatures replyBody = caseBody.getMultipartReplyMeterFeatures();
final var replyCapabilities = replyBody.getCapabilities();
- final var supportedCapabilities = ImmutableSet.<Class<? extends MeterCapability>>builder();
+ final var supportedCapabilities = ImmutableSet.<MeterCapability>builder();
if (replyCapabilities.getOFPMFBURST()) {
- supportedCapabilities.add(MeterBurst.class);
+ supportedCapabilities.add(MeterBurst.VALUE);
}
if (replyCapabilities.getOFPMFKBPS()) {
- supportedCapabilities.add(MeterKbps.class);
+ supportedCapabilities.add(MeterKbps.VALUE);
}
if (replyCapabilities.getOFPMFPKTPS()) {
- supportedCapabilities.add(MeterPktps.class);
+ supportedCapabilities.add(MeterPktps.VALUE);
}
if (replyCapabilities.getOFPMFSTATS()) {
- supportedCapabilities.add(MeterStats.class);
+ supportedCapabilities.add(MeterStats.VALUE);
}
final var replyMeterBand = replyBody.getBandTypes();
- final var supportedMeterBand = ImmutableSet.<Class<? extends MeterBand>>builder();
+ final var supportedMeterBand = ImmutableSet.<MeterBand>builder();
if (replyMeterBand.getOFPMBTDROP()) {
- supportedMeterBand.add(MeterBandDrop.class);
+ supportedMeterBand.add(MeterBandDrop.VALUE);
}
if (replyMeterBand.getOFPMBTDSCPREMARK()) {
- supportedMeterBand.add(MeterBandDscpRemark.class);
+ supportedMeterBand.add(MeterBandDscpRemark.VALUE);
}
return new MultipartReplyMeterFeaturesBuilder()
if (OFConstants.OFP_VERSION_1_0.equals(version)) {
multipartRequestFlowBuilder.setMatchV10(MatchUtil.createEmptyV10Match().build());
} else if (OFConstants.OFP_VERSION_1_3.equals(version)) {
- multipartRequestFlowBuilder.setMatch(new MatchBuilder().setType(OxmMatchType.class).build());
+ multipartRequestFlowBuilder.setMatch(new MatchBuilder().setType(OxmMatchType.VALUE).build());
} else {
throw new IllegalArgumentException("Unknown version " + version);
}
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
import org.opendaylight.mdsal.binding.api.NotificationPublishService;
import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
import org.opendaylight.openflowplugin.api.openflow.device.Xid;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.node.ssl.connection.error.service.rev190723.SslErrorBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.node.ssl.connection.error.service.rev190723.SslErrorType;
import org.opendaylight.yang.gen.v1.urn.opendaylight.node.ssl.connection.error.service.rev190723.ssl.error.SwitchCertificateBuilder;
@Override
public void onSslConnectionError(final SslConnectionError notification) {
- final IpAddress ip;
- if (connectionContext.getConnectionAdapter() != null
- && connectionContext.getConnectionAdapter().getRemoteAddress() != null
- && connectionContext.getConnectionAdapter().getRemoteAddress().getAddress() != null) {
- ip = IpAddressBuilder.getDefaultInstance(
- connectionContext.getConnectionAdapter().getRemoteAddress().getAddress().getHostAddress());
- } else {
- ip = null;
- }
-
final var switchCert = notification.getSwitchCertificate();
notificationPublishService.offerNotification(new SslErrorBuilder()
.setType(SslErrorType.SslConFailed)
.setCode(Uint16.valueOf(SslErrorType.SslConFailed.getIntValue()))
- .setNodeIpAddress(ip)
+ .setNodeIpAddress(remoteAddress())
.setData(notification.getInfo())
.setSwitchCertificate(switchCert == null ? null : new SwitchCertificateBuilder(switchCert).build())
.build());
}
+
+ private @Nullable IpAddress remoteAddress() {
+ final var connectionAdapter = connectionContext.getConnectionAdapter();
+ if (connectionAdapter != null) {
+ final var remoteAddress = connectionAdapter.getRemoteAddress();
+ if (remoteAddress != null) {
+ final var inetAddress = remoteAddress.getAddress();
+ if (inetAddress != null) {
+ return IetfInetUtil.ipAddressFor(inetAddress.getHostAddress());
+ }
+ }
+ }
+ return null;
+ }
}
return null;
}
- final var builder = ImmutableSet.<Class<? extends FeatureCapability>>builder();
+ final var builder = ImmutableSet.<FeatureCapability>builder();
if (capabilities.getOFPCARPMATCHIP()) {
- builder.add(FlowFeatureCapabilityArpMatchIp.class);
+ builder.add(FlowFeatureCapabilityArpMatchIp.VALUE);
}
if (capabilities.getOFPCFLOWSTATS()) {
- builder.add(FlowFeatureCapabilityFlowStats.class);
+ builder.add(FlowFeatureCapabilityFlowStats.VALUE);
}
if (capabilities.getOFPCIPREASM()) {
- builder.add(FlowFeatureCapabilityIpReasm.class);
+ builder.add(FlowFeatureCapabilityIpReasm.VALUE);
}
if (capabilities.getOFPCPORTSTATS()) {
- builder.add(FlowFeatureCapabilityPortStats.class);
+ builder.add(FlowFeatureCapabilityPortStats.VALUE);
}
if (capabilities.getOFPCQUEUESTATS()) {
- builder.add(FlowFeatureCapabilityQueueStats.class);
+ builder.add(FlowFeatureCapabilityQueueStats.VALUE);
}
if (capabilities.getOFPCRESERVED()) {
- builder.add(FlowFeatureCapabilityReserved.class);
+ builder.add(FlowFeatureCapabilityReserved.VALUE);
}
if (capabilities.getOFPCSTP()) {
- builder.add(FlowFeatureCapabilityStp.class);
+ builder.add(FlowFeatureCapabilityStp.VALUE);
}
if (capabilities.getOFPCTABLESTATS()) {
- builder.add(FlowFeatureCapabilityTableStats.class);
+ builder.add(FlowFeatureCapabilityTableStats.VALUE);
}
return new SwitchFeaturesBuilder()
return null;
}
- final var builder = ImmutableSet.<Class<? extends FeatureCapability>>builder();
+ final var builder = ImmutableSet.<FeatureCapability>builder();
if (capabilities.getOFPCFLOWSTATS()) {
- builder.add(FlowFeatureCapabilityFlowStats.class);
+ builder.add(FlowFeatureCapabilityFlowStats.VALUE);
}
if (capabilities.getOFPCGROUPSTATS()) {
- builder.add(FlowFeatureCapabilityGroupStats.class);
+ builder.add(FlowFeatureCapabilityGroupStats.VALUE);
}
if (capabilities.getOFPCIPREASM()) {
- builder.add(FlowFeatureCapabilityIpReasm.class);
+ builder.add(FlowFeatureCapabilityIpReasm.VALUE);
}
if (capabilities.getOFPCPORTBLOCKED()) {
- builder.add(FlowFeatureCapabilityPortBlocked.class);
+ builder.add(FlowFeatureCapabilityPortBlocked.VALUE);
}
if (capabilities.getOFPCPORTSTATS()) {
- builder.add(FlowFeatureCapabilityPortStats.class);
+ builder.add(FlowFeatureCapabilityPortStats.VALUE);
}
if (capabilities.getOFPCQUEUESTATS()) {
- builder.add(FlowFeatureCapabilityQueueStats.class);
+ builder.add(FlowFeatureCapabilityQueueStats.VALUE);
}
if (capabilities.getOFPCTABLESTATS()) {
- builder.add(FlowFeatureCapabilityTableStats.class);
+ builder.add(FlowFeatureCapabilityTableStats.VALUE);
}
return new SwitchFeaturesBuilder()
final NotificationManager<String, Runnable> queuedNotificationManager,
final boolean isStatisticsPollingOn) {
this.primaryConnectionContext = primaryConnectionContext;
- this.deviceInfo = primaryConnectionContext.getDeviceInfo();
+ deviceInfo = primaryConnectionContext.getDeviceInfo();
this.hashedWheelTimer = hashedWheelTimer;
this.deviceInitializerProvider = deviceInitializerProvider;
this.isFlowRemovedNotificationOn = isFlowRemovedNotificationOn;
this.switchFeaturesMandatory = switchFeaturesMandatory;
- this.deviceState = new DeviceStateImpl();
+ deviceState = new DeviceStateImpl();
this.dataBroker = dataBroker;
this.messageSpy = messageSpy;
this.isStatisticsPollingOn = isStatisticsPollingOn;
this.contextChainHolder = contextChainHolder;
- this.packetInLimiter = new PacketInRateLimiter(primaryConnectionContext.getConnectionAdapter(),
+ packetInLimiter = new PacketInRateLimiter(primaryConnectionContext.getConnectionAdapter(),
/*initial*/ LOW_WATERMARK, /*initial*/HIGH_WATERMARK, this.messageSpy, REJECTED_DRAIN_FACTOR);
this.translatorLibrary = translatorLibrary;
- this.portStatusTranslator = translatorLibrary.lookupTranslator(
+ portStatusTranslator = translatorLibrary.lookupTranslator(
new TranslatorKey(deviceInfo.getVersion(), PortGrouping.class.getName()));
- this.packetInTranslator = translatorLibrary.lookupTranslator(
+ packetInTranslator = translatorLibrary.lookupTranslator(
new TranslatorKey(deviceInfo.getVersion(), org.opendaylight.yang.gen.v1.urn.opendaylight.openflow
.protocol.rev130731
.PacketIn.class.getName()));
- this.flowRemovedTranslator = translatorLibrary.lookupTranslator(
+ flowRemovedTranslator = translatorLibrary.lookupTranslator(
new TranslatorKey(deviceInfo.getVersion(), FlowRemoved.class.getName()));
this.convertorExecutor = convertorExecutor;
@VisibleForTesting
TransactionChainManager getTransactionChainManager() {
- return this.transactionChainManager;
+ return transactionChainManager;
}
@Override
@Override
public DeviceInfo getDeviceInfo() {
- return this.deviceInfo;
+ return deviceInfo;
}
@Override
public void registerMastershipWatcher(@NonNull final ContextChainMastershipWatcher newWatcher) {
- this.contextChainMastershipWatcher = newWatcher;
+ contextChainMastershipWatcher = newWatcher;
}
@Override
portStatusMessages.forEach(this::writePortStatusMessage);
submitTransaction();
} catch (final Exception ex) {
- throw new RuntimeException(String.format("Error processing port status messages from device %s: %s",
+ throw new IllegalStateException(String.format("Error processing port status messages from device %s: %s",
deviceInfo.toString(), ex.toString()), ex);
}
initialize.get(DEVICE_INIT_TIMEOUT, TimeUnit.MILLISECONDS);
} catch (TimeoutException ex) {
initialize.cancel(true);
- throw new RuntimeException(String.format("Failed to initialize device %s in %ss: %s",
+ throw new IllegalStateException(String.format("Failed to initialize device %s in %ss: %s",
deviceInfo.toString(), String.valueOf(DEVICE_INIT_TIMEOUT / 1000), ex.toString()), ex);
} catch (ExecutionException | InterruptedException ex) {
- throw new RuntimeException(
+ throw new IllegalStateException(
String.format("Device %s cannot be initialized: %s", deviceInfo.toString(), ex.toString()), ex);
}
} else {
- throw new RuntimeException(String.format("Unsupported version %s for device %s",
+ throw new IllegalStateException(String.format("Unsupported version %s for device %s",
deviceInfo.getVersion(),
deviceInfo.toString()));
}
@VisibleForTesting
void lazyTransactionManagerInitialization() {
- if (!this.initialized.get()) {
+ if (!initialized.get()) {
LOG.debug("Transaction chain manager for node {} created", deviceInfo);
final NodeId nodeId = deviceInfo.getNodeId();
- this.transactionChainManager = new TransactionChainManager(dataBroker, nodeId.getValue());
- this.history = new FlowGroupInfoHistoryImpl(FLOWGROUP_CACHE_SIZE);
- this.deviceFlowRegistry = new DeviceFlowRegistryImpl(deviceInfo.getVersion(), dataBroker,
+ transactionChainManager = new TransactionChainManager(dataBroker, nodeId.getValue());
+ history = new FlowGroupInfoHistoryImpl(FLOWGROUP_CACHE_SIZE);
+ deviceFlowRegistry = new DeviceFlowRegistryImpl(deviceInfo.getVersion(), dataBroker,
deviceInfo.getNodeInstanceIdentifier(), history);
- this.deviceGroupRegistry = new DeviceGroupRegistryImpl(history);
- this.deviceMeterRegistry = new DeviceMeterRegistryImpl();
+ deviceGroupRegistry = new DeviceGroupRegistryImpl(history);
+ deviceMeterRegistry = new DeviceMeterRegistryImpl();
}
transactionChainManager.activateTransactionManager();
.build();
}
- private static Set<Class<? extends GroupCapability>> readGroupCapabilities(final ByteBuf message) {
+ private static Set<GroupCapability> readGroupCapabilities(final ByteBuf message) {
final long capabilitiesMask = message.readUnsignedInt();
- final var builder = ImmutableSet.<Class<? extends GroupCapability>>builder();
+ final var builder = ImmutableSet.<GroupCapability>builder();
if ((capabilitiesMask & 1 << 0) != 0) {
- builder.add(SelectWeight.class);
+ builder.add(SelectWeight.VALUE);
}
if ((capabilitiesMask & 1 << 1) != 0) {
- builder.add(SelectLiveness.class);
+ builder.add(SelectLiveness.VALUE);
}
if ((capabilitiesMask & 1 << 2) != 0) {
- builder.add(Chaining.class);
+ builder.add(Chaining.VALUE);
}
if ((capabilitiesMask & 1 << 3) != 0) {
- builder.add(ChainingChecks.class);
+ builder.add(ChainingChecks.VALUE);
}
return builder.build();
}
- private static Set<Class<? extends GroupType>> readGroupTypes(final ByteBuf message) {
+ private static Set<GroupType> readGroupTypes(final ByteBuf message) {
final long typesMask = message.readUnsignedInt();
- final var builder = ImmutableSet.<Class<? extends GroupType>>builder();
+ final var builder = ImmutableSet.<GroupType>builder();
if ((typesMask & 1 << 0) != 0) {
- builder.add(GroupAll.class);
+ builder.add(GroupAll.VALUE);
}
if ((typesMask & 1 << 1) != 0) {
- builder.add(GroupSelect.class);
+ builder.add(GroupSelect.VALUE);
}
if ((typesMask & 1 << 2) != 0) {
- builder.add(GroupIndirect.class);
+ builder.add(GroupIndirect.VALUE);
}
if ((typesMask & 1 << 3) != 0) {
- builder.add(GroupFf.class);
+ builder.add(GroupFf.VALUE);
}
return builder.build();
}
.build();
}
- private static Set<Class<? extends MeterBand>> readMeterBands(final ByteBuf message) {
+ private static Set<MeterBand> readMeterBands(final ByteBuf message) {
final long typesMask = message.readUnsignedInt();
- final var bandTypes = ImmutableSet.<Class<? extends MeterBand>>builder();
+ final var bandTypes = ImmutableSet.<MeterBand>builder();
if ((typesMask & 1) != 0) {
- bandTypes.add(MeterBandDrop.class);
+ bandTypes.add(MeterBandDrop.VALUE);
}
if ((typesMask & 1 << 1) != 0) {
- bandTypes.add(MeterBandDscpRemark.class);
+ bandTypes.add(MeterBandDscpRemark.VALUE);
}
return bandTypes.build();
}
- private static Set<Class<? extends MeterCapability>> readMeterCapabilities(final ByteBuf message) {
+ private static Set<MeterCapability> readMeterCapabilities(final ByteBuf message) {
final long capabilitiesMask = message.readUnsignedInt();
- final var meterCapabilities = ImmutableSet.<Class<? extends MeterCapability>>builder();
+ final var meterCapabilities = ImmutableSet.<MeterCapability>builder();
if ((capabilitiesMask & 1) != 0) {
- meterCapabilities.add(MeterKbps.class);
+ meterCapabilities.add(MeterKbps.VALUE);
}
if ((capabilitiesMask & 1 << 1) != 0) {
- meterCapabilities.add(MeterPktps.class);
+ meterCapabilities.add(MeterPktps.VALUE);
}
if ((capabilitiesMask & 1 << 2) != 0) {
- meterCapabilities.add(MeterBurst.class);
+ meterCapabilities.add(MeterBurst.VALUE);
}
if ((capabilitiesMask & 1 << 3) != 0) {
- meterCapabilities.add(MeterStats.class);
+ meterCapabilities.add(MeterStats.VALUE);
}
return meterCapabilities.build();
import com.google.common.collect.ImmutableMap;
import io.netty.buffer.ByteBuf;
-import java.util.Map;
import java.util.Optional;
import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey;
import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
import org.opendaylight.yangtools.yang.common.Uint32;
public class TableFeaturesMatchFieldDeserializer {
-
/**
* Mapping of match entry code to match set field class.
*/
- private final Map<MatchEntryDeserializerKey, Class<? extends MatchField>> codeToFieldMap = ImmutableMap
- .<MatchEntryDeserializerKey, Class<? extends MatchField>>builder()
+ private final ImmutableMap<MatchEntryDeserializerKey, MatchField> codeToFieldMap = ImmutableMap
+ .<MatchEntryDeserializerKey, MatchField>builder()
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.ARP_OP), ArpOp.class)
+ OxmMatchConstants.ARP_OP), ArpOp.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.ARP_SHA), ArpSha.class)
+ OxmMatchConstants.ARP_SHA), ArpSha.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.ARP_SPA), ArpSpa.class)
+ OxmMatchConstants.ARP_SPA), ArpSpa.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.ARP_THA), ArpTha.class)
+ OxmMatchConstants.ARP_THA), ArpTha.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.ARP_TPA), ArpTpa.class)
+ OxmMatchConstants.ARP_TPA), ArpTpa.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.ETH_DST), EthDst.class)
+ OxmMatchConstants.ETH_DST), EthDst.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.ETH_SRC), EthSrc.class)
+ OxmMatchConstants.ETH_SRC), EthSrc.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.ICMPV4_CODE), Icmpv4Code.class)
+ OxmMatchConstants.ICMPV4_CODE), Icmpv4Code.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.ICMPV4_TYPE), Icmpv4Type.class)
+ OxmMatchConstants.ICMPV4_TYPE), Icmpv4Type.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.ICMPV6_CODE), Icmpv6Code.class)
+ OxmMatchConstants.ICMPV6_CODE), Icmpv6Code.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.ICMPV6_TYPE), Icmpv6Type.class)
+ OxmMatchConstants.ICMPV6_TYPE), Icmpv6Type.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.IN_PHY_PORT), InPhyPort.class)
+ OxmMatchConstants.IN_PHY_PORT), InPhyPort.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.IN_PORT), InPort.class)
+ OxmMatchConstants.IN_PORT), InPort.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.IP_DSCP), IpDscp.class)
+ OxmMatchConstants.IP_DSCP), IpDscp.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.IP_ECN), IpEcn.class)
+ OxmMatchConstants.IP_ECN), IpEcn.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.IP_PROTO), IpProto.class)
+ OxmMatchConstants.IP_PROTO), IpProto.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.IPV4_DST), Ipv4Dst.class)
+ OxmMatchConstants.IPV4_DST), Ipv4Dst.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.IPV4_SRC), Ipv4Src.class)
+ OxmMatchConstants.IPV4_SRC), Ipv4Src.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.IPV6_DST), Ipv6Dst.class)
+ OxmMatchConstants.IPV6_DST), Ipv6Dst.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.IPV6_SRC), Ipv6Src.class)
+ OxmMatchConstants.IPV6_SRC), Ipv6Src.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.IPV6_EXTHDR), Ipv6Exthdr.class)
+ OxmMatchConstants.IPV6_EXTHDR), Ipv6Exthdr.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.IPV6_FLABEL), Ipv6Flabel.class)
+ OxmMatchConstants.IPV6_FLABEL), Ipv6Flabel.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.IPV6_ND_SLL), Ipv6NdSll.class)
+ OxmMatchConstants.IPV6_ND_SLL), Ipv6NdSll.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.IPV6_ND_TLL), Ipv6NdTll.class)
+ OxmMatchConstants.IPV6_ND_TLL), Ipv6NdTll.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.IPV6_ND_TARGET), Ipv6NdTarget.class)
+ OxmMatchConstants.IPV6_ND_TARGET), Ipv6NdTarget.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.METADATA), Metadata.class)
+ OxmMatchConstants.METADATA), Metadata.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.MPLS_BOS), MplsBos.class)
+ OxmMatchConstants.MPLS_BOS), MplsBos.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.MPLS_LABEL), MplsLabel.class)
+ OxmMatchConstants.MPLS_LABEL), MplsLabel.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.MPLS_TC), MplsTc.class)
+ OxmMatchConstants.MPLS_TC), MplsTc.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.PBB_ISID), PbbIsid.class)
+ OxmMatchConstants.PBB_ISID), PbbIsid.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.SCTP_DST), SctpDst.class)
+ OxmMatchConstants.SCTP_DST), SctpDst.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.SCTP_SRC), SctpSrc.class)
+ OxmMatchConstants.SCTP_SRC), SctpSrc.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.TCP_SRC), TcpSrc.class)
+ OxmMatchConstants.TCP_SRC), TcpSrc.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.TCP_DST), TcpDst.class)
+ OxmMatchConstants.TCP_DST), TcpDst.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.TUNNEL_ID), TunnelId.class)
+ OxmMatchConstants.TUNNEL_ID), TunnelId.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.UDP_SRC), UdpSrc.class)
+ OxmMatchConstants.UDP_SRC), UdpSrc.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.UDP_DST), UdpDst.class)
+ OxmMatchConstants.UDP_DST), UdpDst.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.VLAN_PCP), VlanPcp.class)
+ OxmMatchConstants.VLAN_PCP), VlanPcp.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.OPENFLOW_BASIC_CLASS,
- OxmMatchConstants.VLAN_VID), VlanVid.class)
+ OxmMatchConstants.VLAN_VID), VlanVid.VALUE)
.put(new MatchEntryDeserializerKey(
EncodeConstants.OF_VERSION_1_3,
OxmMatchConstants.EXPERIMENTER_CLASS,
- OxmMatchConstants.NXM_NX_TCP_FLAG), TcpFlags.class)
+ OxmMatchConstants.NXM_NX_TCP_FLAG), TcpFlags.VALUE)
.build();
/**
message.getUnsignedInt(message.readerIndex() + Short.BYTES + 2 * Byte.BYTES)));
}
- final Class<? extends MatchField> clazz = codeToFieldMap.get(key);
+ final MatchField clazz = codeToFieldMap.get(key);
return clazz == null ? Optional.empty() : Optional.of(processHeader(message).setMatchType(clazz).build());
}
}
*/
static void injectSerializers(final SerializerExtensionProvider provider) {
// Inject new message serializers here using injector created by createInjector method
- final Function<Class<? extends MatchField>, Consumer<OFSerializer<SetFieldMatch>>> injector =
+ final Function<MatchField, Consumer<OFSerializer<SetFieldMatch>>> injector =
createInjector(provider, EncodeConstants.OF_VERSION_1_3);
- injector.apply(ArpOp.class).accept(new ArpOpMatchFieldSerializer());
- injector.apply(ArpSha.class).accept(new ArpShaMatchFieldSerializer());
- injector.apply(ArpSpa.class).accept(new ArpSpaMatchFieldSerializer());
- injector.apply(ArpTha.class).accept(new ArpThaMatchFieldSerializer());
- injector.apply(ArpTpa.class).accept(new ArpTpaMatchFieldSerializer());
- injector.apply(EthDst.class).accept(new EthDstMatchFieldSerializer());
- injector.apply(EthSrc.class).accept(new EthSrcMatchFieldSerializer());
- injector.apply(EthType.class).accept(new EthTypeMatchFieldSerializer());
- injector.apply(Icmpv4Code.class).accept(new Icmpv4CodeMatchFieldSerializer());
- injector.apply(Icmpv4Type.class).accept(new Icmpv4TypeMatchFieldSerializer());
- injector.apply(Icmpv6Code.class).accept(new Icmpv6CodeMatchFieldSerializer());
- injector.apply(Icmpv6Type.class).accept(new Icmpv6TypeMatchFieldSerializer());
- injector.apply(InPhyPort.class).accept(new InPhyPortMatchFieldSerializer());
- injector.apply(InPort.class).accept(new InPortMatchFieldSerializer());
- injector.apply(IpDscp.class).accept(new IpDscpMatchFieldSerializer());
- injector.apply(IpEcn.class).accept(new IpEcnMatchFieldSerializer());
- injector.apply(IpProto.class).accept(new IpProtoMatchFieldSerializer());
- injector.apply(Ipv4Dst.class).accept(new Ipv4DstMatchFieldSerializer());
- injector.apply(Ipv4Src.class).accept(new Ipv4SrcMatchFieldSerializer());
- injector.apply(Ipv6Dst.class).accept(new Ipv6DstMatchFieldSerializer());
- injector.apply(Ipv6Exthdr.class).accept(new Ipv6ExtHdrMatchFieldSerializer());
- injector.apply(Ipv6Flabel.class).accept(new Ipv6FlabelMatchFieldSerializer());
- injector.apply(Ipv6NdSll.class).accept(new Ipv6NdSllMatchFieldSerializer());
- injector.apply(Ipv6NdTarget.class).accept(new Ipv6NdTargetMatchFieldSerializer());
- injector.apply(Ipv6NdTll.class).accept(new Ipv6NdTllMatchFieldSerializer());
- injector.apply(Ipv6Src.class).accept(new Ipv6SrcMatchFieldSerializer());
- injector.apply(Metadata.class).accept(new MetadataMatchFieldSerializer());
- injector.apply(MplsBos.class).accept(new MplsBosMatchFieldSerializer());
- injector.apply(MplsLabel.class).accept(new MplsLabelMatchFieldSerializer());
- injector.apply(MplsTc.class).accept(new MplsTcMatchFieldSerializer());
- injector.apply(PbbIsid.class).accept(new PbbIsidMatchFieldSerializer());
- injector.apply(SctpDst.class).accept(new SctpDstMatchFieldSerializer());
- injector.apply(SctpSrc.class).accept(new SctpSrcMatchFieldSerializer());
- injector.apply(TcpDst.class).accept(new TcpDstMatchFieldSerializer());
- injector.apply(TcpFlags.class).accept(new TcpFlagsMatchFieldSerializer());
- injector.apply(TcpSrc.class).accept(new TcpSrcMatchFieldSerializer());
- injector.apply(TunnelId.class).accept(new TunnelIdMatchFieldSerializer());
+ injector.apply(ArpOp.VALUE).accept(new ArpOpMatchFieldSerializer());
+ injector.apply(ArpSha.VALUE).accept(new ArpShaMatchFieldSerializer());
+ injector.apply(ArpSpa.VALUE).accept(new ArpSpaMatchFieldSerializer());
+ injector.apply(ArpTha.VALUE).accept(new ArpThaMatchFieldSerializer());
+ injector.apply(ArpTpa.VALUE).accept(new ArpTpaMatchFieldSerializer());
+ injector.apply(EthDst.VALUE).accept(new EthDstMatchFieldSerializer());
+ injector.apply(EthSrc.VALUE).accept(new EthSrcMatchFieldSerializer());
+ injector.apply(EthType.VALUE).accept(new EthTypeMatchFieldSerializer());
+ injector.apply(Icmpv4Code.VALUE).accept(new Icmpv4CodeMatchFieldSerializer());
+ injector.apply(Icmpv4Type.VALUE).accept(new Icmpv4TypeMatchFieldSerializer());
+ injector.apply(Icmpv6Code.VALUE).accept(new Icmpv6CodeMatchFieldSerializer());
+ injector.apply(Icmpv6Type.VALUE).accept(new Icmpv6TypeMatchFieldSerializer());
+ injector.apply(InPhyPort.VALUE).accept(new InPhyPortMatchFieldSerializer());
+ injector.apply(InPort.VALUE).accept(new InPortMatchFieldSerializer());
+ injector.apply(IpDscp.VALUE).accept(new IpDscpMatchFieldSerializer());
+ injector.apply(IpEcn.VALUE).accept(new IpEcnMatchFieldSerializer());
+ injector.apply(IpProto.VALUE).accept(new IpProtoMatchFieldSerializer());
+ injector.apply(Ipv4Dst.VALUE).accept(new Ipv4DstMatchFieldSerializer());
+ injector.apply(Ipv4Src.VALUE).accept(new Ipv4SrcMatchFieldSerializer());
+ injector.apply(Ipv6Dst.VALUE).accept(new Ipv6DstMatchFieldSerializer());
+ injector.apply(Ipv6Exthdr.VALUE).accept(new Ipv6ExtHdrMatchFieldSerializer());
+ injector.apply(Ipv6Flabel.VALUE).accept(new Ipv6FlabelMatchFieldSerializer());
+ injector.apply(Ipv6NdSll.VALUE).accept(new Ipv6NdSllMatchFieldSerializer());
+ injector.apply(Ipv6NdTarget.VALUE).accept(new Ipv6NdTargetMatchFieldSerializer());
+ injector.apply(Ipv6NdTll.VALUE).accept(new Ipv6NdTllMatchFieldSerializer());
+ injector.apply(Ipv6Src.VALUE).accept(new Ipv6SrcMatchFieldSerializer());
+ injector.apply(Metadata.VALUE).accept(new MetadataMatchFieldSerializer());
+ injector.apply(MplsBos.VALUE).accept(new MplsBosMatchFieldSerializer());
+ injector.apply(MplsLabel.VALUE).accept(new MplsLabelMatchFieldSerializer());
+ injector.apply(MplsTc.VALUE).accept(new MplsTcMatchFieldSerializer());
+ injector.apply(PbbIsid.VALUE).accept(new PbbIsidMatchFieldSerializer());
+ injector.apply(SctpDst.VALUE).accept(new SctpDstMatchFieldSerializer());
+ injector.apply(SctpSrc.VALUE).accept(new SctpSrcMatchFieldSerializer());
+ injector.apply(TcpDst.VALUE).accept(new TcpDstMatchFieldSerializer());
+ injector.apply(TcpFlags.VALUE).accept(new TcpFlagsMatchFieldSerializer());
+ injector.apply(TcpSrc.VALUE).accept(new TcpSrcMatchFieldSerializer());
+ injector.apply(TunnelId.VALUE).accept(new TunnelIdMatchFieldSerializer());
// TODO: Finish implementation of Tunnel Ipv4 src and dst
- injector.apply(TunnelIpv4Dst.class).accept(new Ipv4DstMatchFieldSerializer());
- injector.apply(TunnelIpv4Src.class).accept(new Ipv4SrcMatchFieldSerializer());
- injector.apply(UdpDst.class).accept(new UdpDstMatchFieldSerializer());
- injector.apply(UdpSrc.class).accept(new UdpSrcMatchFieldSerializer());
- injector.apply(VlanPcp.class).accept(new VlanPcpMatchFieldSerializer());
- injector.apply(VlanVid.class).accept(new VlanVidMatchFieldSerializer());
+ injector.apply(TunnelIpv4Dst.VALUE).accept(new Ipv4DstMatchFieldSerializer());
+ injector.apply(TunnelIpv4Src.VALUE).accept(new Ipv4SrcMatchFieldSerializer());
+ injector.apply(UdpDst.VALUE).accept(new UdpDstMatchFieldSerializer());
+ injector.apply(UdpSrc.VALUE).accept(new UdpSrcMatchFieldSerializer());
+ injector.apply(VlanPcp.VALUE).accept(new VlanPcpMatchFieldSerializer());
+ injector.apply(VlanVid.VALUE).accept(new VlanVidMatchFieldSerializer());
}
/**
* @return injector
*/
@VisibleForTesting
- static Function<Class<? extends MatchField>, Consumer<OFSerializer<SetFieldMatch>>> createInjector(
+ static Function<MatchField, Consumer<OFSerializer<SetFieldMatch>>> createInjector(
final SerializerExtensionProvider provider, final Uint8 version) {
return type -> serializer ->
- provider.registerSerializer(new MessageTypeKey<>(version, type), serializer);
+ provider.registerSerializer(new MessageTypeKey<>(version, type.implementedInterface()), serializer);
}
}
EncodeConstants.OF_VERSION_1_3, entry.getOxmClass(), entry.getOxmMatchField());
// If entry is experimenter, set experimenter ID to key
- if (entry.getOxmClass().equals(ExperimenterClass.class)) {
+ if (ExperimenterClass.VALUE.equals(entry.getOxmClass())) {
key.setExperimenterId(((ExperimenterIdCase) entry.getMatchEntryValue())
.getExperimenter().getExperimenter().getValue());
}
.getApplySetfieldMiss()
.nonnullSetFieldMatch().values()
.forEach(setFieldMatch -> Preconditions.checkNotNull(registry)
- .<MatchField, OFSerializer<SetFieldMatch>>getSerializer(
- new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType()))
+ .<MatchField, OFSerializer<SetFieldMatch>>getSerializer(new MessageTypeKey<>(
+ EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType().implementedInterface()))
.serialize(setFieldMatch, byteBuf));
}
.getApplySetfield()
.nonnullSetFieldMatch().values()
.forEach(setFieldMatch -> Preconditions.checkNotNull(registry)
- .<MatchField, OFSerializer<SetFieldMatch>>getSerializer(
- new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType()))
+ .<MatchField, OFSerializer<SetFieldMatch>>getSerializer(new MessageTypeKey<>(
+ EncodeConstants.OF_VERSION_1_3,setFieldMatch.getMatchType().implementedInterface()))
.serialize(setFieldMatch, byteBuf));
}
.getMatchSetfield()
.nonnullSetFieldMatch().values()
.forEach(setFieldMatch -> Preconditions.checkNotNull(registry)
- .<MatchField, OFSerializer<SetFieldMatch>>getSerializer(
- new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType()))
+ .<MatchField, OFSerializer<SetFieldMatch>>getSerializer(new MessageTypeKey<>(
+ EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType().implementedInterface()))
.serialize(setFieldMatch, byteBuf));
}
.getWildcardSetfield()
.nonnullSetFieldMatch().values()
.forEach(setFieldMatch -> Preconditions.checkNotNull(registry)
- .<MatchField, OFSerializer<SetFieldMatch>>getSerializer(
- new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType()))
+ .<MatchField, OFSerializer<SetFieldMatch>>getSerializer(new MessageTypeKey<>(
+ EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType().implementedInterface()))
.serialize(setFieldMatch, byteBuf));
}
.getWriteSetfieldMiss()
.nonnullSetFieldMatch().values()
.forEach(setFieldMatch -> Preconditions.checkNotNull(registry)
- .<MatchField, OFSerializer<SetFieldMatch>>getSerializer(
- new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType()))
+ .<MatchField, OFSerializer<SetFieldMatch>>getSerializer(new MessageTypeKey<>(
+ EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType().implementedInterface()))
.serialize(setFieldMatch, byteBuf));
}
.getWriteSetfield()
.nonnullSetFieldMatch().values()
.forEach(setFieldMatch -> Preconditions.checkNotNull(registry)
- .<MatchField, OFSerializer<SetFieldMatch>>getSerializer(
- new MessageTypeKey<>(EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType()))
+ .<MatchField, OFSerializer<SetFieldMatch>>getSerializer(new MessageTypeKey<>(
+ EncodeConstants.OF_VERSION_1_3, setFieldMatch.getMatchType().implementedInterface()))
.serialize(setFieldMatch, byteBuf));
}
}
@VisibleForTesting
- static Set<Class<? extends GroupCapability>> extractSupportedCapabilities(final GroupCapabilities capabilities) {
- final var builder = ImmutableSet.<Class<? extends GroupCapability>>builder();
+ static Set<GroupCapability> extractSupportedCapabilities(final GroupCapabilities capabilities) {
+ final var builder = ImmutableSet.<GroupCapability>builder();
if (capabilities.getOFPGFCCHAINING()) {
- builder.add(Chaining.class);
+ builder.add(Chaining.VALUE);
}
if (capabilities.getOFPGFCCHAININGCHECKS()) {
- builder.add(ChainingChecks.class);
+ builder.add(ChainingChecks.VALUE);
}
if (capabilities.getOFPGFCSELECTLIVENESS()) {
- builder.add(SelectLiveness.class);
+ builder.add(SelectLiveness.VALUE);
}
if (capabilities.getOFPGFCSELECTWEIGHT()) {
- builder.add(SelectWeight.class);
+ builder.add(SelectWeight.VALUE);
}
return builder.build();
}
@VisibleForTesting
- static Set<Class<? extends GroupType>> extractSupportedGroupTypes(final GroupTypes types) {
- final var builder = ImmutableSet.<Class<? extends GroupType>>builder();
+ static Set<GroupType> extractSupportedGroupTypes(final GroupTypes types) {
+ final var builder = ImmutableSet.<GroupType>builder();
if (types.getOFPGTALL()) {
- builder.add(GroupAll.class);
+ builder.add(GroupAll.VALUE);
}
if (types.getOFPGTSELECT()) {
- builder.add(GroupSelect.class);
+ builder.add(GroupSelect.VALUE);
}
if (types.getOFPGTINDIRECT()) {
- builder.add(GroupIndirect.class);
+ builder.add(GroupIndirect.VALUE);
}
if (types.getOFPGTFF()) {
- builder.add(GroupFf.class);
+ builder.add(GroupFf.VALUE);
}
return builder.build();
}
}
@VisibleForTesting
- protected static Set<Class<? extends MeterBand>> extractSupportedMeterBand(
+ protected static Set<MeterBand> extractSupportedMeterBand(
final MultipartReplyMeterFeatures replyBody, final MeterBandTypeBitmap bandTypes) {
- final var supportedMeterBand = ImmutableSet.<Class<? extends MeterBand>>builder();
+ final var supportedMeterBand = ImmutableSet.<MeterBand>builder();
if (bandTypes.getOFPMBTDROP()) {
- supportedMeterBand.add(MeterBandDrop.class);
+ supportedMeterBand.add(MeterBandDrop.VALUE);
}
if (replyBody.getBandTypes().getOFPMBTDSCPREMARK()) {
- supportedMeterBand.add(MeterBandDscpRemark.class);
+ supportedMeterBand.add(MeterBandDscpRemark.VALUE);
}
return supportedMeterBand.build();
}
@VisibleForTesting
- protected static Set<Class<? extends MeterCapability>> extractMeterCapabilities(final MeterFlags capabilities) {
- final var supportedCapabilities = ImmutableSet.<Class<? extends MeterCapability>>builder();
+ protected static Set<MeterCapability> extractMeterCapabilities(final MeterFlags capabilities) {
+ final var supportedCapabilities = ImmutableSet.<MeterCapability>builder();
if (capabilities.getOFPMFBURST()) {
- supportedCapabilities.add(MeterBurst.class);
+ supportedCapabilities.add(MeterBurst.VALUE);
}
if (capabilities.getOFPMFKBPS()) {
- supportedCapabilities.add(MeterKbps.class);
+ supportedCapabilities.add(MeterKbps.VALUE);
}
if (capabilities.getOFPMFPKTPS()) {
- supportedCapabilities.add(MeterPktps.class);
+ supportedCapabilities.add(MeterPktps.VALUE);
}
if (capabilities.getOFPMFSTATS()) {
- supportedCapabilities.add(MeterStats.class);
+ supportedCapabilities.add(MeterStats.VALUE);
}
return supportedCapabilities.build();
}
}
public static Match createWildcardedMatch() {
- return new MatchBuilder().setType(OxmMatchType.class).build();
+ return new MatchBuilder().setType(OxmMatchType.VALUE).build();
}
/**
* @param reason openflow java packet in reason
* @return corresponding MD-SAL reason class for given OF-API reason
*/
- public static Class<? extends PacketInReason> getMdSalPacketInReason(
+ public static PacketInReason getMdSalPacketInReason(
org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason reason) {
- Class<? extends PacketInReason> resultReason = PacketInReason.class;
+ // FIXME: use a switch expression
+ PacketInReason resultReason = PacketInReason.VALUE;
if (reason
.equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason
.OFPRNOMATCH)) {
- resultReason = NoMatch.class;
+ resultReason = NoMatch.VALUE;
} else if (reason
.equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason
.OFPRINVALIDTTL)) {
- resultReason = InvalidTtl.class;
+ resultReason = InvalidTtl.VALUE;
} else if (reason
.equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason
.OFPRACTION)) {
- resultReason = SendToController.class;
+ resultReason = SendToController.VALUE;
}
return resultReason;
}
Assert.assertNotNull(mpRq.getMatch());
Assert.assertNull(mpRq.getMatchV10());
- Assert.assertEquals(OxmMatchType.class, mpRq.getMatch().getType());
+ Assert.assertEquals(OxmMatchType.VALUE, mpRq.getMatch().getType());
}
@Test
assertTrue(reply.getActions().containsAll(ACTIONS_LIST));
assertTrue(reply.getMaxGroups().containsAll(MAX_GROUPS_LIST));
- assertEquals(Set.of(GroupAll.class, GroupSelect.class, GroupIndirect.class), reply.getGroupTypesSupported());
- assertEquals(Set.of(Chaining.class, ChainingChecks.class), reply.getGroupCapabilitiesSupported());
+ assertEquals(Set.of(GroupAll.VALUE, GroupSelect.VALUE, GroupIndirect.VALUE), reply.getGroupTypesSupported());
+ assertEquals(Set.of(Chaining.VALUE, ChainingChecks.VALUE), reply.getGroupCapabilitiesSupported());
assertEquals(0, buffer.readableBytes());
}
import io.netty.buffer.ByteBuf;
import io.netty.buffer.UnpooledByteBufAllocator;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import org.junit.Test;
import org.opendaylight.openflowjava.util.ByteBufUtils;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.multipart.reply.multipart.reply.body.MultipartReplyMeterFeatures;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterBand;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterBandDrop;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterBandDscpRemark;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterBurst;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterCapability;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterKbps;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterPktps;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterStats;
public class MultipartReplyMeterFeaturesDeserializerTest extends AbstractMultipartDeserializerTest {
private static final int MAX_METER = 3;
- private static final List BANDS_SUPPORTED = Collections.singletonList(MeterBandDrop.class);
- private static final List CAPABILITIES_SUPPORTED = Arrays.asList(MeterKbps.class, MeterBurst.class);
+ private static final List<MeterBand> BANDS_SUPPORTED = List.of(MeterBandDrop.VALUE);
+ private static final List<MeterCapability> CAPABILITIES_SUPPORTED = List.of(MeterKbps.VALUE, MeterBurst.VALUE);
private static final byte MAX_BANDS = 56;
private static final byte MAX_COLOR = 48;
buffer.writeInt(MAX_METER);
int bitMaskBands = ByteBufUtils.fillBitMask(0,
- BANDS_SUPPORTED.contains(MeterBandDrop.class),
- BANDS_SUPPORTED.contains(MeterBandDscpRemark.class));
+ BANDS_SUPPORTED.contains(MeterBandDrop.VALUE),
+ BANDS_SUPPORTED.contains(MeterBandDscpRemark.VALUE));
buffer.writeInt(bitMaskBands);
int bitMaskCapabilities = ByteBufUtils.fillBitMask(0,
- CAPABILITIES_SUPPORTED.contains(MeterKbps.class),
- CAPABILITIES_SUPPORTED.contains(MeterPktps.class),
- CAPABILITIES_SUPPORTED.contains(MeterBurst.class),
- CAPABILITIES_SUPPORTED.contains(MeterStats.class));
+ CAPABILITIES_SUPPORTED.contains(MeterKbps.VALUE),
+ CAPABILITIES_SUPPORTED.contains(MeterPktps.VALUE),
+ CAPABILITIES_SUPPORTED.contains(MeterBurst.VALUE),
+ CAPABILITIES_SUPPORTED.contains(MeterStats.VALUE));
buffer.writeInt(bitMaskCapabilities);
buffer.writeByte(MAX_BANDS);
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ARP_OP);
Optional<SetFieldMatch> fieldMatch = deserializer.deserialize(buffer);
- assertEquals(ArpOp.class, fieldMatch.get().key().getMatchType());
+ assertEquals(ArpOp.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ARP_SHA);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(ArpSha.class, fieldMatch.get().key().getMatchType());
+ assertEquals(ArpSha.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ARP_SPA);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(ArpSpa.class, fieldMatch.get().key().getMatchType());
+ assertEquals(ArpSpa.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ARP_THA);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(ArpTha.class, fieldMatch.get().key().getMatchType());
+ assertEquals(ArpTha.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ARP_TPA);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(ArpTpa.class, fieldMatch.get().key().getMatchType());
+ assertEquals(ArpTpa.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ETH_DST);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(EthDst.class, fieldMatch.get().key().getMatchType());
+ assertEquals(EthDst.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ETH_SRC);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(EthSrc.class, fieldMatch.get().key().getMatchType());
+ assertEquals(EthSrc.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ICMPV4_CODE);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(Icmpv4Code.class, fieldMatch.get().key().getMatchType());
+ assertEquals(Icmpv4Code.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ICMPV4_TYPE);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(Icmpv4Type.class, fieldMatch.get().key().getMatchType());
+ assertEquals(Icmpv4Type.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ICMPV6_CODE);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(Icmpv6Code.class, fieldMatch.get().key().getMatchType());
+ assertEquals(Icmpv6Code.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ICMPV6_TYPE);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(Icmpv6Type.class, fieldMatch.get().key().getMatchType());
+ assertEquals(Icmpv6Type.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IN_PHY_PORT);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(InPhyPort.class, fieldMatch.get().key().getMatchType());
+ assertEquals(InPhyPort.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IN_PORT);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(InPort.class, fieldMatch.get().key().getMatchType());
+ assertEquals(InPort.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IP_DSCP);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(IpDscp.class, fieldMatch.get().key().getMatchType());
+ assertEquals(IpDscp.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IP_ECN);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(IpEcn.class, fieldMatch.get().key().getMatchType());
+ assertEquals(IpEcn.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IP_PROTO);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(IpProto.class, fieldMatch.get().key().getMatchType());
+ assertEquals(IpProto.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV4_SRC);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(Ipv4Src.class, fieldMatch.get().key().getMatchType());
+ assertEquals(Ipv4Src.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV4_DST);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(Ipv4Dst.class, fieldMatch.get().key().getMatchType());
+ assertEquals(Ipv4Dst.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_SRC);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(Ipv6Src.class, fieldMatch.get().key().getMatchType());
+ assertEquals(Ipv6Src.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_DST);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(Ipv6Dst.class, fieldMatch.get().key().getMatchType());
+ assertEquals(Ipv6Dst.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_EXTHDR);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(Ipv6Exthdr.class, fieldMatch.get().key().getMatchType());
+ assertEquals(Ipv6Exthdr.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_FLABEL);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(Ipv6Flabel.class, fieldMatch.get().key().getMatchType());
+ assertEquals(Ipv6Flabel.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_ND_SLL);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(Ipv6NdSll.class, fieldMatch.get().key().getMatchType());
+ assertEquals(Ipv6NdSll.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_ND_TLL);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(Ipv6NdTll.class, fieldMatch.get().key().getMatchType());
+ assertEquals(Ipv6NdTll.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.IPV6_ND_TARGET);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(Ipv6NdTarget.class, fieldMatch.get().key().getMatchType());
+ assertEquals(Ipv6NdTarget.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.METADATA);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(Metadata.class, fieldMatch.get().key().getMatchType());
+ assertEquals(Metadata.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.MPLS_BOS);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(MplsBos.class, fieldMatch.get().key().getMatchType());
+ assertEquals(MplsBos.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.MPLS_LABEL);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(MplsLabel.class, fieldMatch.get().key().getMatchType());
+ assertEquals(MplsLabel.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.MPLS_TC);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(MplsTc.class, fieldMatch.get().key().getMatchType());
+ assertEquals(MplsTc.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.PBB_ISID);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(PbbIsid.class, fieldMatch.get().key().getMatchType());
+ assertEquals(PbbIsid.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.SCTP_SRC);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(SctpSrc.class, fieldMatch.get().key().getMatchType());
+ assertEquals(SctpSrc.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.SCTP_DST);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(SctpDst.class, fieldMatch.get().key().getMatchType());
+ assertEquals(SctpDst.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.TCP_SRC);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(TcpSrc.class, fieldMatch.get().key().getMatchType());
+ assertEquals(TcpSrc.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.TCP_DST);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(TcpDst.class, fieldMatch.get().key().getMatchType());
+ assertEquals(TcpDst.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.TUNNEL_ID);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(TunnelId.class, fieldMatch.get().key().getMatchType());
+ assertEquals(TunnelId.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.UDP_SRC);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(UdpSrc.class, fieldMatch.get().key().getMatchType());
+ assertEquals(UdpSrc.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.UDP_DST);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(UdpDst.class, fieldMatch.get().key().getMatchType());
+ assertEquals(UdpDst.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.VLAN_PCP);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(VlanPcp.class, fieldMatch.get().key().getMatchType());
+ assertEquals(VlanPcp.VALUE, fieldMatch.get().key().getMatchType());
addValues(buffer, OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.VLAN_VID);
fieldMatch = deserializer.deserialize(buffer);
- assertEquals(VlanVid.class, fieldMatch.get().key().getMatchType());
+ assertEquals(VlanVid.VALUE, fieldMatch.get().key().getMatchType());
assertEquals(0, buffer.readableBytes());
}
.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.apply.setfield.miss
.ApplySetfieldMissBuilder()
.setSetFieldMatch(BindingMap.of(new SetFieldMatchBuilder()
- .setMatchType(ArpOp.class)
+ .setMatchType(ArpOp.VALUE)
.setHasMask(false)
.build()))
.build())
.prop.type.table.feature.prop.type.apply.setfield
.ApplySetfieldBuilder()
.setSetFieldMatch(BindingMap.of(new SetFieldMatchBuilder()
- .setMatchType(ArpOp.class)
+ .setMatchType(ArpOp.VALUE)
.setHasMask(false)
.build()))
.build())
final Match property = new MatchBuilder()
.setMatchSetfield(new MatchSetfieldBuilder()
.setSetFieldMatch(BindingMap.of(new SetFieldMatchBuilder()
- .setMatchType(ArpOp.class)
+ .setMatchType(ArpOp.VALUE)
.setHasMask(false)
.build()))
.build())
final Wildcards property = new WildcardsBuilder()
.setWildcardSetfield(new WildcardSetfieldBuilder()
.setSetFieldMatch(BindingMap.of(
- new SetFieldMatchBuilder().setMatchType(ArpOp.class).setHasMask(false).build()))
+ new SetFieldMatchBuilder().setMatchType(ArpOp.VALUE).setHasMask(false).build()))
.build())
.build();
.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.write.setfield.miss
.WriteSetfieldMissBuilder()
.setSetFieldMatch(BindingMap.of(new SetFieldMatchBuilder()
- .setMatchType(ArpOp.class)
+ .setMatchType(ArpOp.VALUE)
.setHasMask(false)
.build()))
.build())
.setWriteSetfield(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature
.prop.type.table.feature.prop.type.write.setfield.WriteSetfieldBuilder()
.setSetFieldMatch(BindingMap.of(new SetFieldMatchBuilder()
- .setMatchType(ArpOp.class)
+ .setMatchType(ArpOp.VALUE)
.setHasMask(false)
.build()))
.build())
final Match property = new MatchBuilder()
.setMatchSetfield(new MatchSetfieldBuilder()
.setSetFieldMatch(BindingMap.ordered(
- new SetFieldMatchBuilder().setMatchType(ArpOp.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(ArpSha.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(ArpSpa.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(ArpTha.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(ArpTpa.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(EthDst.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(EthSrc.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(EthType.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(Icmpv4Code.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(Icmpv4Type.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(Icmpv6Code.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(Icmpv6Type.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(InPhyPort.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(InPort.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(IpDscp.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(IpEcn.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(IpProto.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(Ipv4Dst.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(Ipv4Src.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(Ipv6Dst.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(Ipv6Exthdr.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(Ipv6Flabel.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(Ipv6NdSll.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(Ipv6NdTarget.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(Ipv6NdTll.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(Ipv6Src.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(Metadata.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(MplsBos.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(MplsLabel.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(MplsTc.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(PbbIsid.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(SctpDst.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(SctpSrc.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(TcpDst.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(TcpFlags.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(TcpSrc.class).setHasMask(true).build(),
- new SetFieldMatchBuilder().setMatchType(TunnelId.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(UdpDst.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(UdpSrc.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(VlanPcp.class).setHasMask(false).build(),
- new SetFieldMatchBuilder().setMatchType(VlanVid.class).setHasMask(false).build()))
+ new SetFieldMatchBuilder().setMatchType(ArpOp.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(ArpSha.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(ArpSpa.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(ArpTha.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(ArpTpa.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(EthDst.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(EthSrc.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(EthType.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(Icmpv4Code.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(Icmpv4Type.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(Icmpv6Code.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(Icmpv6Type.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(InPhyPort.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(InPort.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(IpDscp.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(IpEcn.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(IpProto.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(Ipv4Dst.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(Ipv4Src.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(Ipv6Dst.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(Ipv6Exthdr.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(Ipv6Flabel.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(Ipv6NdSll.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(Ipv6NdTarget.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(Ipv6NdTll.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(Ipv6Src.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(Metadata.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(MplsBos.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(MplsLabel.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(MplsTc.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(PbbIsid.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(SctpDst.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(SctpSrc.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(TcpDst.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(TcpFlags.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(TcpSrc.VALUE).setHasMask(true).build(),
+ new SetFieldMatchBuilder().setMatchType(TunnelId.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(UdpDst.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(UdpSrc.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(VlanPcp.VALUE).setHasMask(false).build(),
+ new SetFieldMatchBuilder().setMatchType(VlanVid.VALUE).setHasMask(false).build()))
.build())
.build();
final PacketReceived packetReceived = packetReceivedTranslator.translate(packetInMessage, deviceInfo, null);
Assert.assertArrayEquals(packetInMessage.getData(), packetReceived.getPayload());
- Assert.assertEquals("org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.SendToController",
- packetReceived.getPacketInReason().getName());
+ Assert.assertEquals(
+ org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.SendToController.VALUE,
+ packetReceived.getPacketInReason());
Assert.assertEquals("openflow:10:" + PORT_NO,
packetReceived.getIngress().getValue().firstKeyOf(NodeConnector.class).getId().getValue());
Assert.assertEquals(0L, packetReceived.getFlowCookie().getValue().longValue());
}
private static MatchEntryBuilder assembleMatchEntryBld(final long portNumValue) {
- MatchEntryBuilder matchEntryBuilder = prepareHeader(InPort.class, false);
+ MatchEntryBuilder matchEntryBuilder = prepareHeader(InPort.VALUE, false);
InPortBuilder inPortBld = new InPortBuilder().setPortNumber(new PortNumber(Uint32.valueOf(portNumValue)));
InPortCaseBuilder caseBuilder = new InPortCaseBuilder();
caseBuilder.setInPort(inPortBld.build());
return matchEntryBuilder;
}
- private static MatchEntryBuilder prepareHeader(final Class<? extends MatchField> oxmMatchField,
+ private static MatchEntryBuilder prepareHeader(final MatchField oxmMatchField,
final boolean hasMask) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
builder.setOxmMatchField(oxmMatchField);
builder.setHasMask(hasMask);
return builder;
}
private static void assertMatch(final Match match) {
- assertTrue(match.getType().getClass().isInstance(OxmMatchType.class));
+ assertEquals(OxmMatchType.VALUE, match.getType());
}
private static void assertMatch(final MatchV10 matchV10) {
.setInPort(inPortBuilder.build());
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder()
- .setOxmClass(OpenflowBasicClass.class)
- .setOxmMatchField(InPort.class)
+ .setOxmClass(OpenflowBasicClass.VALUE)
+ .setOxmMatchField(InPort.VALUE)
.setHasMask(false)
.setMatchEntryValue(caseBuilder.build());
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.impl.util;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PacketInReason;
* Created by Martin Bobak mbobak@cisco.com on 7/2/14.
*/
public class PacketInUtilTest {
-
/**
* Test method for PacketInUtil#getMdSalPacketInReason(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow
* .common.types.rev130731.PacketInReason).
*/
@Test
public void testGetMdSalPacketInReason() {
- Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketInReason>
- resultReason;
-
- resultReason = PacketInUtil.getMdSalPacketInReason(PacketInReason.OFPRACTION);
- assertTrue(resultReason.getName().equals(SendToController.class.getName()));
-
- resultReason = PacketInUtil.getMdSalPacketInReason(PacketInReason.OFPRINVALIDTTL);
- assertTrue(resultReason.getName().equals(InvalidTtl.class.getName()));
-
- resultReason = PacketInUtil.getMdSalPacketInReason(PacketInReason.OFPRNOMATCH);
- assertTrue(resultReason.getName().equals(NoMatch.class.getName()));
-
+ assertEquals(SendToController.VALUE, PacketInUtil.getMdSalPacketInReason(PacketInReason.OFPRACTION));
+ assertEquals(InvalidTtl.VALUE, PacketInUtil.getMdSalPacketInReason(PacketInReason.OFPRINVALIDTTL));
+ assertEquals(NoMatch.VALUE, PacketInUtil.getMdSalPacketInReason(PacketInReason.OFPRNOMATCH));
}
}
<dependencies>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
matchEntry.getOxmMatchField());
// If entry is experimenter, set experimenter ID to key
- if (matchEntry.getOxmClass().equals(ExperimenterClass.class)) {
+ if (ExperimenterClass.VALUE.equals(matchEntry.getOxmClass())) {
key.setExperimenterId(
((ExperimenterIdCase) matchEntry.getMatchEntryValue()).getExperimenter().getExperimenter().getValue());
}
package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
import com.google.common.collect.Ordering;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.grouping.TableFeatureProperties;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.grouping.TableFeaturePropertiesBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.table.service.rev131026.table.update.UpdatedTable;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MatchField;
import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch;
import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatchKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.TableFeaturePropType;
private static final Ordering<org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features
.table.features.table.properties.TableFeatureProperties> TABLE_FEATURE_PROPS_ORDERING =
Ordering.from(OrderComparator.build());
- private static final Map<Class<?>, Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm
- .rev150225.MatchField>> SAL_TO_OF_TABLE_FEATURES;
- private static final List<Class<?>> TYPES = Arrays.asList(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types
- .rev131026.TableFeatures.class, UpdatedTable.class);
-
- static {
- Builder<Class<?>, Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm
- .rev150225.MatchField>> builder = ImmutableMap.builder();
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpOp.class, ArpOp.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSha.class, ArpSha.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSpa.class, ArpSpa.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTha.class, ArpTha.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTpa.class, ArpTpa.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthDst.class, EthDst.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthSrc.class, EthSrc.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthType.class, EthType.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Code.class,
- Icmpv4Code.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Type.class,
- Icmpv4Type.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Code.class,
- Icmpv6Code.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Type.class,
- Icmpv6Type.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPhyPort.class,
- InPhyPort.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPort.class, InPort.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpDscp.class, IpDscp.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpEcn.class, IpEcn.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpProto.class, IpProto.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Dst.class, Ipv4Dst.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Src.class, Ipv4Src.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Dst.class, Ipv6Dst.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Exthdr.class,
- Ipv6Exthdr.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Flabel.class,
- Ipv6Flabel.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdSll.class,
- Ipv6NdSll.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTarget.class,
- Ipv6NdTarget.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTll.class,
- Ipv6NdTll.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Src.class, Ipv6Src.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Metadata.class, Metadata.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsBos.class, MplsBos.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsLabel.class,
- MplsLabel.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsTc.class, MplsTc.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.PbbIsid.class, PbbIsid.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpDst.class, SctpDst.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpSrc.class, SctpSrc.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpDst.class, TcpDst.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpSrc.class, TcpSrc.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelId.class, TunnelId.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpDst.class, UdpDst.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpSrc.class, UdpSrc.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanPcp.class, VlanPcp.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanVid.class, VlanVid.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Dst.class,
- Ipv4Dst.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Src.class,
- Ipv4Src.class);
- builder.put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpFlags.class, TcpFlags.class);
- SAL_TO_OF_TABLE_FEATURES = builder.build();
- }
+ private static final List<Class<?>> TYPES = List.of(
+ org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TableFeatures.class,
+ UpdatedTable.class);
+
+ private static final ImmutableMap<MatchField,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField> SAL_TO_OF_TABLE_FEATURES =
+ ImmutableMap.<MatchField,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField>builder()
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpOp.VALUE, ArpOp.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSha.VALUE, ArpSha.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSpa.VALUE, ArpSpa.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTha.VALUE, ArpTha.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTpa.VALUE, ArpTpa.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthDst.VALUE, EthDst.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthSrc.VALUE, EthSrc.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthType.VALUE, EthType.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Code.VALUE,
+ Icmpv4Code.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Type.VALUE,
+ Icmpv4Type.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Code.VALUE,
+ Icmpv6Code.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Type.VALUE,
+ Icmpv6Type.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPhyPort.VALUE,
+ InPhyPort.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPort.VALUE, InPort.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpDscp.VALUE, IpDscp.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpEcn.VALUE, IpEcn.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpProto.VALUE, IpProto.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Dst.VALUE, Ipv4Dst.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Src.VALUE, Ipv4Src.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Dst.VALUE, Ipv6Dst.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Exthdr.VALUE,
+ Ipv6Exthdr.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Flabel.VALUE,
+ Ipv6Flabel.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdSll.VALUE,
+ Ipv6NdSll.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTarget.VALUE,
+ Ipv6NdTarget.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTll.VALUE,
+ Ipv6NdTll.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Src.VALUE, Ipv6Src.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Metadata.VALUE, Metadata.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsBos.VALUE, MplsBos.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsLabel.VALUE,
+ MplsLabel.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsTc.VALUE, MplsTc.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.PbbIsid.VALUE, PbbIsid.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpDst.VALUE, SctpDst.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpSrc.VALUE, SctpSrc.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpDst.VALUE, TcpDst.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpSrc.VALUE, TcpSrc.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelId.VALUE, TunnelId.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpDst.VALUE, UdpDst.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpSrc.VALUE, UdpSrc.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanPcp.VALUE, VlanPcp.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanVid.VALUE, VlanVid.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Dst.VALUE,
+ Ipv4Dst.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Src.VALUE,
+ Ipv4Src.VALUE)
+ .put(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpFlags.VALUE, TcpFlags.VALUE)
+ .build();
private static List<TableFeatureProperties> toTableProperties(
final org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.table.features
List<MatchEntry> matchEntriesList = new ArrayList<>();
for (SetFieldMatch currMatch : setFields.values()) {
- Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MatchField>
- currMatchType = currMatch.getMatchType();
+ org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MatchField currMatchType =
+ currMatch.getMatchType();
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField>
- ofTableFeatureClass = SAL_TO_OF_TABLE_FEATURES.get(currMatchType);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField ofTableFeatureClass =
+ SAL_TO_OF_TABLE_FEATURES.get(currMatchType);
setMatchEntry(matchEntryBuilder, ofTableFeatureClass, currMatch.getHasMask());
matchEntriesList.add(matchEntryBuilder.build());
}
}
private static void setMatchEntry(final MatchEntryBuilder builder,
- final Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225
- .MatchField> field, final Boolean hasMask) {
- if (field == TcpFlags.class) {
- builder.setOxmClass(ExperimenterClass.class);
+ final org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField field,
+ final Boolean hasMask) {
+ if (TcpFlags.VALUE.equals(field)) {
+ builder.setOxmClass(ExperimenterClass.VALUE);
} else {
- builder.setOxmClass(OpenflowBasicClass.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
}
builder.setOxmMatchField(field);
builder.setHasMask(hasMask);
private static final Map<TableFeaturesPropType, ActionExecutor> TABLE_FEATURE_PROPERTY_TYPE_TO_ACTION;
private static final Map<Class<?>,
org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action> OF_TO_SAL_ACTION;
- private static final Map<Class<? extends MatchField>, Class<? extends org.opendaylight.yang.gen.v1.urn
- .opendaylight.table.types.rev131026.MatchField>> OF_TO_SAL_TABLE_FEATURE_PROPERTIES;
+ private static final Map<MatchField, org.opendaylight.yang.gen.v1.urn
+ .opendaylight.table.types.rev131026.MatchField> OF_TO_SAL_TABLE_FEATURE_PROPERTIES;
private static final Set<Class<?>> TYPES = Collections.singleton(MultipartReplyTableFeatures.class);
static {
}
static {
- final Builder<Class<? extends MatchField>, Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight.table
- .types.rev131026.MatchField>> builder = ImmutableMap.builder();
-
- builder.put(ArpOp.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpOp.class);
- builder.put(ArpSha.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSha.class);
- builder.put(ArpSpa.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSpa.class);
- builder.put(ArpTha.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTha.class);
- builder.put(ArpTpa.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTpa.class);
- builder.put(EthDst.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthDst.class);
- builder.put(EthSrc.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthSrc.class);
- builder.put(EthType.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthType.class);
- builder.put(Icmpv4Code.class,
- org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Code.class);
- builder.put(Icmpv4Type.class,
- org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Type.class);
- builder.put(Icmpv6Code.class,
- org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Code.class);
- builder.put(Icmpv6Type.class,
- org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Type.class);
- builder.put(InPhyPort.class,
- org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPhyPort.class);
- builder.put(InPort.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPort.class);
- builder.put(IpDscp.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpDscp.class);
- builder.put(IpEcn.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpEcn.class);
- builder.put(IpProto.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpProto.class);
- builder.put(Ipv4Dst.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Dst.class);
- builder.put(Ipv4Src.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Src.class);
- builder.put(Ipv6Dst.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Dst.class);
- builder.put(Ipv6Exthdr.class,
- org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Exthdr.class);
- builder.put(Ipv6Flabel.class,
- org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Flabel.class);
- builder.put(Ipv6NdSll.class,
- org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdSll.class);
- builder.put(Ipv6NdTarget.class,
- org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTarget.class);
- builder.put(Ipv6NdTll.class,
- org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTll.class);
- builder.put(Ipv6Src.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Src.class);
- builder.put(Metadata.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Metadata.class);
- builder.put(MplsBos.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsBos.class);
- builder.put(MplsLabel.class,
- org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsLabel.class);
- builder.put(MplsTc.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsTc.class);
- builder.put(PbbIsid.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.PbbIsid.class);
- builder.put(SctpDst.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpDst.class);
- builder.put(SctpSrc.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpSrc.class);
- builder.put(TcpDst.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpDst.class);
- builder.put(TcpSrc.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpSrc.class);
- builder.put(TunnelId.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelId.class);
- builder.put(UdpDst.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpDst.class);
- builder.put(UdpSrc.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpSrc.class);
- builder.put(VlanPcp.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanPcp.class);
- builder.put(VlanVid.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanVid.class);
- builder.put(TcpFlags.class, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpFlags.class);
+ final Builder<MatchField, org.opendaylight.yang.gen.v1.urn.opendaylight.table
+ .types.rev131026.MatchField> builder = ImmutableMap.builder();
+
+ builder.put(ArpOp.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpOp.VALUE);
+ builder.put(ArpSha.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSha.VALUE);
+ builder.put(ArpSpa.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSpa.VALUE);
+ builder.put(ArpTha.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTha.VALUE);
+ builder.put(ArpTpa.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTpa.VALUE);
+ builder.put(EthDst.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthDst.VALUE);
+ builder.put(EthSrc.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthSrc.VALUE);
+ builder.put(EthType.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthType.VALUE);
+ builder.put(Icmpv4Code.VALUE,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Code.VALUE);
+ builder.put(Icmpv4Type.VALUE,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Type.VALUE);
+ builder.put(Icmpv6Code.VALUE,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Code.VALUE);
+ builder.put(Icmpv6Type.VALUE,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Type.VALUE);
+ builder.put(InPhyPort.VALUE,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPhyPort.VALUE);
+ builder.put(InPort.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPort.VALUE);
+ builder.put(IpDscp.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpDscp.VALUE);
+ builder.put(IpEcn.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpEcn.VALUE);
+ builder.put(IpProto.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpProto.VALUE);
+ builder.put(Ipv4Dst.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Dst.VALUE);
+ builder.put(Ipv4Src.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Src.VALUE);
+ builder.put(Ipv6Dst.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Dst.VALUE);
+ builder.put(Ipv6Exthdr.VALUE,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Exthdr.VALUE);
+ builder.put(Ipv6Flabel.VALUE,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Flabel.VALUE);
+ builder.put(Ipv6NdSll.VALUE,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdSll.VALUE);
+ builder.put(Ipv6NdTarget.VALUE,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTarget.VALUE);
+ builder.put(Ipv6NdTll.VALUE,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTll.VALUE);
+ builder.put(Ipv6Src.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Src.VALUE);
+ builder.put(Metadata.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Metadata.VALUE);
+ builder.put(MplsBos.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsBos.VALUE);
+ builder.put(MplsLabel.VALUE,
+ org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsLabel.VALUE);
+ builder.put(MplsTc.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsTc.VALUE);
+ builder.put(PbbIsid.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.PbbIsid.VALUE);
+ builder.put(SctpDst.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpDst.VALUE);
+ builder.put(SctpSrc.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpSrc.VALUE);
+ builder.put(TcpDst.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpDst.VALUE);
+ builder.put(TcpSrc.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpSrc.VALUE);
+ builder.put(TunnelId.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelId.VALUE);
+ builder.put(UdpDst.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpDst.VALUE);
+ builder.put(UdpSrc.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpSrc.VALUE);
+ builder.put(VlanPcp.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanPcp.VALUE);
+ builder.put(VlanVid.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanVid.VALUE);
+ builder.put(TcpFlags.VALUE, org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpFlags.VALUE);
OF_TO_SAL_TABLE_FEATURE_PROPERTIES = builder.build();
}
// This handles only OpenflowBasicClass oxm class.
for (MatchEntry currMatch : properties.augmentation(OxmRelatedTableFeatureProperty.class)
.getMatchEntry()) {
- Class<? extends MatchField> ofMatchField = currMatch.getOxmMatchField();
+ MatchField ofMatchField = currMatch.getOxmMatchField();
if (setHasMask) {
setFieldMatchBuilder.setHasMask(currMatch.getHasMask());
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
import java.util.ArrayList;
SetDlDstAction setdldstaction = source.getSetDlDstAction();
MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
- matchBuilder.setOxmClass(OpenflowBasicClass.class);
- matchBuilder.setOxmMatchField(EthDst.class);
+ matchBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchBuilder.setOxmMatchField(EthDst.VALUE);
EthDstCaseBuilder ethDstCaseBuilder = new EthDstCaseBuilder();
EthDstBuilder ethDstBuilder = new EthDstBuilder();
ethDstBuilder.setMacAddress(setdldstaction.getAddress());
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
import java.util.ArrayList;
SetDlSrcAction setdlsrcaction = source.getSetDlSrcAction();
MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
- matchBuilder.setOxmClass(OpenflowBasicClass.class);
- matchBuilder.setOxmMatchField(EthSrc.class);
+ matchBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchBuilder.setOxmMatchField(EthSrc.VALUE);
EthSrcCaseBuilder ethSrcCaseBuilder = new EthSrcCaseBuilder();
EthSrcBuilder ethSrcBuilder = new EthSrcBuilder();
ethSrcBuilder.setMacAddress(setdlsrcaction.getAddress());
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
import com.google.common.base.Splitter;
Iterable<String> addressParts = PREFIX_SPLITTER.split(((Ipv4) address).getIpv4Address().getValue());
Ipv4Address result = new Ipv4Address(addressParts.iterator().next());
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(Ipv4Dst.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Ipv4Dst.VALUE);
Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();
Ipv4DstBuilder ipv4DstBuilder = new Ipv4DstBuilder();
Iterable<String> addressParts = PREFIX_SPLITTER.split(((Ipv6) address).getIpv6Address().getValue());
Ipv6Address result = new Ipv6Address(addressParts.iterator().next());
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(Ipv6Dst.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Ipv6Dst.VALUE);
Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder();
Ipv6DstBuilder ipv6DstBuilder = new Ipv6DstBuilder();
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
import com.google.common.base.Splitter;
Ipv4Address result = new Ipv4Address(addressParts.iterator().next());
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(Ipv4Src.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Ipv4Src.VALUE);
Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();
Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();
Ipv6Address result = new Ipv6Address(addressParts.iterator().next());
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(Ipv6Src.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Ipv6Src.VALUE);
Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder();
Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder();
public Optional<Action> process(final SetTpDstActionCase source, final ActionConvertorData data,
final ConvertorExecutor convertorExecutor) {
final MatchEntryBuilder matchBuilder = new MatchEntryBuilder()
- .setOxmClass(OpenflowBasicClass.class)
+ .setOxmClass(OpenflowBasicClass.VALUE)
.setHasMask(Boolean.FALSE);
final Uint8 ipProtocol = data.getIpProtocol();
switch (protocol) {
case ICMP:
- matchBuilder.setOxmMatchField(Icmpv4Code.class);
+ matchBuilder.setOxmMatchField(Icmpv4Code.VALUE);
matchBuilder.setMatchEntryValue(new Icmpv4CodeCaseBuilder()
.setIcmpv4Code(new Icmpv4CodeBuilder()
.setIcmpv4Code(Uint8.valueOf(0xFF & port.toJava()))
.build());
break;
case ICMPV6:
- matchBuilder.setOxmMatchField(Icmpv6Code.class);
+ matchBuilder.setOxmMatchField(Icmpv6Code.VALUE);
matchBuilder.setMatchEntryValue(new Icmpv6CodeCaseBuilder()
.setIcmpv6Code(new Icmpv6CodeBuilder()
.setIcmpv6Code(Uint8.valueOf(0xFF & port.toJava()))
.build());
break;
case TCP:
- matchBuilder.setOxmMatchField(TcpDst.class);
+ matchBuilder.setOxmMatchField(TcpDst.VALUE);
TcpDstCaseBuilder tcpDstCaseBuilder = new TcpDstCaseBuilder();
TcpDstBuilder tcpDstBuilder = new TcpDstBuilder();
tcpDstBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types
matchBuilder.setMatchEntryValue(tcpDstCaseBuilder.build());
break;
case UDP:
- matchBuilder.setOxmMatchField(UdpDst.class);
+ matchBuilder.setOxmMatchField(UdpDst.VALUE);
UdpDstCaseBuilder udpDstCaseBuilder = new UdpDstCaseBuilder();
UdpDstBuilder udpDstBuilder = new UdpDstBuilder();
udpDstBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
import java.util.ArrayList;
SetTpSrcAction settpsrcaction = source.getSetTpSrcAction();
MatchEntryBuilder matchBuilder = new MatchEntryBuilder()
- .setOxmClass(OpenflowBasicClass.class)
+ .setOxmClass(OpenflowBasicClass.VALUE)
.setHasMask(Boolean.FALSE);
final Uint16 port = settpsrcaction.getPort().getValue();
if (protocol != null) {
switch (protocol) {
case ICMP:
- matchBuilder.setOxmMatchField(Icmpv4Type.class);
+ matchBuilder.setOxmMatchField(Icmpv4Type.VALUE);
matchBuilder.setMatchEntryValue(new Icmpv4TypeCaseBuilder()
.setIcmpv4Type(new Icmpv4TypeBuilder().setIcmpv4Type(type).build())
.build());
break;
case ICMPV6:
- matchBuilder.setOxmMatchField(Icmpv6Type.class);
+ matchBuilder.setOxmMatchField(Icmpv6Type.VALUE);
matchBuilder.setMatchEntryValue(new Icmpv6TypeCaseBuilder()
.setIcmpv6Type(new Icmpv6TypeBuilder().setIcmpv6Type(type).build())
.build());
break;
case TCP:
- matchBuilder.setOxmMatchField(TcpSrc.class);
+ matchBuilder.setOxmMatchField(TcpSrc.VALUE);
matchBuilder.setMatchEntryValue(new TcpSrcCaseBuilder()
.setTcpSrc(new TcpSrcBuilder()
.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types
.build());
break;
case UDP:
- matchBuilder.setOxmMatchField(UdpSrc.class);
+ matchBuilder.setOxmMatchField(UdpSrc.VALUE);
matchBuilder.setMatchEntryValue(new UdpSrcCaseBuilder()
.setUdpSrc(new UdpSrcBuilder()
.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.cases;
import java.util.ArrayList;
@NonNull
@Override
- public Optional<Action> process(@NonNull final SetVlanIdActionCase source, final ActionConvertorData data,
+ public Optional<Action> process(final SetVlanIdActionCase source, final ActionConvertorData data,
ConvertorExecutor convertorExecutor) {
MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
- matchBuilder.setOxmClass(OpenflowBasicClass.class);
- matchBuilder.setOxmMatchField(VlanVid.class);
+ matchBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchBuilder.setOxmMatchField(VlanVid.VALUE);
matchBuilder.setHasMask(false);
VlanVidCaseBuilder vlanVidCaseBuilder = new VlanVidCaseBuilder();
VlanVidBuilder vlanVidBuilder = new VlanVidBuilder();
public Optional<Action> process(@NonNull final StripVlanActionCase source, final ActionConvertorData data,
ConvertorExecutor convertorExecutor) {
MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
- matchBuilder.setOxmClass(OpenflowBasicClass.class);
- matchBuilder.setOxmMatchField(VlanVid.class);
+ matchBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchBuilder.setOxmMatchField(VlanVid.VALUE);
matchBuilder.setHasMask(false);
VlanVidCaseBuilder vlanVidCaseBuilder = new VlanVidCaseBuilder();
VlanVidBuilder vlanVidBuilder = new VlanVidBuilder();
/**
* OxmMatch type.
*/
- public static final Class<? extends MatchTypeBase> DEFAULT_MATCH_TYPE = OxmMatchType.class;
+ public static final MatchTypeBase DEFAULT_MATCH_TYPE = OxmMatchType.VALUE;
/**
* default match entries - empty.
//TODO: currently this matchconverter is mapped to OF1.3 in MatchInjector. Will need to revisit during 1.4+
final Uint32 portNumber = InventoryDataServiceUtil.portNumberfromNodeConnectorId(OpenflowVersion.OF13, inPort);
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
matchEntryBuilder.setHasMask(false);
- matchEntryBuilder.setOxmMatchField(InPort.class);
+ matchEntryBuilder.setOxmMatchField(InPort.VALUE);
InPortCaseBuilder caseBuilder = new InPortCaseBuilder();
InPortBuilder portBuilder = new InPortBuilder();
portBuilder.setPortNumber(new PortNumber(portNumber));
final Uint32 portNumber = InventoryDataServiceUtil.portNumberfromNodeConnectorId(OpenflowVersion.OF13,
inPhyPort);
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
matchEntryBuilder.setHasMask(false);
- matchEntryBuilder.setOxmMatchField(InPhyPort.class);
+ matchEntryBuilder.setOxmMatchField(InPhyPort.VALUE);
InPhyPortCaseBuilder caseBuilder = new InPhyPortCaseBuilder();
InPhyPortBuilder portBuilder = new InPhyPortBuilder();
portBuilder.setPortNumber(new PortNumber(portNumber));
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
final boolean hasmask = metadata.getMetadataMask() != null;
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(Metadata.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Metadata.VALUE);
MetadataCaseBuilder metadataCaseBuilder = new MetadataCaseBuilder();
org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry
.value.metadata._case.MetadataBuilder metadataBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight
}
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(PacketType.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(PacketType.VALUE);
matchEntryBuilder.setHasMask(false);
PacketTypeCaseBuilder packetTypeCaseBuilder = new PacketTypeCaseBuilder();
PacketTypeBuilder packetTypeBuilder = new PacketTypeBuilder();
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
matchEntryBuilder.setMatchEntryValue(tunnelIdCaseBuilder.build());
matchEntryBuilder.setHasMask(hasMask);
- matchEntryBuilder.setOxmMatchField(TunnelId.class);
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
+ matchEntryBuilder.setOxmMatchField(TunnelId.VALUE);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
matchEntryList.add(matchEntryBuilder.build());
}
if (vlanMatch.getVlanId() != null) {
VlanId vlanId = vlanMatch.getVlanId();
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(VlanVid.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(VlanVid.VALUE);
VlanVidBuilder vlanVidBuilder = new VlanVidBuilder();
boolean setCfiBit = false;
Uint16 vidEntryValue = Uint16.ZERO;
EthernetDestination ethernetDestination = ethernetMatch.getEthernetDestination();
if (ethernetDestination != null) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(EthDst.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(EthDst.VALUE);
EthDstCaseBuilder ethDstCaseBuilder = new EthDstCaseBuilder();
EthDstBuilder ethDstBuilder = new EthDstBuilder();
ethDstBuilder.setMacAddress(ethernetDestination.getAddress());
EthernetSource ethernetSource = ethernetMatch.getEthernetSource();
if (ethernetSource != null) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(EthSrc.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(EthSrc.VALUE);
EthSrcCaseBuilder ethSrcCaseBuilder = new EthSrcCaseBuilder();
EthSrcBuilder ethDstBuilder = new EthSrcBuilder();
ethDstBuilder.setMacAddress(ethernetSource.getAddress());
private static void tcpFlagsMatch(final List<MatchEntry> matchEntryList, final TcpFlagsMatch tcpFlagsMatch) {
ExperimenterIdCaseBuilder expIdCaseBuilder = new ExperimenterIdCaseBuilder();
if (tcpFlagsMatch != null) {
- MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(ExperimenterClass.class);
- matchEntryBuilder.setHasMask(false);
- matchEntryBuilder.setOxmMatchField(TcpFlags.class);
+ MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder()
+ .setOxmClass(ExperimenterClass.VALUE)
+ .setHasMask(false)
+ .setOxmMatchField(TcpFlags.VALUE);
TcpFlagsContainerBuilder tcpFlagsContainerBuilder = new TcpFlagsContainerBuilder();
TcpFlagsBuilder tcpFlagsBuilder = new TcpFlagsBuilder();
private static MatchEntry toOfMplsPbb(final Pbb pbb) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
final boolean hasmask = pbb.getPbbMask() != null;
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(PbbIsid.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(PbbIsid.VALUE);
PbbIsidCaseBuilder pbbIsidCaseBuilder = new PbbIsidCaseBuilder();
PbbIsidBuilder pbbIsidBuilder = new PbbIsidBuilder();
pbbIsidBuilder.setIsid(pbb.getPbbIsid());
private static MatchEntry toOfMplsTc(final Uint8 mplsTc) {
return new MatchEntryBuilder()
- .setOxmClass(OpenflowBasicClass.class)
+ .setOxmClass(OpenflowBasicClass.VALUE)
.setHasMask(Boolean.FALSE)
- .setOxmMatchField(MplsTc.class)
+ .setOxmMatchField(MplsTc.VALUE)
.setMatchEntryValue(new MplsTcCaseBuilder()
.setMplsTc(new MplsTcBuilder().setTc(mplsTc).build())
.build())
private static MatchEntry toOfMplsBos(final Uint8 mplsBos) {
return new MatchEntryBuilder()
- .setOxmClass(OpenflowBasicClass.class)
+ .setOxmClass(OpenflowBasicClass.VALUE)
.setHasMask(Boolean.FALSE)
- .setOxmMatchField(MplsBos.class)
+ .setOxmMatchField(MplsBos.VALUE)
.setMatchEntryValue(new MplsBosCaseBuilder()
.setMplsBos(new MplsBosBuilder().setBos(mplsBos.toJava() != 0).build())
.build())
private static MatchEntry toOfMplsLabel(final Uint32 mplsLabel) {
return new MatchEntryBuilder()
- .setOxmClass(OpenflowBasicClass.class)
+ .setOxmClass(OpenflowBasicClass.VALUE)
.setHasMask(Boolean.FALSE)
- .setOxmMatchField(MplsLabel.class)
+ .setOxmMatchField(MplsLabel.VALUE)
.setMatchEntryValue(new MplsLabelCaseBuilder()
.setMplsLabel(new MplsLabelBuilder().setMplsLabel(mplsLabel).build())
.build())
private static MatchEntry toOfEthernetType(final EthernetType ethernetType) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
matchEntryBuilder.setHasMask(false);
- matchEntryBuilder.setOxmMatchField(EthType.class);
+ matchEntryBuilder.setOxmMatchField(EthType.VALUE);
EthTypeCaseBuilder ethTypeCaseBuilder = new EthTypeCaseBuilder();
EthTypeBuilder ethTypeBuilder = new EthTypeBuilder();
EtherType etherType = new EtherType(ethernetType.getType().getValue().toUint16());
private static MatchEntry toOfIcmpv4Type(final Uint8 icmpv4Type) {
return new MatchEntryBuilder()
- .setOxmClass(OpenflowBasicClass.class)
+ .setOxmClass(OpenflowBasicClass.VALUE)
.setHasMask(Boolean.FALSE)
- .setOxmMatchField(Icmpv4Type.class)
+ .setOxmMatchField(Icmpv4Type.VALUE)
.setMatchEntryValue(new Icmpv4TypeCaseBuilder()
.setIcmpv4Type(new Icmpv4TypeBuilder().setIcmpv4Type(icmpv4Type).build())
.build())
private static MatchEntry toOfIcmpv4Code(final Uint8 icmpv4Code) {
return new MatchEntryBuilder()
- .setOxmClass(OpenflowBasicClass.class)
+ .setOxmClass(OpenflowBasicClass.VALUE)
.setHasMask(Boolean.FALSE)
- .setOxmMatchField(Icmpv4Code.class)
+ .setOxmMatchField(Icmpv4Code.VALUE)
.setMatchEntryValue(new Icmpv4CodeCaseBuilder()
.setIcmpv4Code(new Icmpv4CodeBuilder().setIcmpv4Code(icmpv4Code).build()).build())
.build();
private static MatchEntry toOfIcmpv6Type(final Uint8 icmpv6Type) {
return new MatchEntryBuilder()
- .setOxmClass(OpenflowBasicClass.class)
+ .setOxmClass(OpenflowBasicClass.VALUE)
.setHasMask(Boolean.FALSE)
- .setOxmMatchField(Icmpv6Type.class)
+ .setOxmMatchField(Icmpv6Type.VALUE)
.setMatchEntryValue(new Icmpv6TypeCaseBuilder()
.setIcmpv6Type(new Icmpv6TypeBuilder().setIcmpv6Type(icmpv6Type).build())
.build())
private static MatchEntry toOfIcmpv6Code(final Uint8 icmpv6Code) {
return new MatchEntryBuilder()
- .setOxmClass(OpenflowBasicClass.class)
+ .setOxmClass(OpenflowBasicClass.VALUE)
.setHasMask(Boolean.FALSE)
- .setOxmMatchField(Icmpv6Code.class)
+ .setOxmMatchField(Icmpv6Code.VALUE)
.setMatchEntryValue(new Icmpv6CodeCaseBuilder()
.setIcmpv6Code(new Icmpv6CodeBuilder().setIcmpv6Code(icmpv6Code).build())
.build())
private static MatchEntry toOfIpProto(final Uint8 ipProtocol) {
return new MatchEntryBuilder()
- .setOxmClass(OpenflowBasicClass.class)
+ .setOxmClass(OpenflowBasicClass.VALUE)
.setHasMask(Boolean.FALSE)
- .setOxmMatchField(IpProto.class)
+ .setOxmMatchField(IpProto.VALUE)
.setMatchEntryValue(new IpProtoCaseBuilder()
.setIpProto(new IpProtoBuilder().setProtocolNumber(ipProtocol).build())
.build())
private static MatchEntry toOfIpEcn(final Uint8 ipEcn) {
return new MatchEntryBuilder()
- .setOxmClass(OpenflowBasicClass.class)
+ .setOxmClass(OpenflowBasicClass.VALUE)
.setHasMask(Boolean.FALSE)
- .setOxmMatchField(IpEcn.class)
+ .setOxmMatchField(IpEcn.VALUE)
.setMatchEntryValue(new IpEcnCaseBuilder().setIpEcn(new IpEcnBuilder().setEcn(ipEcn).build()).build())
.build();
}
*/
public static MatchEntry toOfIpDscp(final Dscp ipDscp) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
matchEntryBuilder.setHasMask(false);
- matchEntryBuilder.setOxmMatchField(IpDscp.class);
+ matchEntryBuilder.setOxmMatchField(IpDscp.VALUE);
IpDscpCaseBuilder ipDscpCaseBuilder = new IpDscpCaseBuilder();
IpDscpBuilder ipDscpBuilder = new IpDscpBuilder();
public static MatchEntry toOfVlanPcp(
final org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanPcp vlanPcp) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
matchEntryBuilder.setHasMask(false);
- matchEntryBuilder.setOxmMatchField(VlanPcp.class);
+ matchEntryBuilder.setOxmMatchField(VlanPcp.VALUE);
VlanPcpCaseBuilder vlanPcpCaseBuilder = new VlanPcpCaseBuilder();
VlanPcpBuilder vlanPcpBuilder = new VlanPcpBuilder();
vlanPcpBuilder.setVlanPcp(vlanPcp.getValue());
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.MatchEntryValue;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Dst;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Src;
/**
* Converts Openflow 1.3+ specific flow match to MD-SAL format flow match.
data.setTcpFlagsMatchBuilder(new TcpFlagsMatchBuilder());
for (MatchEntry ofMatch : source.nonnullMatchEntry()) {
- if (TunnelIpv4Dst.class.isAssignableFrom(ofMatch.getOxmMatchField())
- || TunnelIpv4Src.class.isAssignableFrom(ofMatch.getOxmMatchField())) {
- /*
- * TODO: Fix TunnelIpv4Src and Ipv4Dst, because current implementation do not work
- * TunnelIpv4Src and TunnelIpv4Dst are not compatible with
- * org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField
- * and so you cannot even set them to OxmMatchField.
- * Creation of TunnelIpv4SrcCase and TunnelIpv4DstCase in
- * org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value
- * .grouping.match.entry.value
- * and proper use of it can fix this bug.
- */
- OF_TO_SAL_TUNNEL_PROCESSOR.process(ofMatch.getMatchEntryValue(), data, getConvertorExecutor());
- } else {
- data.setOxmMatchField(ofMatch.getOxmMatchField());
- OF_TO_SAL_PROCESSOR.process(ofMatch.getMatchEntryValue(), data, getConvertorExecutor());
- }
+ // FIXME: Fix TunnelIpv4Src and Ipv4Dst, because current implementation do not work
+ // TunnelIpv4Src and TunnelIpv4Dst are not compatible with
+ // org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField
+ // and so you cannot even set them to OxmMatchField.
+ //
+ // Create a TunnelIpv4SrcCase and a TunnelIpv4DstCase in
+ // org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value
+ // .grouping.match.entry.value
+ // and use of them to fix this bug.
+ // if (TunnelIpv4Dst.VALUE.equals(ofMatch.getOxmMatchField())
+ // || TunnelIpv4Src.VALUE.equals(ofMatch.getOxmMatchField())) {
+ // OF_TO_SAL_TUNNEL_PROCESSOR.process(ofMatch.getMatchEntryValue(), data, getConvertorExecutor());
+ // } else {
+ data.setOxmMatchField(ofMatch.getOxmMatchField());
+ OF_TO_SAL_PROCESSOR.process(ofMatch.getMatchEntryValue(), data, getConvertorExecutor());
+ // }
}
return matchBuilder;
final ConvertorExecutor convertorExecutor) {
final MatchBuilder matchBuilder = data.getMatchBuilder();
- if (data.getOxmMatchField().equals(TcpFlags.class)) {
+ if (TcpFlags.VALUE.equals(data.getOxmMatchField())) {
final TcpFlagsMatchBuilder tcpFlagsMatchBuilder = data.getTcpFlagsMatchBuilder();
final TcpFlagsContainer tcpFlagsContainer = source.augmentation(TcpFlagsContainer.class);
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
import java.util.ArrayList;
if (source.getArpOp() != null) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
matchEntryBuilder.setHasMask(false);
- matchEntryBuilder.setOxmMatchField(ArpOp.class);
+ matchEntryBuilder.setOxmMatchField(ArpOp.VALUE);
ArpOpCaseBuilder arpOpCaseBuilder = new ArpOpCaseBuilder();
ArpOpBuilder arpOpBuilder = new ArpOpBuilder();
arpOpBuilder.setOpCode(source.getArpOp());
if (source.getArpSourceTransportAddress() != null) {
Ipv4Prefix ipv4Prefix = source.getArpSourceTransportAddress();
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(ArpSpa.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(ArpSpa.VALUE);
ArpSpaBuilder arpSpaBuilder = new ArpSpaBuilder();
if (source.getArpTargetTransportAddress() != null) {
Ipv4Prefix ipv4Prefix = source.getArpTargetTransportAddress();
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(ArpTpa.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(ArpTpa.VALUE);
ArpTpaBuilder arpTpaBuilder = new ArpTpaBuilder();
ArpSourceHardwareAddress arpSourceHardwareAddress = source.getArpSourceHardwareAddress();
if (arpSourceHardwareAddress != null) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(ArpSha.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(ArpSha.VALUE);
ArpShaCaseBuilder arpShaCaseBuilder = new ArpShaCaseBuilder();
ArpShaBuilder arpShaBuilder = new ArpShaBuilder();
ArpTargetHardwareAddress arpTargetHardwareAddress = source.getArpTargetHardwareAddress();
if (arpTargetHardwareAddress != null) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(ArpTha.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(ArpTha.VALUE);
ArpThaCaseBuilder arpThaCaseBuilder = new ArpThaCaseBuilder();
ArpThaBuilder arpThaBuilder = new ArpThaBuilder();
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
import java.util.ArrayList;
if (source.getIpv4SourceAddressNoMask() != null) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(Ipv4Src.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Ipv4Src.VALUE);
Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();
if (source.getIpv4DestinationAddressNoMask() != null) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(Ipv4Dst.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Ipv4Dst.VALUE);
Ipv4DstBuilder ipv4DstBuilder = new Ipv4DstBuilder();
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
import java.util.ArrayList;
if (source.getIpv4Source() != null) {
Ipv4Prefix ipv4Prefix = source.getIpv4Source();
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(Ipv4Src.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Ipv4Src.VALUE);
Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();
if (source.getIpv4Destination() != null) {
Ipv4Prefix ipv4Prefix = source.getIpv4Destination();
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(Ipv4Dst.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Ipv4Dst.VALUE);
Ipv4DstBuilder ipv4DstBuilder = new Ipv4DstBuilder();
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
import java.util.ArrayList;
if (source.getIpv6SourceAddressNoMask() != null) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(Ipv6Src.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Ipv6Src.VALUE);
Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder();
ipv6SrcBuilder.setIpv6Address(source.getIpv6SourceAddressNoMask());
if (source.getIpv6DestinationAddressNoMask() != null) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(Ipv6Dst.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Ipv6Dst.VALUE);
Ipv6DstBuilder ipv6DstBuilder = new Ipv6DstBuilder();
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
import java.util.ArrayList;
if (source.getIpv6Source() != null) {
Ipv6Prefix ipv6Prefix = source.getIpv6Source();
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(Ipv6Src.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Ipv6Src.VALUE);
Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder();
Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder();
if (source.getIpv6Destination() != null) {
Ipv6Prefix ipv6Prefix = source.getIpv6Destination();
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(Ipv6Dst.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Ipv6Dst.VALUE);
Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder();
Ipv6DstBuilder ipv6DstBuilder = new Ipv6DstBuilder();
if (source.getIpv6Label() != null) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
boolean hasmask = false;
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(Ipv6Flabel.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Ipv6Flabel.VALUE);
Ipv6FlabelCaseBuilder ipv6FlabelCaseBuilder = new Ipv6FlabelCaseBuilder();
Ipv6FlabelBuilder ipv6FlabelBuilder = new Ipv6FlabelBuilder();
ipv6FlabelBuilder.setIpv6Flabel(source.getIpv6Label().getIpv6Flabel());
if (source.getIpv6NdTarget() != null) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
matchEntryBuilder.setHasMask(false);
- matchEntryBuilder.setOxmMatchField(Ipv6NdTarget.class);
+ matchEntryBuilder.setOxmMatchField(Ipv6NdTarget.VALUE);
Ipv6NdTargetCaseBuilder ipv6NdTargetCaseBuilder = new Ipv6NdTargetCaseBuilder();
Ipv6NdTargetBuilder ipv6NdTargetBuilder = new Ipv6NdTargetBuilder();
if (source.getIpv6NdSll() != null) {
MacAddress ipv6NdSll = source.getIpv6NdSll();
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(Ipv6NdSll.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Ipv6NdSll.VALUE);
Ipv6NdSllCaseBuilder ipv6NdSllCaseBuilder = new Ipv6NdSllCaseBuilder();
Ipv6NdSllBuilder ipv6NdSllBuilder = new Ipv6NdSllBuilder();
if (source.getIpv6NdTll() != null) {
MacAddress ipv6NdSll = source.getIpv6NdTll();
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(Ipv6NdTll.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Ipv6NdTll.VALUE);
Ipv6NdTllCaseBuilder ipv6NdTllCaseBuilder = new Ipv6NdTllCaseBuilder();
Ipv6NdTllBuilder ipv6NdTllBuilder = new Ipv6NdTllBuilder();
if (source.getIpv6ExtHeader() != null) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
boolean hasmask = false;
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(Ipv6Exthdr.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Ipv6Exthdr.VALUE);
Ipv6ExthdrCaseBuilder ipv6ExthdrCaseBuilder = new Ipv6ExthdrCaseBuilder();
Ipv6ExthdrBuilder ipv6ExthdrBuilder = new Ipv6ExthdrBuilder();
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
import java.util.ArrayList;
if (source.getSctpSourcePort() != null) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(SctpSrc.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(SctpSrc.VALUE);
SctpSrcCaseBuilder sctpSrcCaseBuilder = new SctpSrcCaseBuilder();
SctpSrcBuilder sctpSrcBuilder = new SctpSrcBuilder();
if (source.getSctpDestinationPort() != null) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(SctpDst.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(SctpDst.VALUE);
SctpDstCaseBuilder sctpDstCaseBuilder = new SctpDstCaseBuilder();
SctpDstBuilder sctpDstBuilder = new SctpDstBuilder();
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
import java.util.ArrayList;
if (source.getTcpSourcePort() != null) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(TcpSrc.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(TcpSrc.VALUE);
TcpSrcCaseBuilder tcpSrcCaseBuilder = new TcpSrcCaseBuilder();
TcpSrcBuilder tcpSrcBuilder = new TcpSrcBuilder();
if (source.getTcpDestinationPort() != null) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(TcpDst.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(TcpDst.VALUE);
TcpDstCaseBuilder tcpDstCaseBuilder = new TcpDstCaseBuilder();
TcpDstBuilder tcpDstBuilder = new TcpDstBuilder();
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
import java.util.ArrayList;
if (source.getTunnelIpv4Source() != null) {
Ipv4Prefix ipv4Prefix = source.getTunnelIpv4Source();
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(Ipv4Src.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Ipv4Src.VALUE);
Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();
if (source.getTunnelIpv4Destination() != null) {
Ipv4Prefix ipv4Prefix = source.getTunnelIpv4Destination();
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(Ipv4Dst.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(Ipv4Dst.VALUE);
Ipv4DstBuilder ipv4DstBuilder = new Ipv4DstBuilder();
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.cases;
import java.util.ArrayList;
if (source.getUdpSourcePort() != null) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(UdpSrc.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(UdpSrc.VALUE);
UdpSrcCaseBuilder udpSrcCaseBuilder = new UdpSrcCaseBuilder();
UdpSrcBuilder udpSrcBuilder = new UdpSrcBuilder();
if (source.getUdpDestinationPort() != null) {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
- matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
- matchEntryBuilder.setOxmMatchField(UdpDst.class);
+ matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchEntryBuilder.setOxmMatchField(UdpDst.VALUE);
UdpDstCaseBuilder udpDstCaseBuilder = new UdpDstCaseBuilder();
UdpDstBuilder udpDstBuilder = new UdpDstBuilder();
private ProtocolMatchFieldsBuilder protocolMatchFieldsBuilder;
private TunnelIpv4MatchBuilder tunnelIpv4MatchBuilder;
private TcpFlagsMatchBuilder tcpFlagsMatchBuilder;
- private Class<? extends MatchField> oxmMatchField;
+ private MatchField oxmMatchField;
/**
* Instantiates a new Match convertor data.
*
* @param oxmMatchField the oxm match field
*/
- public void setOxmMatchField(final Class<? extends MatchField> oxmMatchField) {
+ public void setOxmMatchField(final MatchField oxmMatchField) {
this.oxmMatchField = oxmMatchField;
}
*
* @return the oxm match field
*/
- public Class<? extends MatchField> getOxmMatchField() {
+ public MatchField getOxmMatchField() {
return oxmMatchField;
}
}
@Before
public void setUp() {
manager = new ExtensionConverterManagerImpl();
- keyFromOFJava = new ExperimenterActionSerializerKey(Uint8.ONE, Uint32.valueOf(42), ExpSubType.class);
+ keyFromOFJava = new ExperimenterActionSerializerKey(Uint8.ONE, Uint32.valueOf(42), ExpSubType.VALUE);
regFromOFJava = manager.registerActionConvertor(keyFromOFJava, extConvertorFromOFJava);
keyToOFJava = new TypeVersionKey<>(ActionExpCase.class, Uint8.ONE);
@Mock
private ExtensionConverterProvider extensionConverterProvider;
- private static final MatchEntrySerializerKey<? extends OxmClassBase, ? extends MatchField> KEY_1 =
- new MatchEntrySerializerKey<>(OpenflowVersion.OF13.getVersion(), MockOxmClassBase.class, MockMatchField1.class);
- private static final MatchEntrySerializerKey<? extends OxmClassBase, ? extends MatchField> KEY_2 =
- new MatchEntrySerializerKey<>(OpenflowVersion.OF13.getVersion(), MockOxmClassBase.class, MockMatchField2.class);
+ private static final MatchEntrySerializerKey<?, ?> KEY_1 =
+ new MatchEntrySerializerKey<>(OpenflowVersion.OF13.getVersion(), MockOxmClassBase.VALUE, MockMatchField1.VALUE);
+ private static final MatchEntrySerializerKey<?, ?> KEY_2 =
+ new MatchEntrySerializerKey<>(OpenflowVersion.OF13.getVersion(), MockOxmClassBase.VALUE, MockMatchField2.VALUE);
@Before
public void setup() {
when(extensionConverterProvider.getConverter(KEY_1))
.thenReturn((input, path) -> {
MockAugmentation mockAugmentation = new MockAugmentation();
- return new ExtensionAugment<>(MockAugmentation.class, mockAugmentation, MockExtensionKey1.class);
+ return new ExtensionAugment<>(MockAugmentation.class, mockAugmentation, MockExtensionKey1.VALUE);
});
when(extensionConverterProvider.getConverter(KEY_2))
.thenReturn((input, path) -> {
MockAugmentation mockAugmentation = new MockAugmentation();
- return new ExtensionAugment<>(MockAugmentation.class, mockAugmentation, MockExtensionKey2.class);
+ return new ExtensionAugment<>(MockAugmentation.class, mockAugmentation, MockExtensionKey2.VALUE);
});
}
private static List<MatchEntry> createMatchEntrieses() {
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
matchEntryBuilder.setHasMask(true);
- matchEntryBuilder.setOxmClass(MockOxmClassBase.class);
- matchEntryBuilder.setOxmMatchField(MockMatchField1.class);
+ matchEntryBuilder.setOxmClass(MockOxmClassBase.VALUE);
+ matchEntryBuilder.setOxmMatchField(MockMatchField1.VALUE);
List<MatchEntry> matchEntries = new ArrayList<>();
matchEntries.add(matchEntryBuilder.build());
MatchEntryBuilder matchEntryBuilder1 = new MatchEntryBuilder();
matchEntryBuilder1.setHasMask(true);
- matchEntryBuilder1.setOxmClass(MockOxmClassBase.class);
- matchEntryBuilder1.setOxmMatchField(MockMatchField2.class);
+ matchEntryBuilder1.setOxmClass(MockOxmClassBase.VALUE);
+ matchEntryBuilder1.setOxmMatchField(MockMatchField2.VALUE);
matchEntries.add(matchEntryBuilder1.build());
return matchEntries;
}
private interface MockOxmClassBase extends OxmClassBase {
-
+ MockOxmClassBase VALUE = () -> MockOxmClassBase.class;
}
- private class MockMatchField1 implements MatchField {
+ private interface MockMatchField1 extends MatchField {
+ MockMatchField1 VALUE = () -> MockMatchField1.class;
}
- private class MockMatchField2 implements MatchField {
+ private interface MockMatchField2 extends MatchField {
+ MockMatchField2 VALUE = () -> MockMatchField2.class;
}
private interface MockExtensionKey1 extends ExtensionKey {
-
+ MockExtensionKey1 VALUE = () -> MockExtensionKey1.class;
}
private interface MockExtensionKey2 extends ExtensionKey {
-
+ MockExtensionKey2 VALUE = () -> MockExtensionKey2.class;
}
- private final class MockAugmentation implements Augmentation<Extension> {
+ private static final class MockAugmentation implements Augmentation<Extension> {
@Override
public Class<MockAugmentation> implementedInterface() {
return MockAugmentation.class;
private static final Map<SetFieldMatchKey, SetFieldMatch> FIELD_TABLE_FEATURES =
BindingMap.<SetFieldMatchKey, SetFieldMatch>ordered(
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpOp.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpOp.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSha.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSha.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSpa.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpSpa.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTha.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTha.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTpa.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpTpa.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthDst.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthDst.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthSrc.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthSrc.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthType.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthType.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Code.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Code.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Type.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv4Type.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Code.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Code.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Type.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Icmpv6Type.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPhyPort.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPhyPort.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPort.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPort.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpDscp.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpDscp.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpEcn.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpEcn.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpProto.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpProto.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Dst.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Dst.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Src.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv4Src.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Dst.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Dst.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Exthdr.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Exthdr.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Flabel.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Flabel.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdSll.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdSll.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTarget.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTarget.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTll.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6NdTll.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Src.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Src.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Metadata.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Metadata.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsBos.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsBos.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsLabel.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsLabel.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsTc.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.MplsTc.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.PbbIsid.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.PbbIsid.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpDst.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpDst.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpSrc.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.SctpSrc.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpDst.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpDst.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpSrc.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpSrc.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelId.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelId.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpDst.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpDst.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpSrc.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpSrc.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanPcp.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanPcp.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanVid.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanVid.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpFlags.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpFlags.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Dst.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Dst.VALUE)
.build(),
new SetFieldMatchBuilder().setHasMask(true)
- .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Src.class)
+ .setMatchType(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TunnelIpv4Src.VALUE)
.build());
private static final Map<Class<? extends TableFeaturePropType>, TableFeaturePropType> AUGMENTATIONS_MAP =
propBuilder = new TableFeaturePropertiesBuilder();
propBuilder.setType(TableFeaturesPropType.OFPTFPTMATCH);
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(InPhyPort.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(InPhyPort.VALUE);
entriesBuilder.setHasMask(false);
List<MatchEntry> entries = new ArrayList<>();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(InPort.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(InPort.VALUE);
entriesBuilder.setHasMask(false);
entries.add(entriesBuilder.build());
propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYSETFIELD);
entries = new ArrayList<>();
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(IpProto.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(IpProto.VALUE);
entriesBuilder.setHasMask(false);
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(IpEcn.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(IpEcn.VALUE);
entriesBuilder.setHasMask(false);
entries.add(entriesBuilder.build());
propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build());
propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITESETFIELD);
entries = new ArrayList<>();
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Exthdr.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Exthdr.VALUE);
entriesBuilder.setHasMask(false);
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(VlanVid.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(VlanVid.VALUE);
entriesBuilder.setHasMask(false);
entries.add(entriesBuilder.build());
propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build());
propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITESETFIELDMISS);
entries = new ArrayList<>();
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(VlanPcp.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(VlanPcp.VALUE);
entriesBuilder.setHasMask(false);
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(TcpSrc.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(TcpSrc.VALUE);
entriesBuilder.setHasMask(false);
entries.add(entriesBuilder.build());
propBuilder.addAugmentation(new OxmRelatedTableFeaturePropertyBuilder().setMatchEntry(entries).build());
propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYSETFIELDMISS);
entries = new ArrayList<>();
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(UdpSrc.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(UdpSrc.VALUE);
entriesBuilder.setHasMask(false);
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(UdpDst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(UdpDst.VALUE);
entriesBuilder.setHasMask(false);
entries.add(entriesBuilder.build());
entries = new ArrayList<>();
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(EthSrc.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(EthSrc.VALUE);
entriesBuilder.setHasMask(false);
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(EthDst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(EthDst.VALUE);
entriesBuilder.setHasMask(false);
entries.add(entriesBuilder.build());
Collection<SetFieldMatch> fieldMatch = propType5.getMatchSetfield().nonnullSetFieldMatch().values();
Assert.assertEquals("Wrong match-entry-ids size", 2, fieldMatch.size());
Iterator<SetFieldMatch> fieldIt = fieldMatch.iterator();
- Assert.assertEquals("Wrong match-entry-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
- + "rev131026.InPhyPort", fieldIt.next().getMatchType().getName());
- Assert.assertEquals("Wrong match-entry-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
- + "rev131026.InPort", fieldIt.next().getMatchType().getName());
+ Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPhyPort.VALUE,
+ fieldIt.next().getMatchType());
+ Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.InPort.VALUE,
+ fieldIt.next().getMatchType());
property = featProps.next();
Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
+ "rev131026.table.feature.prop.type.table.feature.prop.type.ApplySetfield",
fieldMatch = propType6.getApplySetfield().nonnullSetFieldMatch().values();
Assert.assertEquals("Wrong match-entry-ids size", 2, fieldMatch.size());
fieldIt = fieldMatch.iterator();
- Assert.assertEquals("Wrong match-entry-id",
- "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpProto",
- fieldIt.next().getMatchType().getName());
- Assert.assertEquals("Wrong match-entry-id",
- "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpEcn",
- fieldIt.next().getMatchType().getName());
+ Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpProto.VALUE,
+ fieldIt.next().getMatchType());
+ Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.IpEcn.VALUE,
+ fieldIt.next().getMatchType());
property = featProps.next();
Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
+ "rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfield",
fieldMatch = propType7.getWriteSetfield().nonnullSetFieldMatch().values();
Assert.assertEquals("Wrong match-entry-ids size", 2, fieldMatch.size());
fieldIt = fieldMatch.iterator();
- Assert.assertEquals("Wrong match-entry-id",
- "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Exthdr",
- fieldIt.next().getMatchType().getName());
- Assert.assertEquals("Wrong match-entry-id",
- "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanVid",
- fieldIt.next().getMatchType().getName());
+ Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.Ipv6Exthdr.VALUE,
+ fieldIt.next().getMatchType());
+ Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanVid.VALUE,
+ fieldIt.next().getMatchType());
property = featProps.next();
Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
+ "rev131026.table.feature.prop.type.table.feature.prop.type.WriteSetfieldMiss",
fieldMatch = propType8.getWriteSetfieldMiss().nonnullSetFieldMatch().values();
Assert.assertEquals("Wrong match-entry-ids size", 2, fieldMatch.size());
fieldIt = fieldMatch.iterator();
- Assert.assertEquals("Wrong match-entry-id",
- "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanPcp",
- fieldIt.next().getMatchType().getName());
- Assert.assertEquals("Wrong match-entry-id",
- "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpSrc",
- fieldIt.next().getMatchType().getName());
+ Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.VlanPcp.VALUE,
+ fieldIt.next().getMatchType());
+ Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TcpSrc.VALUE,
+ fieldIt.next().getMatchType());
property = featProps.next();
Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
+ "rev131026.table.feature.prop.type.table.feature.prop.type.ApplySetfieldMiss",
fieldMatch = propType9.getApplySetfieldMiss().nonnullSetFieldMatch().values();
Assert.assertEquals("Wrong match-entry-ids size", 2, fieldMatch.size());
fieldIt = fieldMatch.iterator();
- Assert.assertEquals("Wrong match-entry-id",
- "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpSrc",
- fieldIt.next().getMatchType().getName());
- Assert.assertEquals("Wrong match-entry-id",
- "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpDst",
- fieldIt.next().getMatchType().getName());
+ Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpSrc.VALUE,
+ fieldIt.next().getMatchType());
+ Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.UdpDst.VALUE,
+ fieldIt.next().getMatchType());
property = featProps.next();
Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
+ "rev131026.table.feature.prop.type.table.feature.prop.type.Wildcards",
fieldMatch = propType10.getWildcardSetfield().nonnullSetFieldMatch().values();
Assert.assertEquals("Wrong match-entry-ids size", 2, fieldMatch.size());
fieldIt = fieldMatch.iterator();
- Assert.assertEquals("Wrong match-entry-id",
- "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthSrc",
- fieldIt.next().getMatchType().getName());
- Assert.assertEquals("Wrong match-entry-id",
- "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthDst",
- fieldIt.next().getMatchType().getName());
+ Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthSrc.VALUE,
+ fieldIt.next().getMatchType());
+ Assert.assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthDst.VALUE,
+ fieldIt.next().getMatchType());
property = featProps.next();
Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types."
package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Optional;
import org.junit.Assert;
Optional<List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action
.Action>> mdSalActions = convertorManager.convert(actions, data);
- Assert.assertEquals("Wrong number of output actions", 0, mdSalActions.orElse(Collections.emptyList()).size());
+ Assert.assertEquals("Wrong number of output actions", 0, mdSalActions.orElse(List.of()).size());
}
/**
actionBuilder = new ActionBuilder();
MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
- matchBuilder.setOxmClass(OpenflowBasicClass.class);
- matchBuilder.setOxmMatchField(InPort.class);
+ matchBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ matchBuilder.setOxmMatchField(InPort.VALUE);
matchBuilder.setHasMask(false);
InPortCaseBuilder inPortCaseBuilder = new InPortCaseBuilder();
InPortBuilder inPortBuilder = new InPortBuilder();
.Action>> mdSalActionsOptional = convertorManager.convert(actions, data);
List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action
- .Action> mdSalActions = mdSalActionsOptional.orElse(Collections.emptyList());
+ .Action> mdSalActions = mdSalActionsOptional.orElse(List.of());
Assert.assertEquals("Wrong number of output actions", 16, mdSalActions.size());
org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action = mdSalActions.get(0);
data.setIpProtocol(FlowConvertorUtil.getIpProtocolFromFlow(flow));
Optional<List<Action>> actionsOptional = convertorManager.convert(salActions, data);
- List<Action> actions = actionsOptional.orElse(Collections.emptyList());
+ List<Action> actions = actionsOptional.orElse(List.of());
Assert.assertEquals("Wrong number of actions", 12, actions.size());
Action action = actions.get(0);
.action.choice.SetFieldCase) action.getActionChoice();
MatchEntry entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
checkEntryHeader(entry,
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanPcp.class, false);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanPcp.VALUE, false);
Assert.assertEquals("Wrong vlan pcp", 7, ((VlanPcpCase) entry.getMatchEntryValue()).getVlanPcp().getVlanPcp()
.intValue());
.action.choice.SetFieldCase) action.getActionChoice();
entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
checkEntryHeader(entry,
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanVid.class, false);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanVid.VALUE, false);
Assert.assertEquals("Wrong vlan vid", 0, ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid().getVlanVid()
.intValue());
Assert.assertEquals("Wrong cfi bit", true, ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid().getCfiBit());
.action.choice.SetFieldCase) action.getActionChoice();
entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
checkEntryHeader(entry,
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthDst.class, false);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthDst.VALUE, false);
Assert.assertEquals("Wrong dl dst", "00:00:00:00:00:06", ((EthDstCase) entry.getMatchEntryValue()).getEthDst()
.getMacAddress().getValue());
action.getActionChoice().implementedInterface().getName());
entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
checkEntryHeader(entry,
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthSrc.class, false);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthSrc.VALUE, false);
Assert.assertEquals("Wrong dl src", "00:00:00:00:00:05", ((EthSrcCase) entry.getMatchEntryValue()).getEthSrc()
.getMacAddress().getValue());
action.getActionChoice().implementedInterface().getName());
entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
checkEntryHeader(entry,
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv4Src.class, false);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv4Src.VALUE, false);
Assert.assertEquals("Wrong ipv4 src", "10.0.0.0", ((Ipv4SrcCase) entry.getMatchEntryValue()).getIpv4Src()
.getIpv4Address().getValue());
action.getActionChoice().implementedInterface().getName());
entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
checkEntryHeader(entry,
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv4Dst.class, false);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv4Dst.VALUE, false);
Assert.assertEquals("Wrong ipv4 dst", "10.0.0.2", ((Ipv4DstCase) entry.getMatchEntryValue()).getIpv4Dst()
.getIpv4Address().getValue());
action.getActionChoice().implementedInterface().getName());
entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
checkEntryHeader(entry,
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.TcpSrc.class, false);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.TcpSrc.VALUE, false);
Assert.assertEquals("Wrong tcp src", 54, ((TcpSrcCase) entry.getMatchEntryValue()).getTcpSrc()
.getPort().getValue().intValue());
action.getActionChoice().implementedInterface().getName());
entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
checkEntryHeader(entry,
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.TcpDst.class, false);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.TcpDst.VALUE, false);
Assert.assertEquals("Wrong tcp dst", 45, ((TcpDstCase) entry.getMatchEntryValue()).getTcpDst()
.getPort().getValue().intValue());
action.getActionChoice().implementedInterface().getName());
entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
checkEntryHeader(entry,
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.IpDscp.class, false);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.IpDscp.VALUE, false);
Assert.assertEquals("Wrong ip dscp", 4, ((IpDscpCase) entry.getMatchEntryValue()).getIpDscp()
.getDscp().getValue().intValue());
action.getActionChoice().implementedInterface().getName());
entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
checkEntryHeader(entry,
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanVid.class, false);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanVid.VALUE, false);
Assert.assertEquals("Wrong vlan id", 22, ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid()
.getVlanVid().intValue());
Assert.assertEquals("Wrong cfi bit", true, ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid()
action.getActionChoice().implementedInterface().getName());
entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
checkEntryHeader(entry,
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv6Src.class, false);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv6Src.VALUE, false);
Assert.assertEquals("Wrong ipv6 src", "::5",
((Ipv6SrcCase) entry.getMatchEntryValue()).getIpv6Src().getIpv6Address().getValue());
action.getActionChoice().implementedInterface().getName());
entry = setFieldCase.getSetFieldAction().getMatchEntry().get(0);
checkEntryHeader(entry,
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv6Dst.class, false);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv6Dst.VALUE, false);
Assert.assertEquals("Wrong ipv6 dst", "::",
((Ipv6DstCase) entry.getMatchEntryValue()).getIpv6Dst().getIpv6Address().getValue());
}
- private static void checkEntryHeader(final MatchEntry entry, final Class<? extends MatchField> field,
+ private static void checkEntryHeader(final MatchEntry entry, final MatchField field,
final boolean hasMask) {
- Assert.assertEquals("Wrong oxm class", OpenflowBasicClass.class, entry.getOxmClass());
+ Assert.assertEquals("Wrong oxm class", OpenflowBasicClass.VALUE, entry.getOxmClass());
Assert.assertEquals("Wrong oxm field", field, entry.getOxmMatchField());
Assert.assertEquals("Wrong hasMask", hasMask, entry.getHasMask());
}
assertEquals("Wrong out group", 5000, flowMod.get(0).getOutGroup().intValue());
assertEquals("Wrong flags", new FlowModFlags(false, false, false, false, false), flowMod.get(0).getFlags());
assertEquals("Wrong match",
- "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmMatchType",
- flowMod.get(0).getMatch().getType().getName());
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmMatchType.VALUE,
+ flowMod.get(0).getMatch().getType());
assertEquals("Wrong match entries size", 0, flowMod.get(0).getMatch().nonnullMatchEntry().size());
}
List<MatchEntry> entries = entriesOptional.get();
assertEquals("Wrong entries size", 24, entries.size());
MatchEntry entry = entries.get(0);
- checkEntryHeader(entry, InPort.class, false);
+ checkEntryHeader(entry, InPort.VALUE, false);
assertEquals("Wrong in port", 1, ((InPortCase) entry.getMatchEntryValue()).getInPort()
.getPortNumber().getValue().intValue());
entry = entries.get(1);
- checkEntryHeader(entry, InPhyPort.class, false);
+ checkEntryHeader(entry, InPhyPort.VALUE, false);
assertEquals("Wrong in phy port", 2, ((InPhyPortCase) entry.getMatchEntryValue())
.getInPhyPort().getPortNumber().getValue().intValue());
entry = entries.get(2);
- checkEntryHeader(entry, Metadata.class, false);
+ checkEntryHeader(entry, Metadata.VALUE, false);
assertArrayEquals("Wrong metadata", new byte[]{0, 0, 0, 0, 0, 0, 0, 3},
((MetadataCase) entry.getMatchEntryValue()).getMetadata().getMetadata());
entry = entries.get(3);
- checkEntryHeader(entry, EthDst.class, false);
+ checkEntryHeader(entry, EthDst.VALUE, false);
assertEquals("Wrong eth dst", new MacAddress("00:00:00:00:00:06"),
((EthDstCase) entry.getMatchEntryValue()).getEthDst().getMacAddress());
entry = entries.get(4);
- checkEntryHeader(entry, EthSrc.class, false);
+ checkEntryHeader(entry, EthSrc.VALUE, false);
assertEquals("Wrong eth src", new MacAddress("00:00:00:00:00:05"),
((EthSrcCase) entry.getMatchEntryValue()).getEthSrc().getMacAddress());
entry = entries.get(5);
- checkEntryHeader(entry, EthType.class, false);
+ checkEntryHeader(entry, EthType.VALUE, false);
assertEquals("Wrong eth type", 4, ((EthTypeCase) entry.getMatchEntryValue())
.getEthType().getEthType().getValue().intValue());
entry = entries.get(6);
- checkEntryHeader(entry, VlanVid.class, false);
+ checkEntryHeader(entry, VlanVid.VALUE, false);
assertEquals("Wrong vlan id", 7, ((VlanVidCase) entry.getMatchEntryValue())
.getVlanVid().getVlanVid().intValue());
assertEquals("Wrong cfi bit", true, ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid().getCfiBit());
entry = entries.get(7);
checkEntryHeader(entry,
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanPcp.class, false);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanPcp.VALUE, false);
assertEquals("Wrong vlan pcp", 7, ((VlanPcpCase) entry.getMatchEntryValue())
.getVlanPcp().getVlanPcp().intValue());
entry = entries.get(8);
- checkEntryHeader(entry, IpDscp.class, false);
+ checkEntryHeader(entry, IpDscp.VALUE, false);
assertEquals("Wrong ip dscp", 8, ((IpDscpCase) entry.getMatchEntryValue())
.getIpDscp().getDscp().getValue().intValue());
entry = entries.get(9);
- checkEntryHeader(entry, IpEcn.class, false);
+ checkEntryHeader(entry, IpEcn.VALUE, false);
assertEquals("Wrong ip ecn", 9, ((IpEcnCase) entry.getMatchEntryValue())
.getIpEcn().getEcn().intValue());
entry = entries.get(10);
- checkEntryHeader(entry, IpProto.class, false);
+ checkEntryHeader(entry, IpProto.VALUE, false);
assertEquals("Wrong ip proto", 10, ((IpProtoCase) entry.getMatchEntryValue())
.getIpProto().getProtocolNumber().intValue());
entry = entries.get(11);
- checkEntryHeader(entry, TcpSrc.class, false);
+ checkEntryHeader(entry, TcpSrc.VALUE, false);
assertEquals("Wrong tcp src", 11, ((TcpSrcCase) entry.getMatchEntryValue())
.getTcpSrc().getPort().getValue().intValue());
entry = entries.get(12);
- checkEntryHeader(entry, TcpDst.class, false);
+ checkEntryHeader(entry, TcpDst.VALUE, false);
assertEquals("Wrong tcp dst", 12, ((TcpDstCase) entry.getMatchEntryValue())
.getTcpDst().getPort().getValue().intValue());
entry = entries.get(13);
- checkEntryHeader(entry, Icmpv4Type.class, false);
+ checkEntryHeader(entry, Icmpv4Type.VALUE, false);
assertEquals("Wrong icmpv4 type", 13, ((Icmpv4TypeCase) entry.getMatchEntryValue())
.getIcmpv4Type().getIcmpv4Type().intValue());
entry = entries.get(14);
- checkEntryHeader(entry, Icmpv4Code.class, false);
+ checkEntryHeader(entry, Icmpv4Code.VALUE, false);
assertEquals("Wrong icmpv4 code", 14, ((Icmpv4CodeCase) entry.getMatchEntryValue())
.getIcmpv4Code().getIcmpv4Code().intValue());
entry = entries.get(15);
- checkEntryHeader(entry, Icmpv6Type.class, false);
+ checkEntryHeader(entry, Icmpv6Type.VALUE, false);
assertEquals("Wrong icmpv6 type", 15, ((Icmpv6TypeCase) entry.getMatchEntryValue())
.getIcmpv6Type().getIcmpv6Type().intValue());
entry = entries.get(16);
- checkEntryHeader(entry, Icmpv6Code.class, false);
+ checkEntryHeader(entry, Icmpv6Code.VALUE, false);
assertEquals("Wrong icmpv6 code", 16, ((Icmpv6CodeCase) entry.getMatchEntryValue())
.getIcmpv6Code().getIcmpv6Code().intValue());
entry = entries.get(17);
- checkEntryHeader(entry, Ipv4Src.class, false);
+ checkEntryHeader(entry, Ipv4Src.VALUE, false);
assertEquals("Wrong ipv4 src", "10.0.0.1", ((Ipv4SrcCase) entry.getMatchEntryValue())
.getIpv4Src().getIpv4Address().getValue());
entry = entries.get(18);
- checkEntryHeader(entry, Ipv4Dst.class, false);
+ checkEntryHeader(entry, Ipv4Dst.VALUE, false);
assertEquals("Wrong ipv4 dst", "10.0.0.2", ((Ipv4DstCase) entry.getMatchEntryValue())
.getIpv4Dst().getIpv4Address().getValue());
entry = entries.get(19);
- checkEntryHeader(entry, MplsLabel.class, false);
+ checkEntryHeader(entry, MplsLabel.VALUE, false);
assertEquals("Wrong mpls label", 17, ((MplsLabelCase) entry.getMatchEntryValue())
.getMplsLabel().getMplsLabel().intValue());
entry = entries.get(20);
- checkEntryHeader(entry, MplsBos.class, false);
+ checkEntryHeader(entry, MplsBos.VALUE, false);
assertEquals("Wrong mpls bos", true, ((MplsBosCase) entry.getMatchEntryValue()).getMplsBos().getBos());
entry = entries.get(21);
- checkEntryHeader(entry, MplsTc.class, false);
+ checkEntryHeader(entry, MplsTc.VALUE, false);
assertEquals("Wrong mpls tc", 18, ((MplsTcCase) entry.getMatchEntryValue())
.getMplsTc().getTc().intValue());
entry = entries.get(22);
- checkEntryHeader(entry, PbbIsid.class, false);
+ checkEntryHeader(entry, PbbIsid.VALUE, false);
assertEquals("Wrong pbb isid", 20, ((PbbIsidCase) entry.getMatchEntryValue())
.getPbbIsid().getIsid().intValue());
entry = entries.get(23);
- checkEntryHeader(entry, TunnelId.class, false);
+ checkEntryHeader(entry, TunnelId.VALUE, false);
assertArrayEquals("Wrong tunnel id", new byte[]{0, 0, 0, 0, 0, 0, 0, 21},
((TunnelIdCase) entry.getMatchEntryValue()).getTunnelId().getTunnelId());
}
- private static void checkEntryHeader(final MatchEntry entry, final Class<? extends MatchField> field,
+ private static void checkEntryHeader(final MatchEntry entry, final MatchField field,
final boolean hasMask) {
- assertEquals("Wrong oxm class", OpenflowBasicClass.class, entry.getOxmClass());
+ assertEquals("Wrong oxm class", OpenflowBasicClass.VALUE, entry.getOxmClass());
assertEquals("Wrong oxm field", field, entry.getOxmMatchField());
assertEquals("Wrong hasMask", hasMask, entry.getHasMask());
}
assertEquals("Wrong entries size", 2, entries.size());
MatchEntry entry = entries.get(0);
- checkEntryHeader(entry, Ipv4Src.class, false);
+ checkEntryHeader(entry, Ipv4Src.VALUE, false);
assertEquals("wrong Ipv4Address source", "10.2.2.2",
((Ipv4SrcCase) entry.getMatchEntryValue()).getIpv4Src().getIpv4Address().getValue());
entry = entries.get(1);
- checkEntryHeader(entry, Ipv4Dst.class, false);
+ checkEntryHeader(entry, Ipv4Dst.VALUE, false);
assertEquals("wrong Ipv4Address destination", "10.1.1.1",
((Ipv4DstCase) entry.getMatchEntryValue()).getIpv4Dst().getIpv4Address().getValue());
}
assertEquals("Wrong entries size", 2, entries.size());
MatchEntry entry = entries.get(0);
- checkEntryHeader(entry, Ipv4Src.class, true);
+ checkEntryHeader(entry, Ipv4Src.VALUE, true);
assertEquals("wrong Ipv4Address source", "10.2.2.2",
((Ipv4SrcCase) entry.getMatchEntryValue()).getIpv4Src().getIpv4Address().getValue());
entry = entries.get(1);
- checkEntryHeader(entry, Ipv4Dst.class, true);
+ checkEntryHeader(entry, Ipv4Dst.VALUE, true);
assertEquals("wrong Ipv4Adress destination", "10.1.1.1",
((Ipv4DstCase) entry.getMatchEntryValue()).getIpv4Dst().getIpv4Address().getValue());
}
List<MatchEntry> entries = entriesOptional.get();
assertEquals("Wrong entries size", 2, entries.size());
MatchEntry entry = entries.get(0);
- checkEntryHeader(entry, UdpSrc.class, false);
+ checkEntryHeader(entry, UdpSrc.VALUE, false);
assertEquals("Wrong udp src", 11, ((UdpSrcCase) entry.getMatchEntryValue()).getUdpSrc()
.getPort().getValue().intValue());
entry = entries.get(1);
- checkEntryHeader(entry, UdpDst.class, false);
+ checkEntryHeader(entry, UdpDst.VALUE, false);
assertEquals("Wrong udp dst", 12, ((UdpDstCase) entry.getMatchEntryValue())
.getUdpDst().getPort().getValue().intValue());
}
List<MatchEntry> entries = entriesOptional.get();
assertEquals("Wrong entries size", 2, entries.size());
MatchEntry entry = entries.get(0);
- checkEntryHeader(entry, Ipv4Src.class, false);
+ checkEntryHeader(entry, Ipv4Src.VALUE, false);
assertEquals("Wrong ipv4 tunnel src", "10.0.0.1", ((Ipv4SrcCase) entry.getMatchEntryValue()).getIpv4Src()
.getIpv4Address().getValue());
entry = entries.get(1);
- checkEntryHeader(entry, Ipv4Dst.class, false);
+ checkEntryHeader(entry, Ipv4Dst.VALUE, false);
assertEquals("Wrong ipv4 tunnel dst", "10.0.0.2", ((Ipv4DstCase) entry.getMatchEntryValue()).getIpv4Dst()
.getIpv4Address().getValue());
}
List<MatchEntry> entries = entriesOptional.get();
assertEquals("Wrong entries size", 2, entries.size());
MatchEntry entry = entries.get(0);
- checkEntryHeader(entry, SctpSrc.class, false);
+ checkEntryHeader(entry, SctpSrc.VALUE, false);
assertEquals("Wrong sctp src", 11, ((SctpSrcCase) entry.getMatchEntryValue()).getSctpSrc()
.getPort().getValue().intValue());
entry = entries.get(1);
- checkEntryHeader(entry, SctpDst.class, false);
+ checkEntryHeader(entry, SctpDst.VALUE, false);
assertEquals("Wrong sctp dst", 12, ((SctpDstCase) entry.getMatchEntryValue())
.getSctpDst().getPort().getValue().intValue());
}
List<MatchEntry> entries = entriesOptional.get();
assertEquals("Wrong entries size", 5, entries.size());
MatchEntry entry = entries.get(0);
- checkEntryHeader(entry, ArpOp.class, false);
+ checkEntryHeader(entry, ArpOp.VALUE, false);
assertEquals("Wrong arp op", 5, ((ArpOpCase) entry.getMatchEntryValue())
.getArpOp().getOpCode().intValue());
entry = entries.get(1);
- checkEntryHeader(entry, ArpSpa.class, false);
+ checkEntryHeader(entry, ArpSpa.VALUE, false);
assertEquals("Wrong arp spa", "10.0.0.3", ((ArpSpaCase) entry.getMatchEntryValue())
.getArpSpa().getIpv4Address().getValue());
entry = entries.get(2);
- checkEntryHeader(entry, ArpTpa.class, false);
+ checkEntryHeader(entry, ArpTpa.VALUE, false);
assertEquals("Wrong arp tpa", "10.0.0.4", ((ArpTpaCase) entry.getMatchEntryValue())
.getArpTpa().getIpv4Address().getValue());
entry = entries.get(3);
- checkEntryHeader(entry, ArpSha.class, false);
+ checkEntryHeader(entry, ArpSha.VALUE, false);
assertEquals("Wrong arp sha", "00:00:00:00:00:05", ((ArpShaCase) entry.getMatchEntryValue())
.getArpSha().getMacAddress().getValue());
entry = entries.get(4);
- checkEntryHeader(entry, ArpTha.class, false);
+ checkEntryHeader(entry, ArpTha.VALUE, false);
assertEquals("Wrong arp tha", "00:00:00:00:00:06", ((ArpThaCase) entry.getMatchEntryValue())
.getArpTha().getMacAddress().getValue());
}
assertEquals("Wrong entries size", 4, entries.size());
MatchEntry entry = entries.get(0);
entry = entries.get(0);
- checkEntryHeader(entry, ArpSpa.class, true);
+ checkEntryHeader(entry, ArpSpa.VALUE, true);
assertEquals("Wrong arp spa", "10.0.0.0", ((ArpSpaCase) entry.getMatchEntryValue())
.getArpSpa().getIpv4Address().getValue());
assertArrayEquals("Wrong arp spa mask", new byte[]{(byte) 255, 0, 0, 0},
((ArpSpaCase) entry.getMatchEntryValue()).getArpSpa().getMask());
entry = entries.get(1);
- checkEntryHeader(entry, ArpTpa.class, true);
+ checkEntryHeader(entry, ArpTpa.VALUE, true);
assertEquals("Wrong arp tpa", "10.0.0.4", ((ArpTpaCase) entry.getMatchEntryValue()).getArpTpa()
.getIpv4Address().getValue());
assertArrayEquals("Wrong arp tpa mask", new byte[]{(byte) 255, (byte) 255, (byte) 255, (byte) 254},
((ArpTpaCase) entry.getMatchEntryValue()).getArpTpa().getMask());
entry = entries.get(2);
- checkEntryHeader(entry, ArpSha.class, true);
+ checkEntryHeader(entry, ArpSha.VALUE, true);
assertEquals("Wrong arp sha", "00:00:00:00:00:05", ((ArpShaCase) entry.getMatchEntryValue())
.getArpSha().getMacAddress().getValue());
assertArrayEquals("Wrong arp sha mask", new byte[]{0, 0, 0, 0, 0, 8},
((ArpShaCase) entry.getMatchEntryValue()).getArpSha().getMask());
entry = entries.get(3);
- checkEntryHeader(entry, ArpTha.class, true);
+ checkEntryHeader(entry, ArpTha.VALUE, true);
assertEquals("Wrong arp tha", "00:00:00:00:00:06", ((ArpThaCase) entry.getMatchEntryValue()).getArpTha()
.getMacAddress().getValue());
assertArrayEquals("Wrong arp tha mask", new byte[]{0, 0, 0, 0, 0, 9},
/* Due to conversion ambiguities, we always get "has mask" because
* an ip with no mask and prefix with /128 (or 32 in v4) cannot
* be distinguished */
- checkEntryHeader(entry, Ipv6Src.class, false);
+ checkEntryHeader(entry, Ipv6Src.VALUE, false);
assertEquals("Wrong ipv6 src", "::1",
((Ipv6SrcCase) entry.getMatchEntryValue()).getIpv6Src().getIpv6Address().getValue());
entry = entries.get(1);
- checkEntryHeader(entry, Ipv6Dst.class, false);
+ checkEntryHeader(entry, Ipv6Dst.VALUE, false);
assertEquals("Wrong ipv6 dst", "::2",
((Ipv6DstCase) entry.getMatchEntryValue()).getIpv6Dst().getIpv6Address().getValue());
entry = entries.get(2);
- checkEntryHeader(entry, Ipv6Flabel.class, false);
+ checkEntryHeader(entry, Ipv6Flabel.VALUE, false);
assertEquals("Wrong ipv6 flabel", 3,
((Ipv6FlabelCase) entry.getMatchEntryValue()).getIpv6Flabel().getIpv6Flabel().getValue().intValue());
entry = entries.get(3);
- checkEntryHeader(entry, Ipv6NdTarget.class, false);
+ checkEntryHeader(entry, Ipv6NdTarget.VALUE, false);
assertEquals("Wrong ipv6 nd target", "::4",
((Ipv6NdTargetCase) entry.getMatchEntryValue()).getIpv6NdTarget().getIpv6Address().getValue());
entry = entries.get(4);
- checkEntryHeader(entry, Ipv6NdSll.class, false);
+ checkEntryHeader(entry, Ipv6NdSll.VALUE, false);
assertEquals("Wrong ipv6 nd sll", "00:00:00:00:00:05",
((Ipv6NdSllCase) entry.getMatchEntryValue()).getIpv6NdSll().getMacAddress().getValue());
entry = entries.get(5);
- checkEntryHeader(entry, Ipv6NdTll.class, false);
+ checkEntryHeader(entry, Ipv6NdTll.VALUE, false);
assertEquals("Wrong ipv6 nd tll", "00:00:00:00:00:06",
((Ipv6NdTllCase) entry.getMatchEntryValue()).getIpv6NdTll().getMacAddress().getValue());
entry = entries.get(6);
- checkEntryHeader(entry, Ipv6Exthdr.class, false);
+ checkEntryHeader(entry, Ipv6Exthdr.VALUE, false);
assertEquals("Wrong ipv6 ext hdr", new Ipv6ExthdrFlags(false, true, false, true, false,
true, false, true, false), ((Ipv6ExthdrCase) entry.getMatchEntryValue()).getIpv6Exthdr().getPseudoField());
}
List<MatchEntry> entries = entriesOptional.get();
assertEquals("Wrong entries size", 2, entries.size());
MatchEntry entry = entries.get(0);
- checkEntryHeader(entry, Ipv6Src.class, true);
+ checkEntryHeader(entry, Ipv6Src.VALUE, true);
assertEquals("Wrong ipv6 src", "::",
((Ipv6SrcCase) entry.getMatchEntryValue()).getIpv6Src().getIpv6Address().getValue());
assertArrayEquals("Wrong ipv6 src mask", new byte[]{(byte) 255, (byte) 255, (byte) 255, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0}, ((Ipv6SrcCase) entry.getMatchEntryValue()).getIpv6Src().getMask());
entry = entries.get(1);
- checkEntryHeader(entry, Ipv6Dst.class, true);
+ checkEntryHeader(entry, Ipv6Dst.VALUE, true);
assertEquals("Wrong ipv6 dst", "::",
((Ipv6DstCase) entry.getMatchEntryValue()).getIpv6Dst().getIpv6Address().getValue());
assertArrayEquals("Wrong ipv6 src mask", new byte[]{(byte) 255, (byte) 255, (byte) 255, (byte) 255,
List<MatchEntry> entries = entriesOptional.get();
assertEquals("Wrong entries size", 1, entries.size());
MatchEntry entry = entries.get(0);
- checkEntryHeader(entry, Ipv6Exthdr.class, true);
+ checkEntryHeader(entry, Ipv6Exthdr.VALUE, true);
assertEquals("Wrong ipv6 ext hdr", new Ipv6ExthdrFlags(true, false, true, false, true, false,
true, false, true), ((Ipv6ExthdrCase) entry.getMatchEntryValue()).getIpv6Exthdr().getPseudoField());
assertArrayEquals("Wrong ipv6 ext hdr mask", new byte[]{1, 2},
List<MatchEntry> entries = entriesOptional.get();
assertEquals("Wrong entries size", 8, entries.size());
MatchEntry entry = entries.get(0);
- checkEntryHeader(entry, Metadata.class, true);
+ checkEntryHeader(entry, Metadata.VALUE, true);
assertArrayEquals("Wrong metadata", new byte[]{0, 0, 0, 0, 0, 0, 0, 3},
((MetadataCase) entry.getMatchEntryValue()).getMetadata().getMetadata());
assertArrayEquals("Wrong metadata mask", new byte[]{0, 0, 0, 0, 0, 0, 0, 15},
((MetadataCase) entry.getMatchEntryValue()).getMetadata().getMask());
entry = entries.get(1);
- checkEntryHeader(entry, EthDst.class, true);
+ checkEntryHeader(entry, EthDst.VALUE, true);
assertEquals("Wrong eth dst", new MacAddress("00:00:00:00:00:06"),
((EthDstCase) entry.getMatchEntryValue()).getEthDst().getMacAddress());
assertArrayEquals("Wrong eth dst mask", new byte[]{0, 0, 0, 0, 0, 9},
((EthDstCase) entry.getMatchEntryValue()).getEthDst().getMask());
entry = entries.get(2);
- checkEntryHeader(entry, EthSrc.class, true);
+ checkEntryHeader(entry, EthSrc.VALUE, true);
assertEquals("Wrong eth src", new MacAddress("00:00:00:00:00:05"),
((EthSrcCase) entry.getMatchEntryValue()).getEthSrc().getMacAddress());
assertArrayEquals("Wrong eth src mask", new byte[]{0, 0, 0, 0, 0, 8},
((EthSrcCase) entry.getMatchEntryValue()).getEthSrc().getMask());
entry = entries.get(3);
- checkEntryHeader(entry, VlanVid.class, true);
+ checkEntryHeader(entry, VlanVid.VALUE, true);
assertEquals("Wrong vlan id", 0, ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid()
.getVlanVid().intValue());
assertEquals("Wrong cfi bit", true, ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid().getCfiBit());
assertArrayEquals("Wrong vlanId mask", new byte[]{16, 0},
((VlanVidCase) entry.getMatchEntryValue()).getVlanVid().getMask());
entry = entries.get(4);
- checkEntryHeader(entry, Ipv4Src.class, true);
+ checkEntryHeader(entry, Ipv4Src.VALUE, true);
assertEquals("Wrong ipv4 src", "10.0.0.0", ((Ipv4SrcCase) entry.getMatchEntryValue())
.getIpv4Src().getIpv4Address().getValue());
assertArrayEquals("Wrong ipv4 src mask", new byte[]{(byte) 255, (byte) 255, (byte) 255, 0},
((Ipv4SrcCase) entry.getMatchEntryValue()).getIpv4Src().getMask());
entry = entries.get(5);
- checkEntryHeader(entry, Ipv4Dst.class, true);
+ checkEntryHeader(entry, Ipv4Dst.VALUE, true);
assertEquals("Wrong ipv4 dst", "10.0.0.0", ((Ipv4DstCase) entry.getMatchEntryValue())
.getIpv4Dst().getIpv4Address().getValue());
assertArrayEquals("Wrong ipv4 dst mask", new byte[]{(byte) 255, 0, 0, 0},
((Ipv4DstCase) entry.getMatchEntryValue()).getIpv4Dst().getMask());
entry = entries.get(6);
- checkEntryHeader(entry, PbbIsid.class, true);
+ checkEntryHeader(entry, PbbIsid.VALUE, true);
assertEquals("Wrong pbb isid", 20, ((PbbIsidCase) entry.getMatchEntryValue())
.getPbbIsid().getIsid().intValue());
assertArrayEquals("Wrong pbb isid mask", new byte[]{0, 0, 8},
((PbbIsidCase) entry.getMatchEntryValue()).getPbbIsid().getMask());
entry = entries.get(7);
- checkEntryHeader(entry, TunnelId.class, true);
+ checkEntryHeader(entry, TunnelId.VALUE, true);
assertArrayEquals("Wrong tunnel id", new byte[]{0, 0, 0, 0, 0, 0, 0, 21},
((TunnelIdCase) entry.getMatchEntryValue()).getTunnelId().getTunnelId());
assertArrayEquals("Wrong tunnel id mask", new byte[]{0, 0, 0, 0, 0, 0, 0, 14},
assertEquals("Wrong entries size", 2, entries.size());
MatchEntry entry = entries.get(0);
- checkEntryHeader(entry, Ipv6Src.class, true);
+ checkEntryHeader(entry, Ipv6Src.VALUE, true);
assertEquals("wrong Ipv6Adress source", "fbA0:FFB6:FFF0:FFF0:FFF0:FFF0:FFF0:AFF0",
((Ipv6SrcCase) entry.getMatchEntryValue()).getIpv6Src().getIpv6Address().getValue());
entry = entries.get(1);
- checkEntryHeader(entry, Ipv6Dst.class, true);
+ checkEntryHeader(entry, Ipv6Dst.VALUE, true);
assertEquals("wrong Ipv6Adress destination", "fbA0:FFB6:FFF0:FFF0:FFF0:FFF0:FFF0:AFF0",
((Ipv6DstCase) entry.getMatchEntryValue()).getIpv6Dst().getIpv6Address().getValue());
}
List<MatchEntry> entries = entriesOptional.get();
assertEquals("Wrong entries size", 1, entries.size());
MatchEntry entry = entries.get(0);
- checkEntryHeader(entry, PacketType.class, false);
+ checkEntryHeader(entry, PacketType.VALUE, false);
assertEquals("Wrong in port", 0x1894f,
((PacketTypeCase) entry.getMatchEntryValue()).getPacketType().getPacketType().longValue());
}
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match;
import java.util.ArrayList;
public void testEmptyMatchEntry() {
final MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ builder.setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
builder.setMatchEntry(entries);
final Match match = builder.build();
public void testWithMatchEntryNoMasks() {
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
entriesBuilder.setOxmMatchField(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.InPort.class);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.InPort.VALUE);
entriesBuilder.setHasMask(false);
final InPortCaseBuilder caseBuilder = new InPortCaseBuilder();
final InPortBuilder portBuilder = new InPortBuilder();
final InPhyPortCaseBuilder inPhyPortCaseBuilder = new InPhyPortCaseBuilder();
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
entriesBuilder.setOxmMatchField(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.InPhyPort.class);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.InPhyPort.VALUE);
entriesBuilder.setHasMask(false);
final InPhyPortBuilder inPhyPortBuilder = new InPhyPortBuilder();
inPhyPortBuilder.setPortNumber(new PortNumber(Uint32.TWO));
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
entriesBuilder.setOxmMatchField(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE);
entriesBuilder.setHasMask(false);
final MetadataCaseBuilder metadataCaseBuilder = new MetadataCaseBuilder();
final org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(PacketType.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(PacketType.VALUE);
entriesBuilder.setHasMask(false);
final PacketTypeCaseBuilder packetTypeCaseBuilder = new PacketTypeCaseBuilder();
final PacketTypeBuilder packetTypeBuilder = new PacketTypeBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(EthDst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(EthDst.VALUE);
entriesBuilder.setHasMask(false);
final EthDstCaseBuilder ethDstCaseBuilder = new EthDstCaseBuilder();
final EthDstBuilder ethDstBuilder = new EthDstBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(EthSrc.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(EthSrc.VALUE);
entriesBuilder.setHasMask(false);
final EthSrcCaseBuilder ethSrcCaseBuilder = new EthSrcCaseBuilder();
final EthSrcBuilder ethSrcBuilder = new EthSrcBuilder();
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(EthType.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(EthType.VALUE);
entriesBuilder.setHasMask(false);
final EthTypeCaseBuilder ethTypeCaseBuilder = new EthTypeCaseBuilder();
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(VlanVid.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(VlanVid.VALUE);
final VlanVidCaseBuilder vlanVidCaseBuilder = new VlanVidCaseBuilder();
entriesBuilder.setHasMask(false);
final VlanVidBuilder vlanVidBuilder = new VlanVidBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(VlanPcp.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(VlanPcp.VALUE);
final VlanPcpCaseBuilder vlanPcpCaseBuilder = new VlanPcpCaseBuilder();
entriesBuilder.setHasMask(false);
final VlanPcpBuilder vlanPcpBuilder = new VlanPcpBuilder();
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(IpDscp.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(IpDscp.VALUE);
entriesBuilder.setHasMask(false);
final IpDscpCaseBuilder ipDscpCaseBuilder = new IpDscpCaseBuilder();
final IpDscpBuilder ipDscpBuilder = new IpDscpBuilder();
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(IpEcn.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(IpEcn.VALUE);
entriesBuilder.setHasMask(false);
final IpEcnCaseBuilder ipEcnCaseBuilder = new IpEcnCaseBuilder();
final IpEcnBuilder ipEcnBuilder = new IpEcnBuilder();
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(IpProto.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(IpProto.VALUE);
final IpProtoCaseBuilder ipProtoCaseBuilder = new IpProtoCaseBuilder();
entriesBuilder.setHasMask(false);
final IpProtoBuilder ipProtoBuilder = new IpProtoBuilder();
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv4Src.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv4Src.VALUE);
entriesBuilder.setHasMask(false);
final Ipv4SrcCaseBuilder ipv4AddressBuilder = new Ipv4SrcCaseBuilder();
final Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv4Dst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv4Dst.VALUE);
entriesBuilder.setHasMask(false);
final Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();
final Ipv4DstBuilder ipv4DstBuilder = new Ipv4DstBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(TcpSrc.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(TcpSrc.VALUE);
entriesBuilder.setHasMask(false);
final TcpSrcCaseBuilder tcpSrcCaseBuilder = new TcpSrcCaseBuilder();
final TcpSrcBuilder tcpSrcBuilder = new TcpSrcBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(TcpDst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(TcpDst.VALUE);
entriesBuilder.setHasMask(false);
final TcpDstCaseBuilder tcpDstCaseBuilder = new TcpDstCaseBuilder();
final TcpDstBuilder tcpDstBuilder = new TcpDstBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Icmpv4Type.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Icmpv4Type.VALUE);
entriesBuilder.setHasMask(false);
final Icmpv4TypeCaseBuilder icmpv4TypeCaseBuilder = new Icmpv4TypeCaseBuilder();
final Icmpv4TypeBuilder icmpv4TypeBuilder = new Icmpv4TypeBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Icmpv4Code.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Icmpv4Code.VALUE);
entriesBuilder.setHasMask(false);
final Icmpv4CodeCaseBuilder icmpv4CodeCaseBuilder = new Icmpv4CodeCaseBuilder();
final Icmpv4CodeBuilder icmpv4CodeBuilder = new Icmpv4CodeBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Icmpv6Type.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Icmpv6Type.VALUE);
entriesBuilder.setHasMask(false);
final Icmpv6TypeCaseBuilder icmpv6TypeCaseBuilder = new Icmpv6TypeCaseBuilder();
final Icmpv6TypeBuilder icmpv6TypeBuilder = new Icmpv6TypeBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Icmpv6Code.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Icmpv6Code.VALUE);
entriesBuilder.setHasMask(false);
final Icmpv6CodeCaseBuilder icmpv6CodeCaseBuilder = new Icmpv6CodeCaseBuilder();
final Icmpv6CodeBuilder icmpv6CodeBuilder = new Icmpv6CodeBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(MplsLabel.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(MplsLabel.VALUE);
entriesBuilder.setHasMask(false);
final MplsLabelCaseBuilder mplsLabelCaseBuilder = new MplsLabelCaseBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(MplsTc.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(MplsTc.VALUE);
entriesBuilder.setHasMask(false);
final MplsTcCaseBuilder mplsTcCaseBuilder = new MplsTcCaseBuilder();
final MplsTcBuilder mplsTcBuilder = new MplsTcBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(MplsBos.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(MplsBos.VALUE);
entriesBuilder.setHasMask(false);
final MplsBosCaseBuilder mplsBosCaseBuilder = new MplsBosCaseBuilder();
final MplsBosBuilder mplsBosBuilder = new MplsBosBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(PbbIsid.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(PbbIsid.VALUE);
entriesBuilder.setHasMask(false);
final PbbIsidCaseBuilder pbbIsidCaseBuilder = new PbbIsidCaseBuilder();
final PbbIsidBuilder pbbIsidBuilder = new PbbIsidBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(TunnelId.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(TunnelId.VALUE);
entriesBuilder.setHasMask(false);
final TunnelIdCaseBuilder tunnelIdCaseBuilder = new TunnelIdCaseBuilder();
final TunnelIdBuilder tunnelIdBuilder = new TunnelIdBuilder();
@Test
public void testWithMatchEntryWithMasks() {
final MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ builder.setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
entriesBuilder.setOxmMatchField(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE);
entriesBuilder.setHasMask(true);
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(EthDst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(EthDst.VALUE);
entriesBuilder.setHasMask(true);
final EthDstCaseBuilder ethDstCaseBuilder = new EthDstCaseBuilder();
final EthDstBuilder ethDstBuilder = new EthDstBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(EthSrc.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(EthSrc.VALUE);
entriesBuilder.setHasMask(true);
final EthSrcCaseBuilder ethSrcCaseBuilder = new EthSrcCaseBuilder();
final EthSrcBuilder ethSrcBuilder = new EthSrcBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(VlanVid.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(VlanVid.VALUE);
entriesBuilder.setHasMask(true);
final VlanVidCaseBuilder vlanVidCaseBuilder = new VlanVidCaseBuilder();
final VlanVidBuilder vlanVidBuilder = new VlanVidBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv4Src.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv4Src.VALUE);
entriesBuilder.setHasMask(true);
final Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();
final Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv4Dst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv4Dst.VALUE);
entriesBuilder.setHasMask(true);
final Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();
final Ipv4DstBuilder ipv4AddressBuilder = new Ipv4DstBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(PbbIsid.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(PbbIsid.VALUE);
entriesBuilder.setHasMask(true);
final PbbIsidCaseBuilder pbbIsidCaseBuilder = new PbbIsidCaseBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(TunnelId.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(TunnelId.VALUE);
entriesBuilder.setHasMask(true);
final TunnelIdCaseBuilder tunnelIdCaseBuilder = new TunnelIdCaseBuilder();
final TunnelIdBuilder tunnelIdBuilder = new TunnelIdBuilder();
@Test
public void testWithMatchEntryWithArbitraryMasks() {
final MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ builder.setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
entriesBuilder.setOxmMatchField(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE);
entriesBuilder.setHasMask(true);
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv4Src.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv4Src.VALUE);
entriesBuilder.setHasMask(true);
final Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();
final Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv4Dst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv4Dst.VALUE);
entriesBuilder.setHasMask(true);
final Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();
final Ipv4DstBuilder ipv4AddressBuilder = new Ipv4DstBuilder();
*/
@Test
public void testWithMatchEntryWithSrcCidrMaskAndDstArbitraryBitMask() {
- final MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ final MatchBuilder builder = new MatchBuilder()
+ .setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
entriesBuilder.setOxmMatchField(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE);
entriesBuilder.setHasMask(true);
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv4Src.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv4Src.VALUE);
entriesBuilder.setHasMask(true);
final Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();
final Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv4Dst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv4Dst.VALUE);
entriesBuilder.setHasMask(true);
final Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();
final Ipv4DstBuilder ipv4AddressBuilder = new Ipv4DstBuilder();
*/
@Test
public void testWithMatchEntryWithSrcArbitraryBitMaskAndDstCidrMask() {
- final MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ final MatchBuilder builder = new MatchBuilder()
+ .setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
entriesBuilder.setOxmMatchField(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE);
entriesBuilder.setHasMask(true);
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv4Src.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv4Src.VALUE);
entriesBuilder.setHasMask(true);
final Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();
final Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv4Dst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv4Dst.VALUE);
entriesBuilder.setHasMask(true);
final Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();
final Ipv4DstBuilder ipv4AddressBuilder = new Ipv4DstBuilder();
*/
@Test
public void testWithMatchEntryWithDstArbitraryBitMaskAndSrcCidrMask() {
- final MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ final MatchBuilder builder = new MatchBuilder()
+ .setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
entriesBuilder.setOxmMatchField(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE);
entriesBuilder.setHasMask(true);
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv4Dst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv4Dst.VALUE);
entriesBuilder.setHasMask(true);
final Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();
final Ipv4DstBuilder ipv4AddressBuilder = new Ipv4DstBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv4Src.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv4Src.VALUE);
entriesBuilder.setHasMask(true);
final Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();
final Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();
*/
@Test
public void testWithMatchEntryWithDstCidrMaskAndSrcArbitraryBitMask() {
- final MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ final MatchBuilder builder = new MatchBuilder()
+ .setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
entriesBuilder.setOxmMatchField(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE);
entriesBuilder.setHasMask(true);
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv4Dst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv4Dst.VALUE);
entriesBuilder.setHasMask(true);
final Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();
final Ipv4DstBuilder ipv4AddressBuilder = new Ipv4DstBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv4Src.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv4Src.VALUE);
entriesBuilder.setHasMask(true);
final Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();
final Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();
*/
@Test
public void testLayer4MatchUdp() {
- final MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ final MatchBuilder builder = new MatchBuilder()
+ .setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
entriesBuilder.setOxmMatchField(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.UdpSrc.class);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.UdpSrc.VALUE);
entriesBuilder.setHasMask(false);
final UdpSrcCaseBuilder udpSrcCaseBuilder = new UdpSrcCaseBuilder();
final UdpSrcBuilder portBuilder = new UdpSrcBuilder();
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(UdpDst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(UdpDst.VALUE);
entriesBuilder.setHasMask(false);
final UdpDstCaseBuilder udpDstCaseBuilder = new UdpDstCaseBuilder();
final UdpDstBuilder udpDstBuilder = new UdpDstBuilder();
*/
@Test
public void testLayer4MatchSctp() {
- final MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ final MatchBuilder builder = new MatchBuilder()
+ .setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(SctpSrc.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(SctpSrc.VALUE);
entriesBuilder.setHasMask(false);
final SctpSrcCaseBuilder sctpSrcCaseBuilder = new SctpSrcCaseBuilder();
final SctpSrcBuilder portBuilder = new SctpSrcBuilder();
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(SctpDst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(SctpDst.VALUE);
entriesBuilder.setHasMask(false);
final SctpDstCaseBuilder sctpDstCaseBuilder = new SctpDstCaseBuilder();
final SctpDstBuilder sctpDstBuilder = new SctpDstBuilder();
*/
@Test
public void testLayer3MatchIpv6() {
- final MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ final MatchBuilder builder = new MatchBuilder()
+ .setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Src.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Src.VALUE);
entriesBuilder.setHasMask(false);
final Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder();
final Ipv6SrcBuilder ipv6AddressBuilder = new Ipv6SrcBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Dst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Dst.VALUE);
entriesBuilder.setHasMask(false);
final Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder();
final Ipv6DstBuilder ipv6DstBuilder = new Ipv6DstBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Flabel.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Flabel.VALUE);
entriesBuilder.setHasMask(false);
final Ipv6FlabelCaseBuilder ipv6FlabelCaseBuilder = new Ipv6FlabelCaseBuilder();
final Ipv6FlabelBuilder ipv6FlabelBuilder = new Ipv6FlabelBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6NdTarget.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6NdTarget.VALUE);
entriesBuilder.setHasMask(false);
final Ipv6NdTargetCaseBuilder ipv6NdTargetCaseBuilder = new Ipv6NdTargetCaseBuilder();
final Ipv6NdTargetBuilder ipv6NdTargetBuilder = new Ipv6NdTargetBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6NdSll.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6NdSll.VALUE);
entriesBuilder.setHasMask(false);
final Ipv6NdSllCaseBuilder ipv6NdSllCaseBuilder = new Ipv6NdSllCaseBuilder();
final Ipv6NdSllBuilder ipv6NdSllBuilder = new Ipv6NdSllBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6NdTll.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6NdTll.VALUE);
entriesBuilder.setHasMask(false);
final Ipv6NdTllCaseBuilder ipv6NdTllCaseBuilder = new Ipv6NdTllCaseBuilder();
final Ipv6NdTllBuilder ipv6NdTllBuilder = new Ipv6NdTllBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Exthdr.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Exthdr.VALUE);
entriesBuilder.setHasMask(false);
final Ipv6ExthdrCaseBuilder ipv6ExthdrCaseBuilder = new Ipv6ExthdrCaseBuilder();
final Ipv6ExthdrBuilder ipv6ExthdrBuilder = new Ipv6ExthdrBuilder();
*/
@Test
public void testLayer3MatchIpv6ExtHeader2() {
- final MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ final MatchBuilder builder = new MatchBuilder()
+ .setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
final MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Exthdr.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Exthdr.VALUE);
entriesBuilder.setHasMask(true);
final Ipv6ExthdrCaseBuilder ipv6ExthdrCaseBuilder = new Ipv6ExthdrCaseBuilder();
final Ipv6ExthdrBuilder ipv6ExthdrBuilder = new Ipv6ExthdrBuilder();
*/
@Test
public void testLayer3MatchArp() {
- final MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ final MatchBuilder builder = new MatchBuilder()
+ .setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(ArpOp.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(ArpOp.VALUE);
entriesBuilder.setHasMask(false);
final ArpOpCaseBuilder arpOpCaseBuilder = new ArpOpCaseBuilder();
final ArpOpBuilder arpOpBuilder = new ArpOpBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(ArpSpa.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(ArpSpa.VALUE);
entriesBuilder.setHasMask(false);
final ArpSpaCaseBuilder arpSpaCaseBuilder = new ArpSpaCaseBuilder();
final ArpSpaBuilder arpSpaBuilder = new ArpSpaBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(ArpTpa.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(ArpTpa.VALUE);
entriesBuilder.setHasMask(false);
final ArpTpaCaseBuilder arpTpaCaseBuilder = new ArpTpaCaseBuilder();
final ArpTpaBuilder arpTpaBuilder = new ArpTpaBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(ArpSha.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(ArpSha.VALUE);
entriesBuilder.setHasMask(false);
final ArpShaCaseBuilder arpShaCaseBuilder = new ArpShaCaseBuilder();
final ArpShaBuilder arpShaBuilder = new ArpShaBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
entriesBuilder.setOxmMatchField(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ArpTha.class);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ArpTha.VALUE);
entriesBuilder.setHasMask(false);
final ArpThaCaseBuilder arpThaCaseBuilder = new ArpThaCaseBuilder();
final ArpThaBuilder arpThaBuilder = new ArpThaBuilder();
*/
@Test
public void testLayer3MatchArpWithMasks() {
- final MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ final MatchBuilder builder = new MatchBuilder()
+ .setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(ArpSpa.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(ArpSpa.VALUE);
entriesBuilder.setHasMask(true);
final ArpSpaCaseBuilder arpSpaCaseBuilder = new ArpSpaCaseBuilder();
final ArpSpaBuilder arpSpaBuilder = new ArpSpaBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(ArpTpa.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(ArpTpa.VALUE);
entriesBuilder.setHasMask(true);
final ArpTpaCaseBuilder arpTpaCaseBuilder = new ArpTpaCaseBuilder();
final ArpTpaBuilder arpTpaBuilder = new ArpTpaBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(ArpSha.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(ArpSha.VALUE);
entriesBuilder.setHasMask(true);
final ArpShaCaseBuilder arpShaCaseBuilder = new ArpShaCaseBuilder();
final ArpShaBuilder arpShaBuilder = new ArpShaBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
entriesBuilder.setOxmMatchField(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ArpTha.class);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ArpTha.VALUE);
entriesBuilder.setHasMask(true);
final ArpThaCaseBuilder arpThaCaseBuilder = new ArpThaCaseBuilder();
final ArpThaBuilder arpThaBuilder = new ArpThaBuilder();
*/
@Test
public void testWithMatchEntryWithIpv6ArbitraryMasks() {
- final MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ final MatchBuilder builder = new MatchBuilder()
+ .setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
entriesBuilder.setOxmMatchField(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE);
entriesBuilder.setHasMask(true);
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Src.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Src.VALUE);
entriesBuilder.setHasMask(true);
final Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder();
final Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Dst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Dst.VALUE);
entriesBuilder.setHasMask(true);
final Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder();
final Ipv6DstBuilder ipv6AddressBuilder = new Ipv6DstBuilder();
*/
@Test
public void testWithMatchEntryWithIpv6SrcCidrlMaskAndDstArbitraryBitMask() {
- final MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ final MatchBuilder builder = new MatchBuilder()
+ .setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
entriesBuilder.setOxmMatchField(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE);
entriesBuilder.setHasMask(true);
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Src.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Src.VALUE);
entriesBuilder.setHasMask(true);
final Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder();
final Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Dst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Dst.VALUE);
entriesBuilder.setHasMask(true);
final Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder();
final Ipv6DstBuilder ipv6AddressBuilder = new Ipv6DstBuilder();
*/
@Test
public void testWithMatchEntryWithIpv6SrcArbitraryBitMaskAndDstCidrMask() {
- final MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ final MatchBuilder builder = new MatchBuilder()
+ .setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
entriesBuilder.setOxmMatchField(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE);
entriesBuilder.setHasMask(true);
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Src.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Src.VALUE);
entriesBuilder.setHasMask(true);
final Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder();
final Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Dst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Dst.VALUE);
entriesBuilder.setHasMask(true);
final Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder();
final Ipv6DstBuilder ipv6AddressBuilder = new Ipv6DstBuilder();
*/
@Test
public void testWithMatchEntryWithIpv6DstArbitraryBitMaskAndSrcCidrMask() {
- final MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ final MatchBuilder builder = new MatchBuilder()
+ .setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
entriesBuilder.setOxmMatchField(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE);
entriesBuilder.setHasMask(true);
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Dst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Dst.VALUE);
entriesBuilder.setHasMask(true);
final Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder();
final Ipv6DstBuilder ipv6AddressBuilder = new Ipv6DstBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Src.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Src.VALUE);
entriesBuilder.setHasMask(true);
final Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder();
final Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder();
*/
@Test
public void testWithMatchEntryWithIpv6DstCidrMaskAndSrcArbitraryBitMask() {
- final MatchBuilder builder = new MatchBuilder();
- builder.setType(OxmMatchType.class);
+ final MatchBuilder builder = new MatchBuilder()
+ .setType(OxmMatchType.VALUE);
final List<MatchEntry> entries = new ArrayList<>();
MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
entriesBuilder.setOxmMatchField(
- org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class);
+ org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.VALUE);
entriesBuilder.setHasMask(true);
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Dst.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Dst.VALUE);
entriesBuilder.setHasMask(true);
final Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder();
final Ipv6DstBuilder ipv6AddressBuilder = new Ipv6DstBuilder();
entries.add(entriesBuilder.build());
entriesBuilder = new MatchEntryBuilder();
- entriesBuilder.setOxmClass(OpenflowBasicClass.class);
- entriesBuilder.setOxmMatchField(Ipv6Src.class);
+ entriesBuilder.setOxmClass(OpenflowBasicClass.VALUE);
+ entriesBuilder.setOxmMatchField(Ipv6Src.VALUE);
entriesBuilder.setHasMask(true);
final Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder();
final Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder();
createOFMatch(final List<MatchEntry> entries) {
org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.MatchBuilder builder =
new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.MatchBuilder();
- return builder.setType(OxmMatchType.class).setMatchEntry(entries).build();
+ return builder.setType(OxmMatchType.VALUE).setMatchEntry(entries).build();
}
private static List<MatchEntry> createDefaultMatchEntry() {
List<MatchEntry> entries = new ArrayList<>();
- entries.add(toOfPort(InPort.class, IN_PORT));
+ entries.add(toOfPort(InPort.VALUE, IN_PORT));
MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
EthSrcCaseBuilder ethSrcCaseBuilder = new EthSrcCaseBuilder();
ethSrcBuilder.setMacAddress(MAC_SRC);
ethSrcCaseBuilder.setEthSrc(ethSrcBuilder.build());
matchEntryBuilder.setMatchEntryValue(ethSrcCaseBuilder.build());
- matchEntryBuilder.setOxmMatchField(EthSrc.class);
+ matchEntryBuilder.setOxmMatchField(EthSrc.VALUE);
entries.add(matchEntryBuilder.build());
ethDstBuilder.setMacAddress(MAC_DST);
ethDstCaseBuilder.setEthDst(ethDstBuilder.build());
matchEntryBuilder.setMatchEntryValue(ethDstCaseBuilder.build());
- matchEntryBuilder.setOxmMatchField(EthDst.class);
+ matchEntryBuilder.setOxmMatchField(EthDst.VALUE);
entries.add(matchEntryBuilder.build());
entries.add(toOfEthernetType(ETHTYPE_IPV4));
private static MatchEntry toOfEthernetType(final Uint16 ethType) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
builder.setHasMask(false);
- builder.setOxmMatchField(EthType.class);
+ builder.setOxmMatchField(EthType.VALUE);
EthTypeCaseBuilder ethTypeCaseBuilder = new EthTypeCaseBuilder();
EthTypeBuilder ethTypeBuilder = new EthTypeBuilder();
EtherType etherType = new EtherType(ethType);
return builder.build();
}
- private static MatchEntry toOfPort(final Class<? extends MatchField> field,
- final Uint32 portNumber) {
+ private static MatchEntry toOfPort(final MatchField field, final Uint32 portNumber) {
MatchEntryBuilder builder = new MatchEntryBuilder();
- builder.setOxmClass(OpenflowBasicClass.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
builder.setHasMask(false);
builder.setOxmMatchField(field);
InPortCaseBuilder inPortCaseBuilder = new InPortCaseBuilder();
boolean cfi = true;
final Uint16 vidValue;
byte[] mask = null;
- builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(VlanVid.class);
+ builder.setOxmClass(OpenflowBasicClass.VALUE);
+ builder.setOxmMatchField(VlanVid.VALUE);
if (vid == 0) {
// Match untagged frame.
cfi = false;
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>9.0.4</version>
+ <version>10.0.0</version>
<relativePath/>
</parent>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>controller-artifacts</artifactId>
- <version>5.0.5</version>
+ <version>6.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.infrautils</groupId>
<artifactId>infrautils-artifacts</artifactId>
- <version>3.0.1</version>
+ <version>4.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</modules>
</profile>
</profiles>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <!-- https://issues.apache.org/jira/browse/MJAVADOC-649 -->
+ <version>3.1.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
try {
return future.get();
} catch (InterruptedException | ExecutionException e) {
- throw new RuntimeException(e);
+ throw new IllegalStateException(e);
}
}, EXECUTOR);
}
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
InstanceIdentifier<Nodes> nodesID = InstanceIdentifier.create(Nodes.class);
Nodes nodes = TestProviderTransactionUtil.getDataObject(readOnlyTransaction, nodesID);
if (nodes == null) {
- throw new RuntimeException("nodes are not found, pls add the node.");
+ throw new IllegalStateException("nodes are not found, pls add the node.");
}
return nodes.nonnullNode().values();
}
.setMatchSetfield(new MatchSetfieldBuilder()
.setSetFieldMatch(BindingMap.of(new SetFieldMatchBuilder()
.setHasMask(false)
- .setMatchType(MplsLabel.class)
+ .setMatchType(MplsLabel.VALUE)
.build()))
.build())
.build())
.setWriteSetfield(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature
.prop.type.table.feature.prop.type.write.setfield.WriteSetfieldBuilder()
.setSetFieldMatch(BindingMap.ordered(
- new SetFieldMatchBuilder().setHasMask(false).setMatchType(MplsLabel.class).build(),
- new SetFieldMatchBuilder().setHasMask(true).setMatchType(MplsBos.class).build(),
- new SetFieldMatchBuilder().setHasMask(true).setMatchType(EthDst.class).build())).build())
+ new SetFieldMatchBuilder().setHasMask(false).setMatchType(MplsLabel.VALUE).build(),
+ new SetFieldMatchBuilder().setHasMask(true).setMatchType(MplsBos.VALUE).build(),
+ new SetFieldMatchBuilder().setHasMask(true).setMatchType(EthDst.VALUE).build()))
+ .build())
.build())
.withKey(new TableFeaturePropertiesKey(0))
.setOrder(1);
.setWriteSetfieldMiss(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature
.prop.type.table.feature.prop.type.write.setfield.miss.WriteSetfieldMissBuilder()
.setSetFieldMatch(BindingMap.ordered(
- new SetFieldMatchBuilder().setHasMask(false).setMatchType(EthSrc.class).build(),
- new SetFieldMatchBuilder().setHasMask(true).setMatchType(InPort.class).build(),
- new SetFieldMatchBuilder().setHasMask(true).setMatchType(Ipv4Dst.class).build()))
+ new SetFieldMatchBuilder().setHasMask(false).setMatchType(EthSrc.VALUE).build(),
+ new SetFieldMatchBuilder().setHasMask(true).setMatchType(InPort.VALUE).build(),
+ new SetFieldMatchBuilder().setHasMask(true).setMatchType(Ipv4Dst.VALUE).build()))
.build())
.build())
.withKey(new TableFeaturePropertiesKey(0)).setOrder(1);
.setApplySetfield(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature
.prop.type.table.feature.prop.type.apply.setfield.ApplySetfieldBuilder()
.setSetFieldMatch(BindingMap.ordered(
- new SetFieldMatchBuilder().setHasMask(false).setMatchType(ArpOp.class).build(),
- new SetFieldMatchBuilder().setHasMask(true).setMatchType(InPort.class).build(),
- new SetFieldMatchBuilder().setHasMask(true).setMatchType(Ipv4Dst.class).build()))
+ new SetFieldMatchBuilder().setHasMask(false).setMatchType(ArpOp.VALUE).build(),
+ new SetFieldMatchBuilder().setHasMask(true).setMatchType(InPort.VALUE).build(),
+ new SetFieldMatchBuilder().setHasMask(true).setMatchType(Ipv4Dst.VALUE).build()))
.build())
.build())
.withKey(new TableFeaturePropertiesKey(0))
.setApplySetfieldMiss(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table
.feature.prop.type.table.feature.prop.type.apply.setfield.miss.ApplySetfieldMissBuilder()
.setSetFieldMatch(BindingMap.of(
- new SetFieldMatchBuilder().setHasMask(false).setMatchType(ArpOp.class).build(),
- new SetFieldMatchBuilder().setHasMask(true).setMatchType(InPort.class).build(),
- new SetFieldMatchBuilder().setHasMask(true).setMatchType(Ipv4Dst.class).build()))
+ new SetFieldMatchBuilder().setHasMask(false).setMatchType(ArpOp.VALUE).build(),
+ new SetFieldMatchBuilder().setHasMask(true).setMatchType(InPort.VALUE).build(),
+ new SetFieldMatchBuilder().setHasMask(true).setMatchType(Ipv4Dst.VALUE).build()))
.build())
.build())
.withKey(new TableFeaturePropertiesKey(0))
.setTableFeaturePropType(new WildcardsBuilder()
.setWildcardSetfield(new WildcardSetfieldBuilder()
.setSetFieldMatch(BindingMap.ordered(
- new SetFieldMatchBuilder().setHasMask(false).setMatchType(ArpOp.class).build(),
- new SetFieldMatchBuilder().setHasMask(true).setMatchType(InPort.class).build()))
+ new SetFieldMatchBuilder().setHasMask(false).setMatchType(ArpOp.VALUE).build(),
+ new SetFieldMatchBuilder().setHasMask(true).setMatchType(InPort.VALUE).build()))
.build())
.build())
.withKey(new TableFeaturePropertiesKey(0))
Code Review / openflowplugin.git / commitdiff