import org.junit.Test;
import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants;
import org.opendaylight.openflowjava.util.ByteBufUtils;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.IetfYangUtil;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1Class;
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.entries.grouping.MatchEntryBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxArpSha;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpShaCaseValue;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.ArpShaCaseValueBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.arp.sha.grouping.ArpShaValuesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpShaCaseValue;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.ArpShaCaseValueBuilder;
public class ArpShaCodecTest {
-
ArpShaCodec arpShaCodec;
ByteBuf buffer;
MatchEntry input;
private static final int NXM_FIELD_CODE = 17;
private static byte[] resAddress = new byte[VALUE_LENGTH];
- private static final MacAddress RESULT_ADDRESS = new MacAddress(ByteBufUtils.macAddressToString(resAddress));
-
+ private static final MacAddress RESULT_ADDRESS = IetfYangUtil.macAddressFor(resAddress);
@Before
public void setUp() {
final ArpShaCaseValue result = (ArpShaCaseValue) input.getMatchEntryValue();
- assertEquals(Nxm1Class.class, input.getOxmClass());
- assertEquals(NxmNxArpSha.class, input.getOxmMatchField());
- assertEquals(false, input.isHasMask());
+ 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);
- byte[] address = new byte[VALUE_LENGTH];
-
- valuesBuilder.setMacAddress(new MacAddress(ByteBufUtils.macAddressToString(address)));
+ valuesBuilder.setMacAddress(IetfYangUtil.macAddressFor(new byte[VALUE_LENGTH]));
caseBuilder.setArpShaValues(valuesBuilder.build());
matchEntryBuilder.setMatchEntryValue(caseBuilder.build());
return matchEntryBuilder.build();
}
- private static void createBuffer(ByteBuf message) {
+ private static void createBuffer(final ByteBuf message) {
message.writeShort(OxmMatchConstants.NXM_1_CLASS);
int fieldMask = NXM_FIELD_CODE << 1;