import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Optional;
import org.junit.Before;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RouteDistinguisher;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RouteDistinguisherBuilder;
import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint8;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
private static final String ROUTE_DISTINGUISHER = "1.2.3.4:10";
- private static final PathId PATH_ID = new PathId(1L);
+ private static final PathId PATH_ID = new PathId(Uint32.ONE);
@Mock
private PeerSpecificParserConstraint constraint;
private static FlowspecType createSps() {
final List<SourcePorts> sports = Lists.newArrayList(new SourcePortsBuilder().setOp(
- new NumericOperand(false, true, true, false, false)).setValue(8080).build());
+ new NumericOperand(false, true, true, false, false)).setValue(Uint16.valueOf(8080)).build());
return new SourcePortCaseBuilder().setSourcePorts(sports).build();
}
private static FlowspecType createProts() {
final List<ProtocolIps> protocols = Lists.newArrayList(new ProtocolIpsBuilder().setOp(
- new NumericOperand(false, true, true, false, false)).setValue((short) 6).build());
+ new NumericOperand(false, true, true, false, false)).setValue(Uint8.valueOf(6)).build());
return new ProtocolIpCaseBuilder().setProtocolIps(protocols).build();
}
private static FlowspecType createDps() {
final List<DestinationPorts> destports = Lists.newArrayList(
- new DestinationPortsBuilder().setOp(new NumericOperand(false, false, false, true, false)).setValue(4089)
- .build(),
- new DestinationPortsBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue(179)
- .build());
+ new DestinationPortsBuilder().setOp(new NumericOperand(false, false, false, true, false))
+ .setValue(Uint16.valueOf(4089)).build(),
+ new DestinationPortsBuilder().setOp(new NumericOperand(false, true, true, false, false))
+ .setValue(Uint16.valueOf(179)).build());
return new DestinationPortCaseBuilder().setDestinationPorts(destports).build();
}
private static PortCase createPorts() {
final List<Ports> ports = Lists.newArrayList(
- new PortsBuilder().setOp(new NumericOperand(false, false, true, true, false)).setValue(137).build(),
- new PortsBuilder().setOp(new NumericOperand(true, false, true, false, true)).setValue(139).build(),
- new PortsBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue(8080).build());
+ new PortsBuilder().setOp(new NumericOperand(false, false, true, true, false)).setValue(Uint16.valueOf(137))
+ .build(),
+ new PortsBuilder().setOp(new NumericOperand(true, false, true, false, true)).setValue(Uint16.valueOf(139))
+ .build(),
+ new PortsBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue(Uint16.valueOf(8080))
+ .build());
return new PortCaseBuilder().setPorts(ports).build();
}
private static FlowspecType createDscp() {
final List<Dscps> dscps = Lists.newArrayList(new DscpsBuilder().setOp(
- new NumericOperand(false, true, false, true, false)).setValue(new Dscp((short) 42)).build());
+ new NumericOperand(false, true, false, true, false)).setValue(new Dscp(Uint8.valueOf(42))).build());
return new DscpCaseBuilder().setDscps(dscps).build();
}
private static PacketLengthCase createPackets() {
final List<PacketLengths> packets = Lists.newArrayList(new PacketLengthsBuilder().setOp(
- new NumericOperand(false, true, false, false, true)).setValue(57005).build());
+ new NumericOperand(false, true, false, false, true)).setValue(Uint16.valueOf(57005)).build());
return new PacketLengthCaseBuilder().setPacketLengths(packets).build();
}
private static TcpFlagsCase createTcp() {
final List<TcpFlags> flags = Lists.newArrayList(
- new TcpFlagsBuilder().setOp(new BitmaskOperand(false, false, false, true)).setValue(1025).build(),
- new TcpFlagsBuilder().setOp(new BitmaskOperand(false, true, true, false)).setValue(22193).build());
+ new TcpFlagsBuilder().setOp(new BitmaskOperand(false, false, false, true)).setValue(Uint16.valueOf(1025))
+ .build(),
+ new TcpFlagsBuilder().setOp(new BitmaskOperand(false, true, true, false)).setValue(Uint16.valueOf(22193))
+ .build());
return new TcpFlagsCaseBuilder().setTcpFlags(flags).build();
}
private static FlowspecType createIcmpCode() {
final List<Codes> codes = Lists.newArrayList(
- new CodesBuilder().setOp(new NumericOperand(false, false, false, false, true)).setValue((short) 4).build(),
- new CodesBuilder().setOp(new NumericOperand(false, true, false, false, false)).setValue((short) 5).build());
+ new CodesBuilder().setOp(new NumericOperand(false, false, false, false, true)).setValue(Uint8.valueOf(4))
+ .build(),
+ new CodesBuilder().setOp(new NumericOperand(false, true, false, false, false)).setValue(Uint8.valueOf(5))
+ .build());
return new IcmpCodeCaseBuilder().setCodes(codes).build();
}
private static FlowspecType createIcmpType() {
final List<Types> types = Lists.newArrayList(
- new TypesBuilder().setOp(new NumericOperand(false, false, false, false, true)).setValue((short) 2).build(),
- new TypesBuilder().setOp(new NumericOperand(false, true, false, false, true)).setValue((short) 3).build());
+ new TypesBuilder().setOp(new NumericOperand(false, false, false, false, true)).setValue(Uint8.TWO)
+ .build(),
+ new TypesBuilder().setOp(new NumericOperand(false, true, false, false, true)).setValue(Uint8.valueOf(3))
+ .build());
return new IcmpTypeCaseBuilder().setTypes(types).build();
}
.withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE,
AbstractOperandParser.AND_BIT_VALUE)).build())
.withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv4NlriParser.VALUE_NID)
- .withValue((short) 100).build()).build())
+ .withValue(Uint8.valueOf(100)).build()).build())
.withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(PROTOCOL_IP_NID)
.withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv4NlriParser.OP_NID)
.withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE)).build())
.withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv4NlriParser.VALUE_NID)
- .withValue((short) 200).build()).build())
+ .withValue(Uint8.valueOf(200)).build()).build())
.withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(PROTOCOL_IP_NID)
.withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv4NlriParser.OP_NID)
.withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE,
AbstractOperandParser.AND_BIT_VALUE, AbstractNumericOperandParser.EQUALS_VALUE))
.build())
.withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv4NlriParser.VALUE_NID)
- .withValue((short) 240).build()).build())
+ .withValue(Uint8.valueOf(240)).build()).build())
.build()).build()).build()).build());
- final FlowspecBuilder expectedFS = new FlowspecBuilder();
- expectedFS.setFlowspecType(new ProtocolIpCaseBuilder().setProtocolIps(Lists.newArrayList(
- new ProtocolIpsBuilder().setValue((short) 100).setOp(new NumericOperand(true, true, false, false, false))
- .build(),
- new ProtocolIpsBuilder().setValue((short) 200).setOp(new NumericOperand(true, false, false, false, false))
- .build(),
- new ProtocolIpsBuilder().setValue((short) 240).setOp(new NumericOperand(true, true, true, false, false))
- .build())).build());
+ final FlowspecBuilder expectedFS = new FlowspecBuilder()
+ .setFlowspecType(new ProtocolIpCaseBuilder()
+ .setProtocolIps(Lists.newArrayList(new ProtocolIpsBuilder()
+ .setValue(Uint8.valueOf(100))
+ .setOp(new NumericOperand(true, true, false, false, false))
+ .build(), new ProtocolIpsBuilder()
+ .setValue(Uint8.valueOf(200))
+ .setOp(new NumericOperand(true, false, false, false, false))
+ .build(), new ProtocolIpsBuilder()
+ .setValue(Uint8.valueOf(240))
+ .setOp(new NumericOperand(true, true, true, false, false))
+ .build()))
+ .build());
final List<Flowspec> expected = new ArrayList<>();
expected.add(expectedFS.build());
assertEquals(expected, this.fsParser.extractFlowspec(entry.build()));
AbstractOperandParser.AND_BIT_VALUE, AbstractNumericOperandParser.LESS_THAN_VALUE))
.build())
.withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv4NlriParser.VALUE_NID)
- .withValue(100).build()).build())
+ .withValue(Uint16.valueOf(100)).build()).build())
.build()).build()).build()).build());
- final FlowspecBuilder expectedFS = new FlowspecBuilder();
- expectedFS.setFlowspecType(new PortCaseBuilder().setPorts(Lists.newArrayList(new PortsBuilder().setValue(100)
- .setOp(new NumericOperand(true, true, false, false, true)).build())).build());
+ final FlowspecBuilder expectedFS = new FlowspecBuilder()
+ .setFlowspecType(new PortCaseBuilder()
+ .setPorts(Lists.newArrayList(new PortsBuilder()
+ .setValue(Uint16.valueOf(100))
+ .setOp(new NumericOperand(true, true, false, false, true))
+ .build()))
+ .build());
final List<Flowspec> expected = new ArrayList<>();
expected.add(expectedFS.build());
assertEquals(expected, this.fsParser.extractFlowspec(entry.build()));
.withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE,
AbstractNumericOperandParser.EQUALS_VALUE)).build())
.withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.VALUE_NID)
- .withValue(1024).build()).build())
+ .withValue(Uint16.valueOf(1024)).build()).build())
.build()).build()).build()).build());
final FlowspecBuilder expectedFS = new FlowspecBuilder();
- expectedFS.setFlowspecType(new DestinationPortCaseBuilder().setDestinationPorts(Lists.newArrayList(
- new DestinationPortsBuilder().setValue(1024).setOp(new NumericOperand(false, true, true, false, false))
- .build())).build());
+ expectedFS.setFlowspecType(new DestinationPortCaseBuilder()
+ .setDestinationPorts(Lists.newArrayList(new DestinationPortsBuilder()
+ .setValue(Uint16.valueOf(1024))
+ .setOp(new NumericOperand(false, true, true, false, false))
+ .build()))
+ .build());
final List<Flowspec> expected = new ArrayList<>();
expected.add(expectedFS.build());
assertEquals(expected, this.fsParser.extractFlowspec(entry.build()));
AbstractNumericOperandParser.GREATER_THAN_VALUE,
AbstractNumericOperandParser.LESS_THAN_VALUE)).build())
.withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv4NlriParser.VALUE_NID)
- .withValue(8080).build()).build())
+ .withValue(Uint16.valueOf(8080)).build()).build())
.build()).build()).build()).build());
final FlowspecBuilder expectedFS = new FlowspecBuilder();
- expectedFS.setFlowspecType(new SourcePortCaseBuilder().setSourcePorts(Lists.newArrayList(
- new SourcePortsBuilder().setValue(8080).setOp(new NumericOperand(true, true, true, true, true)).build()))
+ expectedFS.setFlowspecType(new SourcePortCaseBuilder()
+ .setSourcePorts(Lists.newArrayList(new SourcePortsBuilder()
+ .setValue(Uint16.valueOf(8080))
+ .setOp(new NumericOperand(true, true, true, true, true))
+ .build()))
.build());
final List<Flowspec> expected = new ArrayList<>();
expected.add(expectedFS.build());
AbstractNumericOperandParser.GREATER_THAN_VALUE,
AbstractNumericOperandParser.LESS_THAN_VALUE)).build())
.withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv4NlriParser.VALUE_NID)
- .withValue((short) 22).build()).build())
+ .withValue(Uint8.valueOf(22)).build()).build())
.build()).build()).build()).build());
final FlowspecBuilder expectedFS = new FlowspecBuilder();
- expectedFS.setFlowspecType(new IcmpTypeCaseBuilder().setTypes(Lists.newArrayList(
- new TypesBuilder().setValue((short) 22).setOp(new NumericOperand(true, true, true, true, true)).build()))
+ expectedFS.setFlowspecType(new IcmpTypeCaseBuilder()
+ .setTypes(Lists.newArrayList(new TypesBuilder()
+ .setValue(Uint8.valueOf(22))
+ .setOp(new NumericOperand(true, true, true, true, true))
+ .build()))
.build());
final List<Flowspec> expected = new ArrayList<>();
expected.add(expectedFS.build());
.withChild(Builders.unkeyedListEntryBuilder()
.withNodeIdentifier(FlowspecL3vpnIpv4NlriParser.OP_NID)
.withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv4NlriParser.OP_NID)
- .withValue(Sets.newHashSet()).build())
+ .withValue(Collections.emptySet()).build())
.withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv4NlriParser.VALUE_NID)
- .withValue((short) 23).build()).build())
+ .withValue(Uint8.valueOf(23)).build()).build())
.build()).build()).build()).build());
final FlowspecBuilder expectedFS = new FlowspecBuilder();
- expectedFS.setFlowspecType(new IcmpCodeCaseBuilder().setCodes(Lists.newArrayList(new CodesBuilder()
- .setValue((short) 23).setOp(new NumericOperand(false, false, false, false, false)).build())).build());
+ expectedFS.setFlowspecType(new IcmpCodeCaseBuilder()
+ .setCodes(Lists.newArrayList(new CodesBuilder()
+ .setValue(Uint8.valueOf(23))
+ .setOp(new NumericOperand(false, false, false, false, false))
+ .build()))
+ .build());
final List<Flowspec> expected = new ArrayList<>();
expected.add(expectedFS.build());
assertEquals(expected, this.fsParser.extractFlowspec(entry.build()));
.withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE,
AbstractOperandParser.END_OF_LIST_VALUE)).build())
.withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv4NlriParser.VALUE_NID)
- .withValue(99).build()).build())
+ .withValue(Uint16.valueOf(99)).build()).build())
.build()).build()).build()).build());
final FlowspecBuilder expectedFS = new FlowspecBuilder();
expectedFS.setFlowspecType(new TcpFlagsCaseBuilder().setTcpFlags(Lists.newArrayList(new TcpFlagsBuilder()
- .setValue(99).setOp(new BitmaskOperand(true, true, false, false)).build())).build());
+ .setValue(Uint16.valueOf(99)).setOp(new BitmaskOperand(true, true, false, false)).build())).build());
final List<Flowspec> expected = new ArrayList<>();
expected.add(expectedFS.build());
assertEquals(expected, this.fsParser.extractFlowspec(entry.build()));
.withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE,
AbstractNumericOperandParser.GREATER_THAN_VALUE)).build())
.withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv4NlriParser.VALUE_NID)
- .withValue(101).build()).build())
+ .withValue(Uint16.valueOf(101)).build()).build())
.build()).build()).build()).build());
final FlowspecBuilder expectedFS = new FlowspecBuilder();
expectedFS.setFlowspecType(new PacketLengthCaseBuilder().setPacketLengths(Lists.newArrayList(
- new PacketLengthsBuilder().setValue(101).setOp(
+ new PacketLengthsBuilder().setValue(Uint16.valueOf(101)).setOp(
new NumericOperand(true, false, false, true, false)).build())).build());
final List<Flowspec> expected = new ArrayList<>();
expected.add(expectedFS.build());
AbstractOperandParser.END_OF_LIST_VALUE,
AbstractNumericOperandParser.GREATER_THAN_VALUE)).build())
.withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv4NlriParser.VALUE_NID)
- .withValue((short) 15).build()).build())
+ .withValue(Uint8.valueOf(15)).build()).build())
.build()).build()).build()).build());
final FlowspecBuilder expectedFS = new FlowspecBuilder();
expectedFS.setFlowspecType(new DscpCaseBuilder().setDscps(Lists.newArrayList(new DscpsBuilder().setValue(
- new Dscp((short) 15)).setOp(new NumericOperand(true, true, false, true, false)).build())).build());
+ new Dscp(Uint8.valueOf(15))).setOp(new NumericOperand(true, true, false, true, false)).build())).build());
final List<Flowspec> expected = new ArrayList<>();
expected.add(expectedFS.build());
assertEquals(expected, this.fsParser.extractFlowspec(entry.build()));
Code Review / bgpcep.git / blobdiff