import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MacAddressMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MacAddressMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MaskMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MaskMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.ArpTha;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.OpenflowBasicClass;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.grouping.MatchEntriesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ArpSha;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OpenflowBasicClass;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ArpShaCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.arp.sha._case.ArpShaBuilder;
/**
* @author michal.polkorab
*/
public class OxmArpShaSerializerTest {
- OxmArpThaSerializer serializer = new OxmArpThaSerializer();
+ OxmArpShaSerializer serializer = new OxmArpShaSerializer();
/**
* Test correct serialization
*/
@Test
public void testSerializeWithoutMask() {
- MatchEntriesBuilder builder = prepareMatchEntry(false, "00:01:02:03:04:05");
+ MatchEntryBuilder builder = prepareMatchEntry(false, "00:01:02:03:04:05");
ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
serializer.serialize(builder.build(), buffer);
*/
@Test
public void testSerializeWithMask() {
- MatchEntriesBuilder builder = prepareMatchEntry(true, "00:01:02:03:04:0A");
+ MatchEntryBuilder builder = prepareMatchEntry(true, "00:01:02:03:04:0A");
ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
serializer.serialize(builder.build(), buffer);
*/
@Test
public void testSerializeHeaderWithoutMask() {
- MatchEntriesBuilder builder = prepareHeader(false);
+ MatchEntryBuilder builder = prepareHeader(false);
ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
serializer.serializeHeader(builder.build(), buffer);
*/
@Test
public void testSerializeHeaderWithMask() {
- MatchEntriesBuilder builder = prepareHeader(true);
+ MatchEntryBuilder builder = prepareHeader(true);
ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
serializer.serializeHeader(builder.build(), buffer);
*/
@Test
public void getOxmFieldCode() {
- assertEquals("Wrong oxm-class", OxmMatchConstants.ARP_THA, serializer.getOxmFieldCode());
+ assertEquals("Wrong oxm-class", OxmMatchConstants.ARP_SHA, serializer.getOxmFieldCode());
}
/**
assertEquals("Wrong value length", EncodeConstants.MAC_ADDRESS_LENGTH, serializer.getValueLength());
}
- private static MatchEntriesBuilder prepareMatchEntry(boolean hasMask, String value) {
- MatchEntriesBuilder builder = prepareHeader(hasMask);
+ private static MatchEntryBuilder prepareMatchEntry(boolean hasMask, String value) {
+ MatchEntryBuilder builder = prepareHeader(hasMask);
+ ArpShaCaseBuilder casebuilder = new ArpShaCaseBuilder();
+ ArpShaBuilder valueBuilder = new ArpShaBuilder();
if (hasMask) {
- MaskMatchEntryBuilder maskBuilder = new MaskMatchEntryBuilder();
- maskBuilder.setMask(new byte[]{15, 15, 0, 0, 10, 10});
- builder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
+ valueBuilder.setMask(new byte[]{15, 15, 0, 0, 10, 10});
}
- MacAddressMatchEntryBuilder macBuilder = new MacAddressMatchEntryBuilder();
- macBuilder.setMacAddress(new MacAddress(value));
- builder.addAugmentation(MacAddressMatchEntry.class, macBuilder.build());
+ valueBuilder.setMacAddress(new MacAddress(value));
+ casebuilder.setArpSha(valueBuilder.build());
+ builder.setMatchEntryValue(casebuilder.build());
return builder;
}
- private static MatchEntriesBuilder prepareHeader(boolean hasMask) {
- MatchEntriesBuilder builder = new MatchEntriesBuilder();
+ private static MatchEntryBuilder prepareHeader(boolean hasMask) {
+ MatchEntryBuilder builder = new MatchEntryBuilder();
builder.setOxmClass(OpenflowBasicClass.class);
- builder.setOxmMatchField(ArpTha.class);
+ builder.setOxmMatchField(ArpSha.class);
builder.setHasMask(hasMask);
return builder;
}
private static void checkHeader(ByteBuf buffer, 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 oxm-field", OxmMatchConstants.ARP_SHA, fieldAndMask >>> 1);
assertEquals("Wrong hasMask", hasMask, (fieldAndMask & 1) != 0);
if (hasMask) {
assertEquals("Wrong length", 2 * EncodeConstants.MAC_ADDRESS_LENGTH, buffer.readUnsignedByte());