<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
for plugin configuration etc. -->
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<name>ODL :: lispflowmapping :: ${project.artifactId}</name>
<properties>
- <branding.version>3.0.5</branding.version>
<build.suffix>1.0.0</build.suffix>
<forwardingrulesmanager.version>0.5.0</forwardingrulesmanager.version>
<lispflowmapping.version>1.16.0-SNAPSHOT</lispflowmapping.version>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>9.0.4</version>
+ <version>10.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<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>
<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.controller</groupId>
<artifactId>controller-artifacts</artifactId>
- <version>5.0.5</version>
+ <version>6.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lispflowmapping-inmemorydb">
<feature name="odl-lispflowmapping-inmemorydb">
- <feature version="[5,6)">odl-mdsal-broker</feature>
- <feature version="[5,6)">odl-controller-blueprint</feature>
+ <feature version="[6,7)">odl-mdsal-broker</feature>
+ <feature version="[6,7)">odl-controller-blueprint</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>
<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>odl-restconf</artifactId>
- <version>3.0.5</version>
+ <version>4.0.0</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<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>
<type>pom</type>
<scope>import</scope>
</dependency>
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lispflowmapping-models">
<feature name="odl-lispflowmapping-models">
- <feature version="[10,11)">odl-apache-commons-lang3</feature>
- <feature version="[9,10)">odl-mdsal-model-rfc6991</feature>
+ <feature version="[11,12)">odl-apache-commons-lang3</feature>
+ <feature version="[10,11)">odl-mdsal-model-rfc6991</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>
<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>odl-restconf</artifactId>
- <version>3.0.5</version>
+ <version>4.0.0</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>odl-mdsal-broker</artifactId>
- <version>5.0.5</version>
+ <version>6.0.0</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lispflowmapping-southbound">
<feature name="odl-lispflowmapping-southbound">
- <feature version="[10,11)">odl-netty-4</feature>
- <feature version="[5,6)">odl-mdsal-broker</feature>
+ <feature version="[11,12)">odl-netty-4</feature>
+ <feature version="[6,7)">odl-mdsal-broker</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.controller</groupId>
<artifactId>mdsal-it-parent</artifactId>
- <version>5.0.5</version>
+ <version>6.0.0</version>
<relativePath/>
</parent>
assertTrue(true);
Eid addressFromNetwork = reply.getMappingRecordItem().get(0).getMappingRecord().getEid();
- assertEquals(MacAfi.class, addressFromNetwork.getAddressType());
+ assertEquals(MacAfi.VALUE, addressFromNetwork.getAddressType());
String macAddressFromReply = ((Mac) addressFromNetwork.getAddress()).getMac().getValue();
assertEquals(macAddress, macAddressFromReply);
builder.setDest(new SimpleAddress(new MacAddress(macString)));
EidBuilder eb = new EidBuilder();
- eb.setAddressType(SourceDestKeyLcaf.class);
+ eb.setAddressType(SourceDestKeyLcaf.VALUE);
eb.setVirtualNetworkId(null);
eb.setAddress(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.SourceDestKeyBuilder().setSourceDestKey(builder.build()).build());
MapReply reply = registerAddressAndQuery(eb.build());
Eid fromNetwork = reply.getMappingRecordItem().get(0).getMappingRecord().getEid();
- assertEquals(SourceDestKeyLcaf.class, fromNetwork.getAddressType());
+ assertEquals(SourceDestKeyLcaf.VALUE, fromNetwork.getAddressType());
SourceDestKey sourceDestFromNetwork = (SourceDestKey) fromNetwork.getAddress();
SimpleAddress receivedAddr1 = sourceDestFromNetwork.getSourceDestKey().getSource();
MapReply reply = queryForAddress(srcDst, null);
Eid fromNetwork = reply.getMappingRecordItem().get(0).getMappingRecord().getEid();
- assertEquals(SourceDestKeyLcaf.class, fromNetwork.getAddressType());
+ assertEquals(SourceDestKeyLcaf.VALUE, fromNetwork.getAddressType());
SourceDestKey sourceDestFromNetwork = (SourceDestKey) fromNetwork.getAddress();
IpPrefix receivedAddr1 = sourceDestFromNetwork.getSourceDestKey().getSource().getIpPrefix();
// srcEid/dstEid match
reply = queryForAddress(LispAddressUtil.asIpv4PrefixBinaryEid("20.20.20.1/32"), "10.10.10.1");
fromNetwork = reply.getMappingRecordItem().get(0).getMappingRecord().getEid();
- assertEquals(Ipv4PrefixBinaryAfi.class, fromNetwork.getAddressType());
+ assertEquals(Ipv4PrefixBinaryAfi.VALUE, fromNetwork.getAddressType());
assertEquals(LispAddressUtil.asIpv4PrefixBinaryEid(ipPrefix2), fromNetwork);
// dstEid match only
reply = queryForAddress(LispAddressUtil.asIpv4PrefixBinaryEid("20.20.20.1/32"), "1.2.3.4");
fromNetwork = reply.getMappingRecordItem().get(0).getMappingRecord().getEid();
- assertEquals(Ipv4PrefixBinaryAfi.class, fromNetwork.getAddressType());
+ assertEquals(Ipv4PrefixBinaryAfi.VALUE, fromNetwork.getAddressType());
assertEquals(LispAddressUtil.asIpv4PrefixBinaryEid(ipPrefix2), fromNetwork);
}
MapReply reply = registerAddressAndQuery(kv);
Eid fromNetwork = reply.getMappingRecordItem().get(0).getMappingRecord().getEid();
- assertEquals(KeyValueAddressLcaf.class, fromNetwork.getAddressType());
+ assertEquals(KeyValueAddressLcaf.VALUE, fromNetwork.getAddressType());
KeyValueAddress keyValueFromNetwork = (KeyValueAddress) fromNetwork.getAddress();
SimpleAddress receivedAddr1 = keyValueFromNetwork.getKeyValueAddress().getKey();
new SimpleAddress(new MacAddress(macString))));
EidBuilder eb = new EidBuilder();
- eb.setAddressType(AfiListLcaf.class);
+ eb.setAddressType(AfiListLcaf.VALUE);
eb.setVirtualNetworkId(null);
eb.setAddress(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.AfiListBuilder().setAfiList(listbuilder.build()).build());
Eid receivedAddress = reply.getMappingRecordItem().get(0).getMappingRecord().getEid();
- assertEquals(AfiListLcaf.class, receivedAddress.getAddressType());
+ assertEquals(AfiListLcaf.VALUE, receivedAddress.getAddressType());
AfiList listAddrFromNetwork = (AfiList) receivedAddress.getAddress();
Iterator<SimpleAddress> addrList = listAddrFromNetwork.getAfiList().getAddressList().iterator();
int instanceId = 6;
EidBuilder eb = new EidBuilder();
- eb.setAddressType(Ipv4PrefixAfi.class);
+ eb.setAddressType(Ipv4PrefixAfi.VALUE);
eb.setVirtualNetworkId(new InstanceIdType(Uint32.valueOf(instanceId)));
eb.setAddress(new Ipv4PrefixBuilder().setIpv4Prefix(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns
.yang.ietf.inet.types.rev130715.Ipv4Prefix(ipString)).build());
MapReply reply = registerAddressAndQuery(eb.build());
Eid receivedAddress = reply.getMappingRecordItem().get(0).getMappingRecord().getEid();
- assertEquals(Ipv4PrefixAfi.class, receivedAddress.getAddressType());
+ assertEquals(Ipv4PrefixAfi.VALUE, receivedAddress.getAddressType());
assertEquals(ipString, ((Ipv4Prefix) receivedAddress.getAddress()).getIpv4Prefix().getValue());
elpBuilder.getHop().add(hop2);
EidBuilder eb = new EidBuilder();
- eb.setAddressType(ExplicitLocatorPathLcaf.class);
+ eb.setAddressType(ExplicitLocatorPathLcaf.VALUE);
eb.setVirtualNetworkId(null);
eb.setAddress(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.ExplicitLocatorPathBuilder().setExplicitLocatorPath(elpBuilder.build()).build());
MapReply reply = registerAddressAndQuery(eb.build());
- assertEquals(ExplicitLocatorPathLcaf.class, reply.getMappingRecordItem().get(0).getMappingRecord().getEid()
+ assertEquals(ExplicitLocatorPathLcaf.VALUE, reply.getMappingRecordItem().get(0).getMappingRecord().getEid()
.getAddressType());
ExplicitLocatorPath receivedAddress = (ExplicitLocatorPath) reply.getMappingRecordItem().get(0)
builder.setAddress(new SimpleAddress(new IpAddress(new Ipv4Address(ipString))));
EidBuilder eb = new EidBuilder();
- eb.setAddressType(ApplicationDataLcaf.class);
+ eb.setAddressType(ApplicationDataLcaf.VALUE);
eb.setVirtualNetworkId(null);
eb.setAddress(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.ApplicationDataBuilder().setApplicationData(builder.build()).build());
Eid receivedAddress = reply.getMappingRecordItem().get(0).getMappingRecord().getEid();
- assertEquals(ApplicationDataLcaf.class, receivedAddress.getAddressType());
+ assertEquals(ApplicationDataLcaf.VALUE, receivedAddress.getAddressType());
ApplicationData receivedApplicationDataAddress = (ApplicationData) receivedAddress.getAddress();
assertEquals(protocol, receivedApplicationDataAddress.getApplicationData().getProtocol());
int port = 4350;
RlocBuilder rb = new RlocBuilder();
- rb.setAddressType(ApplicationDataLcaf.class);
+ rb.setAddressType(ApplicationDataLcaf.VALUE);
rb.setVirtualNetworkId(null);
rb.setAddress(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.ApplicationDataBuilder()
int port = LispMessage.XTR_PORT_NUM;
RlocBuilder rb = new RlocBuilder();
- rb.setAddressType(ApplicationDataLcaf.class);
+ rb.setAddressType(ApplicationDataLcaf.VALUE);
rb.setVirtualNetworkId(null);
rb.setAddress(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.ApplicationDataBuilder()
if (address instanceof Ipv4PrefixBinary) {
Ipv4Binary convertedEid = new Ipv4BinaryBuilder().setIpv4Binary(((Ipv4PrefixBinary) address)
.getIpv4AddressBinary()).build();
- return eb.setAddress(convertedEid).setAddressType(Ipv4BinaryAfi.class).build();
+ return eb.setAddress(convertedEid).setAddressType(Ipv4BinaryAfi.VALUE).build();
} else if (address instanceof Ipv6PrefixBinary) {
Ipv6Binary convertedEid = new Ipv6BinaryBuilder().setIpv6Binary(((Ipv6PrefixBinary) address)
.getIpv6AddressBinary()).build();
- return eb.setAddress(convertedEid).setAddressType(Ipv6BinaryAfi.class).build();
+ return eb.setAddress(convertedEid).setAddressType(Ipv6BinaryAfi.VALUE).build();
}
return eid;
}
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>karaf4-parent</artifactId>
- <version>10.0.2</version>
+ <version>11.0.0</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>9.0.4</version>
+ <version>10.0.0</version>
<relativePath/>
</parent>
public MappingSystem(ILispDAO dao, boolean iterateMask, NotificationPublishService nps, boolean mappingMerge) {
this.dao = dao;
- this.notificationPublishService = nps;
+ notificationPublishService = nps;
this.mappingMerge = mappingMerge;
buildMapCaches();
}
public void setDataStoreBackEnd(DataStoreBackEnd dataStoreBackEnd) {
- this.dsbe = dataStoreBackEnd;
+ dsbe = dataStoreBackEnd;
}
@Override
recordBuilder.setAuthoritative(false);
recordBuilder.setMapVersion((short) 0);
recordBuilder.setEid(eid);
- if (eid.getAddressType().equals(Ipv4PrefixBinaryAfi.class)
- || eid.getAddressType().equals(Ipv6PrefixBinaryAfi.class)) {
+ if (Ipv4PrefixBinaryAfi.VALUE.equals(eid.getAddressType())
+ || Ipv6PrefixBinaryAfi.VALUE.equals(eid.getAddressType())) {
Eid widestNegativePrefix = getWidestNegativePrefix(eid);
if (widestNegativePrefix != null) {
recordBuilder.setEid(widestNegativePrefix);
import static java.util.Objects.requireNonNull;
import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava;
+import com.google.common.collect.ImmutableSet;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.Ipv4PrefixAfi;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.Ipv6Afi;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.Ipv6PrefixAfi;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.LispAddressFamily;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SimpleAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SourceDestKeyLcaf;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.Address;
public class MapResolver implements IMapResolverAsync {
private static final Logger LOG = LoggerFactory.getLogger(MapResolver.class);
+ private static final ImmutableSet<LispAddressFamily> IPV4_AFIS = ImmutableSet.of(Ipv4Afi.VALUE, Ipv4BinaryAfi.VALUE,
+ Ipv4PrefixAfi.VALUE, Ipv4PrefixBinaryAfi.VALUE);
+ private static final ImmutableSet<LispAddressFamily> IPV6_AFIS = ImmutableSet.of(Ipv6Afi.VALUE, Ipv6BinaryAfi.VALUE,
+ Ipv6PrefixAfi.VALUE, Ipv6PrefixBinaryAfi.VALUE);
private final IMappingService mapService;
private boolean subscriptionService;
public MapResolver(IMappingService mapService, boolean smr, String elpPolicy,
IMapRequestResultHandler requestHandler) {
- this.subscriptionService = smr;
+ subscriptionService = smr;
this.mapService = requireNonNull(mapService);
this.elpPolicy = elpPolicy;
this.requestHandler = requestHandler;
private static boolean isEqualIpVersion(IpAddressBinary srcRloc, Rloc rloc) {
if (srcRloc.getIpv4AddressBinary() != null) {
- if (rloc.getAddressType() == Ipv4Afi.class
- || rloc.getAddressType() == Ipv4BinaryAfi.class
- || rloc.getAddressType() == Ipv4PrefixAfi.class
- || rloc.getAddressType() == Ipv4PrefixBinaryAfi.class) {
+ if (IPV4_AFIS.contains(rloc.getAddressType())) {
return true;
}
- } else if (rloc.getAddressType() == Ipv6Afi.class
- || rloc.getAddressType() == Ipv6BinaryAfi.class
- || rloc.getAddressType() == Ipv6PrefixAfi.class
- || rloc.getAddressType() == Ipv6PrefixBinaryAfi.class) {
+ } else if (IPV6_AFIS.contains(rloc.getAddressType())) {
return true;
}
return false;
// If the eid in the matched mapping is SourceDest and the requested eid IS NOT then we subscribe itrRloc only
// to dst from the src/dst since that what's been requested. Note though that any updates to to the src/dst
// mapping will be pushed to dst as well (see sendSMRs in MapServer)
- if (mapEid.getAddressType().equals(SourceDestKeyLcaf.class)
- && !reqEid.getAddressType().equals(SourceDestKeyLcaf.class)) {
+ if (SourceDestKeyLcaf.VALUE.equals(mapEid.getAddressType())
+ && !SourceDestKeyLcaf.VALUE.equals(reqEid.getAddressType())) {
subscribedEid = SourceDestKeyHelper.getDstBinary(mapEid);
}
@Override
public void setShouldAuthenticate(boolean shouldAuthenticate) {
- this.authenticate = shouldAuthenticate;
+ authenticate = shouldAuthenticate;
}
@Override
return new RlocBuilder()
.setAddress(explicitLocatorPath)
- .setAddressType(ExplicitLocatorPathLcaf.class).build();
+ .setAddressType(ExplicitLocatorPathLcaf.VALUE).build();
}
private static Rloc getIpPrefixTypeRloc() {
return new RlocBuilder()
.setAddress(address)
- .setAddressType(Ipv4PrefixAfi.class).build();
+ .setAddressType(Ipv4PrefixAfi.VALUE).build();
}
}
// ----------------------
// with sourceRloc = null
List<ItrRloc> itrRlocList = Lists.newArrayList(
- newItrRloc(MacAfi.class, null),
- newItrRloc(Ipv4BinaryAfi.class, IPV4_ADDRESS));
+ newItrRloc(MacAfi.VALUE, null),
+ newItrRloc(Ipv4BinaryAfi.VALUE, IPV4_ADDRESS));
ArgumentCaptor<Subscriber> captor = ArgumentCaptor.forClass(Subscriber.class);
mapResolver.handleMapRequest(mapRequestBuilder.setSourceRloc(null).setItrRloc(itrRlocList).build());
// ----------------------
// with sourceRloc address = itrRloc address
itrRlocList = Lists.newArrayList(
- newItrRloc(MacAfi.class, null),
- newItrRloc(Ipv4BinaryAfi.class, IPV4_ADDRESS));
+ newItrRloc(MacAfi.VALUE, null),
+ newItrRloc(Ipv4BinaryAfi.VALUE, IPV4_ADDRESS));
MapRequest mapRequest = mapRequestBuilder
.setSourceRloc(IPV4_ADDRESS_BINARY_1)
// ----------------------
// with sourceRloc address Afi = itrRloc address Afi (for Ipv4)
itrRlocList = Lists.newArrayList(
- newItrRloc(MacAfi.class, null),
- newItrRloc(Ipv6Afi.class, IPV6_ADDRESS),
- newItrRloc(Ipv4Afi.class, IPV4_ADDRESS));
+ newItrRloc(MacAfi.VALUE, null),
+ newItrRloc(Ipv6Afi.VALUE, IPV6_ADDRESS),
+ newItrRloc(Ipv4Afi.VALUE, IPV4_ADDRESS));
mapRequest = mapRequestBuilder
.setSourceRloc(IPV6_ADDRESS_BINARY)
// ----------------------
// with sourceRloc address Afi = itrRloc address Afi (for Ipv6)
itrRlocList = Lists.newArrayList(
- newItrRloc(MacAfi.class, null),
- newItrRloc(Ipv6Afi.class, IPV6_ADDRESS),
- newItrRloc(Ipv4Afi.class, IPV4_ADDRESS));
+ newItrRloc(MacAfi.VALUE, null),
+ newItrRloc(Ipv6Afi.VALUE, IPV6_ADDRESS),
+ newItrRloc(Ipv4Afi.VALUE, IPV4_ADDRESS));
mapRequest = mapRequestBuilder
.setSourceRloc(IPV4_ADDRESS_BINARY_2)
// with no common ip address nor Afi
final Mac mac = new MacBuilder().setMac(new MacAddress("aa:bb:cc:dd:ee:ff")).build();
itrRlocList = Lists.newArrayList(
- newItrRloc(MacAfi.class, mac),
- newItrRloc(NoAddressAfi.class, Mockito.mock(NoAddress.class)));
+ newItrRloc(MacAfi.VALUE, mac),
+ newItrRloc(NoAddressAfi.VALUE, Mockito.mock(NoAddress.class)));
mapRequest = mapRequestBuilder
.setSourceRloc(IPV4_ADDRESS_BINARY_1)
Mockito.verify(lispMappingServiceMock).handleMapReply(mapReplyBuilder.build());
}
- private static ItrRloc newItrRloc(Class<? extends LispAddressFamily> clazz, Address address) {
+ private static ItrRloc newItrRloc(LispAddressFamily clazz, Address address) {
return new ItrRlocBuilder().setRloc(new RlocBuilder()
.setAddress(address)
.setAddressType(clazz).build()).build();
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>9.0.4</version>
+ <version>10.0.0</version>
<relativePath/>
</parent>
@Override
public Eid deserializeLcafEidData(ByteBuffer buffer, byte res2, short length, LispAddressSerializerContext ctx) {
EidBuilder eb = new EidBuilder();
- eb.setAddressType(AfiListLcaf.class);
+ eb.setAddressType(AfiListLcaf.VALUE);
eb.setVirtualNetworkId(getVni(ctx));
eb.setAddress(deserializeData(buffer, length, ctx));
return eb.build();
@Override
public Rloc deserializeLcafRlocData(ByteBuffer buffer, byte res2, short length, LispAddressSerializerContext ctx) {
RlocBuilder rb = new RlocBuilder();
- rb.setAddressType(AfiListLcaf.class);
+ rb.setAddressType(AfiListLcaf.VALUE);
rb.setVirtualNetworkId(getVni(ctx));
rb.setAddress(deserializeData(buffer, length, ctx));
return rb.build();
@Override
protected Eid deserializeLcafEidData(ByteBuffer buffer, byte res2, short length, LispAddressSerializerContext ctx) {
EidBuilder eb = new EidBuilder();
- eb.setAddressType(ApplicationDataLcaf.class);
+ eb.setAddressType(ApplicationDataLcaf.VALUE);
eb.setVirtualNetworkId(getVni(ctx));
eb.setAddress(deserializeData(buffer, ctx));
return eb.build();
protected Rloc deserializeLcafRlocData(ByteBuffer buffer, byte res2, short length,
LispAddressSerializerContext ctx) {
RlocBuilder eb = new RlocBuilder();
- eb.setAddressType(ApplicationDataLcaf.class);
+ eb.setAddressType(ApplicationDataLcaf.VALUE);
eb.setVirtualNetworkId(null);
eb.setAddress(deserializeData(buffer, ctx));
return eb.build();
}
- private Address deserializeData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
+ private static Address deserializeData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
ApplicationDataBuilder builder = new ApplicationDataBuilder();
byte[] rawIPTos = new byte[3];
buffer.get(rawIPTos);
@Override
protected Eid deserializeEidData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
EidBuilder eb = new EidBuilder();
- eb.setAddressType(DistinguishedNameAfi.class);
+ eb.setAddressType(DistinguishedNameAfi.VALUE);
eb.setVirtualNetworkId(getVni(ctx));
eb.setAddress(new DistinguishedNameBuilder().setDistinguishedName(deserializeData(buffer)).build());
return eb.build();
@Override
protected Rloc deserializeRlocData(ByteBuffer buffer) {
RlocBuilder rb = new RlocBuilder();
- rb.setAddressType(DistinguishedNameAfi.class);
+ rb.setAddressType(DistinguishedNameAfi.VALUE);
rb.setVirtualNetworkId(null);
rb.setAddress(new DistinguishedNameBuilder().setDistinguishedName(deserializeData(buffer)).build());
return rb.build();
return new SimpleAddress(deserializeData(buffer));
}
- private DistinguishedNameType deserializeData(ByteBuffer buffer) {
+ private static DistinguishedNameType deserializeData(ByteBuffer buffer) {
StringBuilder sb = new StringBuilder();
byte character = buffer.get();
while (character != 0) {
@Override
protected Eid deserializeLcafEidData(ByteBuffer buffer, byte res2, short length, LispAddressSerializerContext ctx) {
EidBuilder eb = new EidBuilder();
- eb.setAddressType(ExplicitLocatorPathLcaf.class);
+ eb.setAddressType(ExplicitLocatorPathLcaf.VALUE);
eb.setVirtualNetworkId(getVni(ctx));
eb.setAddress(deserializeData(buffer, length, ctx));
return eb.build();
protected Rloc deserializeLcafRlocData(ByteBuffer buffer, byte res2, short length,
LispAddressSerializerContext ctx) {
RlocBuilder rb = new RlocBuilder();
- rb.setAddressType(ExplicitLocatorPathLcaf.class);
+ rb.setAddressType(ExplicitLocatorPathLcaf.VALUE);
rb.setVirtualNetworkId(null);
rb.setAddress(deserializeData(buffer, length, ctx));
return rb.build();
}
- private Address deserializeData(ByteBuffer buffer, short lcafLength, LispAddressSerializerContext ctx) {
+ private static Address deserializeData(ByteBuffer buffer, short lcafLength, LispAddressSerializerContext ctx) {
List<Hop> hops = new ArrayList<>();
short length = lcafLength;
while (length > 0) {
LispAddressSerializer.getInstance().serialize(buffer, lispAddress);
}
- protected void serializeNonLcafAddress(ByteBuffer buffer, LispAddress lispAddress) {
+ protected static void serializeNonLcafAddress(ByteBuffer buffer, LispAddress lispAddress) {
buffer.putInt(lispAddress.getVirtualNetworkId().getValue().intValue());
}
@Override
protected Eid deserializeEidData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
EidBuilder eb = new EidBuilder();
- eb.setAddressType(Ipv4BinaryAfi.class);
+ eb.setAddressType(Ipv4BinaryAfi.VALUE);
eb.setVirtualNetworkId(getVni(ctx));
eb.setAddress(new Ipv4BinaryBuilder().setIpv4Binary(deserializeData(buffer)).build());
return eb.build();
@Override
protected Rloc deserializeRlocData(ByteBuffer buffer) {
RlocBuilder rb = new RlocBuilder();
- rb.setAddressType(Ipv4BinaryAfi.class);
+ rb.setAddressType(Ipv4BinaryAfi.VALUE);
rb.setVirtualNetworkId(null);
rb.setAddress(new Ipv4BinaryBuilder().setIpv4Binary(deserializeData(buffer)).build());
return rb.build();
.setIpv4MaskLength(Uint8.valueOf(ctx.getMaskLen()))
.build();
EidBuilder eb = new EidBuilder();
- eb.setAddressType(Ipv4PrefixBinaryAfi.class);
+ eb.setAddressType(Ipv4PrefixBinaryAfi.VALUE);
eb.setVirtualNetworkId(getVni(ctx));
eb.setAddress(prefix);
return eb.build();
@Override
protected Eid deserializeEidData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
EidBuilder eb = new EidBuilder();
- eb.setAddressType(Ipv4PrefixAfi.class);
+ eb.setAddressType(Ipv4PrefixAfi.VALUE);
eb.setVirtualNetworkId(getVni(ctx));
eb.setAddress(new Ipv4PrefixBuilder().setIpv4Prefix(deserializeData(buffer, ctx)).build());
return eb.build();
@Override
protected Eid deserializeEidData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
EidBuilder eb = new EidBuilder();
- eb.setAddressType(Ipv4Afi.class);
+ eb.setAddressType(Ipv4Afi.VALUE);
eb.setVirtualNetworkId(getVni(ctx));
eb.setAddress(new Ipv4Builder().setIpv4(deserializeData(buffer)).build());
return eb.build();
@Override
protected Rloc deserializeRlocData(ByteBuffer buffer) {
RlocBuilder rb = new RlocBuilder();
- rb.setAddressType(Ipv4Afi.class);
+ rb.setAddressType(Ipv4Afi.VALUE);
rb.setVirtualNetworkId(null);
rb.setAddress(new Ipv4Builder().setIpv4(deserializeData(buffer)).build());
return rb.build();
protected interface Length {
int IPV4 = 4;
}
-
}
@Override
protected Eid deserializeEidData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
EidBuilder eb = new EidBuilder();
- eb.setAddressType(Ipv6BinaryAfi.class);
+ eb.setAddressType(Ipv6BinaryAfi.VALUE);
eb.setVirtualNetworkId(getVni(ctx));
eb.setAddress(new Ipv6BinaryBuilder().setIpv6Binary(deserializeData(buffer)).build());
return eb.build();
@Override
protected Rloc deserializeRlocData(ByteBuffer buffer) {
RlocBuilder rb = new RlocBuilder();
- rb.setAddressType(Ipv6BinaryAfi.class);
+ rb.setAddressType(Ipv6BinaryAfi.VALUE);
rb.setVirtualNetworkId(null);
rb.setAddress(new Ipv6BinaryBuilder().setIpv6Binary(deserializeData(buffer)).build());
return rb.build();
.setIpv6AddressBinary(new Ipv6AddressBinary(ipBuffer))
.setIpv6MaskLength(Uint8.valueOf(ctx.getMaskLen())).build();
EidBuilder eb = new EidBuilder();
- eb.setAddressType(Ipv6PrefixBinaryAfi.class);
+ eb.setAddressType(Ipv6PrefixBinaryAfi.VALUE);
eb.setVirtualNetworkId(getVni(ctx));
eb.setAddress(prefix);
return eb.build();
@Override
protected Eid deserializeEidData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
EidBuilder eb = new EidBuilder();
- eb.setAddressType(Ipv6PrefixAfi.class);
+ eb.setAddressType(Ipv6PrefixAfi.VALUE);
eb.setVirtualNetworkId(getVni(ctx));
eb.setAddress(new Ipv6PrefixBuilder().setIpv6Prefix(deserializeData(buffer, ctx)).build());
return eb.build();
@Override
protected Eid deserializeEidData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
EidBuilder eb = new EidBuilder();
- eb.setAddressType(Ipv6Afi.class);
+ eb.setAddressType(Ipv6Afi.VALUE);
eb.setVirtualNetworkId(getVni(ctx));
eb.setAddress(new Ipv6Builder().setIpv6(deserializeData(buffer)).build());
return eb.build();
@Override
protected Rloc deserializeRlocData(ByteBuffer buffer) {
RlocBuilder rb = new RlocBuilder();
- rb.setAddressType(Ipv6Afi.class);
+ rb.setAddressType(Ipv6Afi.VALUE);
rb.setVirtualNetworkId(null);
rb.setAddress(new Ipv6Builder().setIpv6(deserializeData(buffer)).build());
return rb.build();
@Override
protected Eid deserializeLcafEidData(ByteBuffer buffer, byte res2, short length, LispAddressSerializerContext ctx) {
EidBuilder eb = new EidBuilder();
- eb.setAddressType(KeyValueAddressLcaf.class);
+ eb.setAddressType(KeyValueAddressLcaf.VALUE);
eb.setVirtualNetworkId(getVni(ctx));
eb.setAddress(deserializeData(buffer, ctx));
return eb.build();
protected Rloc deserializeLcafRlocData(ByteBuffer buffer, byte res2, short length,
LispAddressSerializerContext ctx) {
RlocBuilder rb = new RlocBuilder();
- rb.setAddressType(KeyValueAddressLcaf.class);
+ rb.setAddressType(KeyValueAddressLcaf.VALUE);
rb.setVirtualNetworkId(null);
rb.setAddress(deserializeData(buffer, ctx));
return rb.build();
}
- private Address deserializeData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
+ private static Address deserializeData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
SimpleAddress keyAddress = SimpleAddressSerializer.getInstance().deserialize(buffer, ctx);
SimpleAddress valueAddress = SimpleAddressSerializer.getInstance().deserialize(buffer, ctx);
KeyValueAddressBuilder kvab = new KeyValueAddressBuilder();
return Length.LCAF_HEADER;
}
+ @Override
protected short getLcafLength(LispAddress lispAddress) {
throw new LispSerializationException("Unimplemented method");
}
- LispAddressSerializer.getInstance().getInstanceIdExtraSize()));
}
- private void serializeLCAFAddressHeader(ByteBuffer buffer, LispAddress lispAddress,
+ private static void serializeLCAFAddressHeader(ByteBuffer buffer, LispAddress lispAddress,
LispAddressSerializer serializer) {
// RES + Flags
buffer.putShort((short) 0);
protected Eid deserializeEidData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
buffer.position(buffer.position() + Length.RES + Length.FLAGS);
byte lcafType = (byte) ByteUtil.getUnsignedByte(buffer);
- Class<? extends LispAddressFamily> addressType = AddressTypeMap.getLcafType(lcafType);
+ LispAddressFamily addressType = AddressTypeMap.getLcafType(lcafType);
// TODO move these to ctx to shorten the list of arguments
byte res2 = buffer.get();
short length = buffer.getShort();
}
// Reset the mask context here, since the general mask length field in mapping records doesn't apply to LCAF
// address types; except for Instance ID, since we don't store it as an LCAF
- if (ctx != null && addressType != InstanceIdLcaf.class) {
+ if (ctx != null && !InstanceIdLcaf.VALUE.equals(addressType)) {
ctx.setMaskLen(LispAddressSerializerContext.MASK_LEN_MISSING);
}
return serializer.deserializeLcafEidData(buffer, res2, length, ctx);
protected Rloc deserializeRlocData(ByteBuffer buffer) {
buffer.position(buffer.position() + Length.RES + Length.FLAGS);
byte lcafType = (byte) ByteUtil.getUnsignedByte(buffer);
- Class<? extends LispAddressFamily> addressType = AddressTypeMap.getLcafType(lcafType);
+ LispAddressFamily addressType = AddressTypeMap.getLcafType(lcafType);
byte res2 = buffer.get();
short length = buffer.getShort();
}
LispAddressSerializer serializer = LispAddressSerializerFactory.getSerializer(lispAddress.getAddressType());
if (serializer == null) {
- throw new LispSerializationException("Unknown address type: "
- + lispAddress.getAddressType().getSimpleName());
+ throw new LispSerializationException("Unknown address type: " + lispAddress.getAddressType());
}
return size + serializer.getAddressSize(lispAddress);
}
}
LispAddressSerializer serializer = LispAddressSerializerFactory.getSerializer(lispAddress.getAddressType());
if (serializer == null) {
- throw new LispSerializationException("Unknown address type: "
- + lispAddress.getAddressType().getSimpleName());
+ throw new LispSerializationException("Unknown address type: " + lispAddress.getAddressType());
}
short afi = serializer.getAfi();
if (afi == (short) AddressFamily.LispCanonicalAddressFormat.getIntValue()) {
- serializer = LispAddressSerializerFactory.getSerializer(Lcaf.class);
+ serializer = LispAddressSerializerFactory.getSerializer(Lcaf.VALUE);
}
buffer.putShort(afi);
serializer.serializeData(buffer, lispAddress);
}
- private void serializeInstanceIdExtra(ByteBuffer buffer, LispAddress lispAddress) {
+ private static void serializeInstanceIdExtra(ByteBuffer buffer, LispAddress lispAddress) {
buffer.putShort((short) AddressFamily.LispCanonicalAddressFormat.getIntValue());
LcafSerializer.getInstance().serializeLCAFAddressHeaderForInstanceId(buffer, lispAddress);
InstanceIdSerializer.getInstance().serializeNonLcafAddress(buffer, lispAddress);
if ((afi == 1 || afi == 2) && ctx.getMaskLen() != LispAddressSerializerContext.MASK_LEN_MISSING) {
afi *= -1;
}
- Class<? extends LispAddressFamily> addressType = AddressTypeMap.getAddressType(afi);
+ LispAddressFamily addressType = AddressTypeMap.getAddressType(afi);
LispAddressSerializer serializer = LispAddressSerializerFactory.getSerializer(addressType);
if (serializer == null) {
throw new LispSerializationException("Unknown AFI: " + afi);
@SuppressWarnings("checkstyle:IllegalCatch")
public Rloc deserializeRloc(ByteBuffer buffer) {
short afi = buffer.getShort();
- Class<? extends LispAddressFamily> addressType = AddressTypeMap.getAddressType(afi);
+ LispAddressFamily addressType = AddressTypeMap.getAddressType(afi);
LispAddressSerializer serializer = LispAddressSerializerFactory.getSerializer(addressType);
if (serializer == null) {
throw new LispSerializationException("Unknown AFI: " + afi);
@Override
protected Eid deserializeEidData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
EidBuilder eb = new EidBuilder();
- eb.setAddressType(MacAfi.class);
+ eb.setAddressType(MacAfi.VALUE);
eb.setVirtualNetworkId(getVni(ctx));
eb.setAddress(new MacBuilder().setMac(deserializeData(buffer)).build());
return eb.build();
@Override
protected Rloc deserializeRlocData(ByteBuffer buffer) {
RlocBuilder rb = new RlocBuilder();
- rb.setAddressType(MacAfi.class);
+ rb.setAddressType(MacAfi.VALUE);
rb.setVirtualNetworkId(null);
rb.setAddress(new MacBuilder().setMac(deserializeData(buffer)).build());
return rb.build();
return new SimpleAddress(deserializeData(buffer));
}
- private MacAddress deserializeData(ByteBuffer buffer) {
+ private static MacAddress deserializeData(ByteBuffer buffer) {
byte[] macBuffer = new byte[6];
buffer.get(macBuffer);
return IetfYangUtil.INSTANCE.macAddressFor(macBuffer);
private interface Length {
int MAC = 6;
}
-
}
@Override
protected Eid deserializeEidData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
EidBuilder eb = new EidBuilder();
- eb.setAddressType(NoAddressAfi.class);
+ eb.setAddressType(NoAddressAfi.VALUE);
eb.setVirtualNetworkId(getVni(ctx));
eb.setAddress(new NoAddressBuilder().setNoAddress(Empty.value()).build());
return eb.build();
@Override
protected Rloc deserializeRlocData(ByteBuffer buffer) {
RlocBuilder rb = new RlocBuilder();
- rb.setAddressType(NoAddressAfi.class);
+ rb.setAddressType(NoAddressAfi.VALUE);
rb.setVirtualNetworkId(null);
rb.setAddress(new NoAddressBuilder().setNoAddress(Empty.value()).build());
return rb.build();
@Override
protected Eid deserializeLcafEidData(ByteBuffer buffer, byte res2, short length, LispAddressSerializerContext ctx) {
EidBuilder eb = new EidBuilder();
- eb.setAddressType(ServicePathLcaf.class);
+ eb.setAddressType(ServicePathLcaf.VALUE);
eb.setVirtualNetworkId(getVni(ctx));
eb.setAddress(deserializeData(buffer));
return eb.build();
}
- private Address deserializeData(ByteBuffer buffer) {
+ private static Address deserializeData(ByteBuffer buffer) {
ServicePathBuilder spb = new ServicePathBuilder();
byte[] spi = new byte[3];
buffer.get(spi);
&& ctx.getMaskLen() != LispAddressSerializerContext.MASK_LEN_MISSING) {
afi *= -1;
}
- Class<? extends LispAddressFamily> addressType = AddressTypeMap.getAddressType(afi);
+ LispAddressFamily addressType = AddressTypeMap.getAddressType(afi);
LispAddressSerializer serializer = LispAddressSerializerFactory.getSerializer(addressType);
if (serializer == null) {
throw new LispSerializationException("Unknown AFI: " + afi);
@Override
protected Eid deserializeLcafEidData(ByteBuffer buffer, byte res2, short length, LispAddressSerializerContext ctx) {
EidBuilder eb = new EidBuilder();
- eb.setAddressType(SourceDestKeyLcaf.class);
+ eb.setAddressType(SourceDestKeyLcaf.VALUE);
eb.setVirtualNetworkId(getVni(ctx));
eb.setAddress(deserializeData(buffer, ctx));
return eb.build();
protected Rloc deserializeLcafRlocData(ByteBuffer buffer, byte res2, short length,
LispAddressSerializerContext ctx) {
RlocBuilder rb = new RlocBuilder();
- rb.setAddressType(SourceDestKeyLcaf.class);
+ rb.setAddressType(SourceDestKeyLcaf.VALUE);
rb.setVirtualNetworkId(null);
rb.setAddress(deserializeData(buffer, ctx));
return rb.build();
}
- private Address deserializeData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
+ private static Address deserializeData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
// reserved bytes
buffer.getShort();
* Factory for LispAddress (de)serializers.
*
* @author Lorand Jakab
- *
*/
public final class LispAddressSerializerFactory {
- private static Map<Class<? extends LispAddressFamily>, LispAddressSerializer> addressTypeToSerializerMap;
+ private static Map<LispAddressFamily, LispAddressSerializer> addressTypeToSerializerMap;
- // Class should not be instantiated
private LispAddressSerializerFactory() {
+ // Class should not be instantiated
}
private static void initializeMap() {
- addressTypeToSerializerMap = new HashMap<Class<? extends LispAddressFamily>, LispAddressSerializer>();
- addressTypeToSerializerMap.put(NoAddressAfi.class, NoAddressSerializer.getInstance());
- addressTypeToSerializerMap.put(Ipv4Afi.class, Ipv4Serializer.getInstance());
- addressTypeToSerializerMap.put(Ipv4BinaryAfi.class, Ipv4BinarySerializer.getInstance());
- addressTypeToSerializerMap.put(Ipv4PrefixAfi.class, Ipv4PrefixSerializer.getInstance());
- addressTypeToSerializerMap.put(Ipv4PrefixBinaryAfi.class, Ipv4PrefixBinarySerializer.getInstance());
- addressTypeToSerializerMap.put(Ipv6Afi.class, Ipv6Serializer.getInstance());
- addressTypeToSerializerMap.put(Ipv6BinaryAfi.class, Ipv6BinarySerializer.getInstance());
- addressTypeToSerializerMap.put(Ipv6PrefixAfi.class, Ipv6PrefixSerializer.getInstance());
- addressTypeToSerializerMap.put(Ipv6PrefixBinaryAfi.class, Ipv6PrefixBinarySerializer.getInstance());
- addressTypeToSerializerMap.put(MacAfi.class, MacSerializer.getInstance());
- addressTypeToSerializerMap.put(DistinguishedNameAfi.class, DistinguishedNameSerializer.getInstance());
- addressTypeToSerializerMap.put(Lcaf.class, LcafSerializer.getInstance());
- addressTypeToSerializerMap.put(AfiListLcaf.class, AfiListSerializer.getInstance());
- addressTypeToSerializerMap.put(InstanceIdLcaf.class, InstanceIdSerializer.getInstance());
- addressTypeToSerializerMap.put(ApplicationDataLcaf.class, ApplicationDataSerializer.getInstance());
- addressTypeToSerializerMap.put(ExplicitLocatorPathLcaf.class, ExplicitLocatorPathSerializer.getInstance());
- addressTypeToSerializerMap.put(SourceDestKeyLcaf.class, SourceDestKeySerializer.getInstance());
- addressTypeToSerializerMap.put(KeyValueAddressLcaf.class, KeyValueAddressSerializer.getInstance());
- addressTypeToSerializerMap.put(ServicePathLcaf.class, ServicePathSerializer.getInstance());
+ // FIXME: use ImmutabmeMap and static initialization
+ addressTypeToSerializerMap = new HashMap<>();
+ addressTypeToSerializerMap.put(NoAddressAfi.VALUE, NoAddressSerializer.getInstance());
+ addressTypeToSerializerMap.put(Ipv4Afi.VALUE, Ipv4Serializer.getInstance());
+ addressTypeToSerializerMap.put(Ipv4BinaryAfi.VALUE, Ipv4BinarySerializer.getInstance());
+ addressTypeToSerializerMap.put(Ipv4PrefixAfi.VALUE, Ipv4PrefixSerializer.getInstance());
+ addressTypeToSerializerMap.put(Ipv4PrefixBinaryAfi.VALUE, Ipv4PrefixBinarySerializer.getInstance());
+ addressTypeToSerializerMap.put(Ipv6Afi.VALUE, Ipv6Serializer.getInstance());
+ addressTypeToSerializerMap.put(Ipv6BinaryAfi.VALUE, Ipv6BinarySerializer.getInstance());
+ addressTypeToSerializerMap.put(Ipv6PrefixAfi.VALUE, Ipv6PrefixSerializer.getInstance());
+ addressTypeToSerializerMap.put(Ipv6PrefixBinaryAfi.VALUE, Ipv6PrefixBinarySerializer.getInstance());
+ addressTypeToSerializerMap.put(MacAfi.VALUE, MacSerializer.getInstance());
+ addressTypeToSerializerMap.put(DistinguishedNameAfi.VALUE, DistinguishedNameSerializer.getInstance());
+ addressTypeToSerializerMap.put(Lcaf.VALUE, LcafSerializer.getInstance());
+ addressTypeToSerializerMap.put(AfiListLcaf.VALUE, AfiListSerializer.getInstance());
+ addressTypeToSerializerMap.put(InstanceIdLcaf.VALUE, InstanceIdSerializer.getInstance());
+ addressTypeToSerializerMap.put(ApplicationDataLcaf.VALUE, ApplicationDataSerializer.getInstance());
+ addressTypeToSerializerMap.put(ExplicitLocatorPathLcaf.VALUE, ExplicitLocatorPathSerializer.getInstance());
+ addressTypeToSerializerMap.put(SourceDestKeyLcaf.VALUE, SourceDestKeySerializer.getInstance());
+ addressTypeToSerializerMap.put(KeyValueAddressLcaf.VALUE, KeyValueAddressSerializer.getInstance());
+ addressTypeToSerializerMap.put(ServicePathLcaf.VALUE, ServicePathSerializer.getInstance());
}
- public static LispAddressSerializer getSerializer(Class<? extends LispAddressFamily> clazz) {
+ public static LispAddressSerializer getSerializer(LispAddressFamily clazz) {
if (addressTypeToSerializerMap == null) {
initializeMap();
}
* @author Lorand Jakab
*/
public final class AddressTypeMap {
- private static Map<Short, Class<? extends LispAddressFamily>> afiToAddressTypeMap;
- private static Map<Short, Class<? extends LispAddressFamily>> lcafToAddressTypeMap;
+ private static Map<Short, LispAddressFamily> afiToAddressTypeMap;
+ private static Map<Short, LispAddressFamily> lcafToAddressTypeMap;
// Utility class, should not be instantiated
private AddressTypeMap() {
}
private static void initializeAfiMap() {
- afiToAddressTypeMap = new HashMap<Short, Class<? extends LispAddressFamily>>();
- afiToAddressTypeMap.put((short) 0, NoAddressAfi.class);
- afiToAddressTypeMap.put((short) AddressFamily.IpV4.getIntValue(), Ipv4BinaryAfi.class);
- afiToAddressTypeMap.put((short) (AddressFamily.IpV4.getIntValue() * -1), Ipv4PrefixBinaryAfi.class);
- afiToAddressTypeMap.put((short) AddressFamily.IpV6.getIntValue(), Ipv6BinaryAfi.class);
- afiToAddressTypeMap.put((short) (AddressFamily.IpV6.getIntValue() * -1), Ipv6PrefixBinaryAfi.class);
- afiToAddressTypeMap.put((short) AddressFamily.DistinguishedName.getIntValue(), DistinguishedNameAfi.class);
- afiToAddressTypeMap.put((short) AddressFamily.AsNumber.getIntValue(), AsNumberAfi.class);
- afiToAddressTypeMap.put((short) AddressFamily.LispCanonicalAddressFormat.getIntValue(), Lcaf.class);
- afiToAddressTypeMap.put((short) AddressFamily._48BitMac.getIntValue(), MacAfi.class);
+ afiToAddressTypeMap = new HashMap<>();
+ afiToAddressTypeMap.put((short) 0, NoAddressAfi.VALUE);
+ afiToAddressTypeMap.put((short) AddressFamily.IpV4.getIntValue(), Ipv4BinaryAfi.VALUE);
+ afiToAddressTypeMap.put((short) (AddressFamily.IpV4.getIntValue() * -1), Ipv4PrefixBinaryAfi.VALUE);
+ afiToAddressTypeMap.put((short) AddressFamily.IpV6.getIntValue(), Ipv6BinaryAfi.VALUE);
+ afiToAddressTypeMap.put((short) (AddressFamily.IpV6.getIntValue() * -1), Ipv6PrefixBinaryAfi.VALUE);
+ afiToAddressTypeMap.put((short) AddressFamily.DistinguishedName.getIntValue(), DistinguishedNameAfi.VALUE);
+ afiToAddressTypeMap.put((short) AddressFamily.AsNumber.getIntValue(), AsNumberAfi.VALUE);
+ afiToAddressTypeMap.put((short) AddressFamily.LispCanonicalAddressFormat.getIntValue(), Lcaf.VALUE);
+ afiToAddressTypeMap.put((short) AddressFamily._48BitMac.getIntValue(), MacAfi.VALUE);
}
private static void initializeLcafMap() {
- lcafToAddressTypeMap = new HashMap<Short, Class<? extends LispAddressFamily>>();
- lcafToAddressTypeMap.put((short) LispCanonicalAddressFormatEnum.LIST.getLispCode(), AfiListLcaf.class);
- lcafToAddressTypeMap.put((short) LispCanonicalAddressFormatEnum.SEGMENT.getLispCode(), InstanceIdLcaf.class);
+ lcafToAddressTypeMap = new HashMap<>();
+ lcafToAddressTypeMap.put((short) LispCanonicalAddressFormatEnum.LIST.getLispCode(), AfiListLcaf.VALUE);
+ lcafToAddressTypeMap.put((short) LispCanonicalAddressFormatEnum.SEGMENT.getLispCode(), InstanceIdLcaf.VALUE);
lcafToAddressTypeMap.put((short) LispCanonicalAddressFormatEnum.APPLICATION_DATA.getLispCode(),
- ApplicationDataLcaf.class);
+ ApplicationDataLcaf.VALUE);
lcafToAddressTypeMap.put((short) LispCanonicalAddressFormatEnum.TRAFFIC_ENGINEERING.getLispCode(),
- ExplicitLocatorPathLcaf.class);
+ ExplicitLocatorPathLcaf.VALUE);
lcafToAddressTypeMap.put((short) LispCanonicalAddressFormatEnum.SOURCE_DEST.getLispCode(),
- SourceDestKeyLcaf.class);
+ SourceDestKeyLcaf.VALUE);
lcafToAddressTypeMap.put((short) LispCanonicalAddressFormatEnum.KEY_VALUE.getLispCode(),
- KeyValueAddressLcaf.class);
+ KeyValueAddressLcaf.VALUE);
lcafToAddressTypeMap.put((short) LispCanonicalAddressFormatEnum.SERVICE_PATH.getLispCode(),
- ServicePathLcaf.class);
+ ServicePathLcaf.VALUE);
// TODO
}
- public static Class<? extends LispAddressFamily> getAddressType(short afi) {
+ public static LispAddressFamily getAddressType(short afi) {
if (afiToAddressTypeMap == null) {
initializeAfiMap();
}
return afiToAddressTypeMap.get(afi);
}
- public static Class<? extends LispAddressFamily> getLcafType(short lcafType) {
+ public static LispAddressFamily getLcafType(short lcafType) {
if (lcafToAddressTypeMap == null) {
initializeLcafMap();
}
return lcafToAddressTypeMap.get(lcafType);
}
- public static Class<? extends LispAddressFamily> getSimpleAddressInnerType(SimpleAddress address) {
+ public static LispAddressFamily getSimpleAddressInnerType(SimpleAddress address) {
if (address == null) {
return null;
} else if (address.getIpAddress() != null) {
if (address.getIpAddress().getIpv4Address() != null) {
- return Ipv4Afi.class;
+ return Ipv4Afi.VALUE;
} else if (address.getIpAddress().getIpv6Address() != null) {
- return Ipv6Afi.class;
+ return Ipv6Afi.VALUE;
}
} else if (address.getIpPrefix() != null) {
if (address.getIpPrefix().getIpv4Prefix() != null) {
- return Ipv4PrefixAfi.class;
+ return Ipv4PrefixAfi.VALUE;
} else if (address.getIpPrefix().getIpv6Prefix() != null) {
- return Ipv6PrefixAfi.class;
+ return Ipv6PrefixAfi.VALUE;
}
} else if (address.getMacAddress() != null) {
- return MacAfi.class;
+ return MacAfi.VALUE;
} else if (address.getAsNumber() != null) {
- return AsNumberAfi.class;
+ return AsNumberAfi.VALUE;
} else if (address.getDistinguishedNameType() != null) {
- return DistinguishedNameAfi.class;
+ return DistinguishedNameAfi.VALUE;
}
return null;
}
private LispAddressUtil() {
}
- public static Class<? extends LispAddressFamily> addressTypeFromSimpleAddress(SimpleAddress address) {
+ public static LispAddressFamily addressTypeFromSimpleAddress(SimpleAddress address) {
if (address.getIpAddress() != null) {
return binaryAddressTypeFromIpAddress(address.getIpAddress());
} else if (address.getIpPrefix() != null) {
return addressTypeFromIpPrefix(address.getIpPrefix());
} else if (address.getMacAddress() != null) {
- return MacAfi.class;
+ return MacAfi.VALUE;
} else if (address.getDistinguishedNameType() != null) {
- return DistinguishedNameAfi.class;
+ return DistinguishedNameAfi.VALUE;
} else if (address.getAsNumber() != null) {
- return AsNumberAfi.class;
+ return AsNumberAfi.VALUE;
}
return null;
}
public static Address addressFromInet(InetAddress address) {
if (address instanceof Inet4Address) {
- return (Address) new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
+ return new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
.rev151105.lisp.address.address.Ipv4Builder()
.setIpv4(IetfInetUtil.INSTANCE.ipv4AddressFor(address)).build();
} else if (address instanceof Inet6Address) {
- return (Address) new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
+ return new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
.rev151105.lisp.address.address.Ipv6Builder()
.setIpv6(IetfInetUtil.INSTANCE.ipv6AddressFor(address)).build();
}
return null;
}
- public static Class<? extends LispAddressFamily> binaryAddressTypeFromInet(InetAddress address) {
+ public static LispAddressFamily binaryAddressTypeFromInet(InetAddress address) {
if (address instanceof Inet4Address) {
- return Ipv4BinaryAfi.class;
+ return Ipv4BinaryAfi.VALUE;
} else if (address instanceof Inet6Address) {
- return Ipv6BinaryAfi.class;
+ return Ipv6BinaryAfi.VALUE;
}
return null;
}
public static Address binaryAddressFromInet(InetAddress address) {
if (address instanceof Inet4Address) {
- return (Address) new Ipv4BinaryBuilder().setIpv4Binary(new Ipv4AddressBinary(address.getAddress())).build();
+ return new Ipv4BinaryBuilder().setIpv4Binary(new Ipv4AddressBinary(address.getAddress())).build();
} else if (address instanceof Inet6Address) {
- return (Address) new Ipv6BinaryBuilder().setIpv6Binary(new Ipv6AddressBinary(address.getAddress())).build();
+ return new Ipv6BinaryBuilder().setIpv6Binary(new Ipv6AddressBinary(address.getAddress())).build();
}
return null;
}
- public static Class<? extends LispAddressFamily> addressTypeFromIpAddress(IpAddress address) {
+ public static LispAddressFamily addressTypeFromIpAddress(IpAddress address) {
if (address == null) {
return null;
} else if (address.getIpv4Address() != null) {
- return Ipv4Afi.class;
+ return Ipv4Afi.VALUE;
} else if (address.getIpv6Address() != null) {
- return Ipv6Afi.class;
+ return Ipv6Afi.VALUE;
}
return null;
}
- public static Class<? extends LispAddressFamily> binaryAddressTypeFromIpAddress(IpAddress address) {
+ public static LispAddressFamily binaryAddressTypeFromIpAddress(IpAddress address) {
if (address == null) {
return null;
} else if (address.getIpv4Address() != null) {
- return Ipv4BinaryAfi.class;
+ return Ipv4BinaryAfi.VALUE;
} else if (address.getIpv6Address() != null) {
- return Ipv6BinaryAfi.class;
+ return Ipv6BinaryAfi.VALUE;
}
return null;
}
if (address == null) {
return null;
} else if (address.getIpv4Address() != null) {
- return (Address) new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
+ return new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
.rev151105.lisp.address.address.Ipv4Builder().setIpv4(address.getIpv4Address()).build();
} else if (address.getIpv6Address() != null) {
- return (Address) new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
+ return new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
.rev151105.lisp.address.address.Ipv6Builder().setIpv6(address.getIpv6Address()).build();
}
return null;
if (address == null) {
return null;
} else if (address.getIpv4Address() != null) {
- return (Address) new Ipv4BinaryBuilder().setIpv4Binary(new Ipv4AddressBinary(
+ return new Ipv4BinaryBuilder().setIpv4Binary(new Ipv4AddressBinary(
InetAddresses.forString(address.getIpv4Address().getValue()).getAddress())).build();
} else if (address.getIpv6Address() != null) {
- return (Address) new Ipv6BinaryBuilder().setIpv6Binary(new Ipv6AddressBinary(
+ return new Ipv6BinaryBuilder().setIpv6Binary(new Ipv6AddressBinary(
InetAddresses.forString(address.getIpv6Address().getValue()).getAddress())).build();
}
return null;
}
- public static Class<? extends LispAddressFamily> addressTypeFromIpPrefix(IpPrefix address) {
+ public static LispAddressFamily addressTypeFromIpPrefix(IpPrefix address) {
if (address == null) {
return null;
} else if (address.getIpv4Prefix() != null) {
- return Ipv4PrefixAfi.class;
+ return Ipv4PrefixAfi.VALUE;
} else if (address.getIpv6Prefix() != null) {
- return Ipv6PrefixAfi.class;
+ return Ipv6PrefixAfi.VALUE;
}
return null;
}
if (address == null) {
return null;
} else if (address.getIpv4Prefix() != null) {
- return (Address) new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
+ return new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
.rev151105.lisp.address.address.Ipv4PrefixBuilder().setIpv4Prefix(address.getIpv4Prefix()).build();
} else if (address.getIpv6Prefix() != null) {
- return (Address) new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
+ return new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
.rev151105.lisp.address.address.Ipv6PrefixBuilder().setIpv6Prefix(address.getIpv6Prefix()).build();
}
return null;
if (address == null) {
return null;
} else {
- return (Address) new MacBuilder().setMac(address).build();
+ return new MacBuilder().setMac(address).build();
}
}
if (address == null) {
return null;
} else {
- return (Address) new ServicePathBuilder().setServicePath(address).build();
+ return new ServicePathBuilder().setServicePath(address).build();
}
}
if (address == null) {
return null;
} else {
- return (Address) new DistinguishedNameBuilder().setDistinguishedName(address).build();
+ return new DistinguishedNameBuilder().setDistinguishedName(address).build();
}
}
if (address == null) {
return null;
} else {
- return (Address) new AsNumberBuilder().setAsNumber(address).build();
+ return new AsNumberBuilder().setAsNumber(address).build();
}
}
public static Rloc toRloc(Ipv4Address address) {
RlocBuilder builder = new RlocBuilder();
- builder.setAddressType(Ipv4Afi.class);
+ builder.setAddressType(Ipv4Afi.VALUE);
builder.setVirtualNetworkId(null);
- builder.setAddress((Address) new Ipv4Builder().setIpv4(address).build());
+ builder.setAddress(new Ipv4Builder().setIpv4(address).build());
return builder.build();
}
public static Rloc toRloc(Ipv4AddressBinary address) {
RlocBuilder builder = new RlocBuilder();
- builder.setAddressType(Ipv4BinaryAfi.class);
+ builder.setAddressType(Ipv4BinaryAfi.VALUE);
builder.setVirtualNetworkId(null);
- builder.setAddress((Address) new Ipv4BinaryBuilder().setIpv4Binary(address).build());
+ builder.setAddress(new Ipv4BinaryBuilder().setIpv4Binary(address).build());
return builder.build();
}
public static Rloc toRloc(Ipv6Address address) {
RlocBuilder builder = new RlocBuilder();
- builder.setAddressType(Ipv6Afi.class);
+ builder.setAddressType(Ipv6Afi.VALUE);
builder.setVirtualNetworkId(null);
- builder.setAddress((Address) new Ipv6Builder().setIpv6(address).build());
+ builder.setAddress(new Ipv6Builder().setIpv6(address).build());
return builder.build();
}
public static Rloc toRloc(Ipv6AddressBinary address) {
RlocBuilder builder = new RlocBuilder();
- builder.setAddressType(Ipv6BinaryAfi.class);
+ builder.setAddressType(Ipv6BinaryAfi.VALUE);
builder.setVirtualNetworkId(null);
- builder.setAddress((Address) new Ipv6BinaryBuilder().setIpv6Binary(address).build());
+ builder.setAddress(new Ipv6BinaryBuilder().setIpv6Binary(address).build());
return builder.build();
}
public static Eid toEid(Ipv4Prefix prefix, InstanceIdType vni) {
EidBuilder builder = new EidBuilder();
- builder.setAddressType(Ipv4PrefixAfi.class);
+ builder.setAddressType(Ipv4PrefixAfi.VALUE);
builder.setVirtualNetworkId(vni);
- builder.setAddress((Address) new Ipv4PrefixBuilder().setIpv4Prefix(prefix).build());
+ builder.setAddress(new Ipv4PrefixBuilder().setIpv4Prefix(prefix).build());
return builder.build();
}
public static Eid toEid(Ipv4PrefixBinary prefix, InstanceIdType vni) {
EidBuilder builder = new EidBuilder();
- builder.setAddressType(Ipv4PrefixBinaryAfi.class);
+ builder.setAddressType(Ipv4PrefixBinaryAfi.VALUE);
builder.setVirtualNetworkId(vni);
- builder.setAddress((Address) prefix);
+ builder.setAddress(prefix);
return builder.build();
}
public static Eid toEid(Ipv6PrefixBinary prefix, InstanceIdType vni) {
EidBuilder builder = new EidBuilder();
- builder.setAddressType(Ipv6PrefixBinaryAfi.class);
+ builder.setAddressType(Ipv6PrefixBinaryAfi.VALUE);
builder.setVirtualNetworkId(vni);
- builder.setAddress((Address) prefix);
+ builder.setAddress(prefix);
return builder.build();
}
public static Eid toEid(Ipv4Address address, InstanceIdType vni) {
EidBuilder builder = new EidBuilder();
- builder.setAddressType(Ipv4Afi.class);
+ builder.setAddressType(Ipv4Afi.VALUE);
builder.setVirtualNetworkId(vni);
- builder.setAddress((Address) new Ipv4Builder().setIpv4(address).build());
+ builder.setAddress(new Ipv4Builder().setIpv4(address).build());
return builder.build();
}
public static Eid toEid(Ipv4AddressBinary address, InstanceIdType vni) {
EidBuilder builder = new EidBuilder();
- builder.setAddressType(Ipv4BinaryAfi.class);
+ builder.setAddressType(Ipv4BinaryAfi.VALUE);
builder.setVirtualNetworkId(vni);
- builder.setAddress((Address) new Ipv4BinaryBuilder().setIpv4Binary(address).build());
+ builder.setAddress(new Ipv4BinaryBuilder().setIpv4Binary(address).build());
return builder.build();
}
public static Eid toEid(Ipv6Address address, InstanceIdType vni) {
EidBuilder builder = new EidBuilder();
- builder.setAddressType(Ipv6Afi.class);
+ builder.setAddressType(Ipv6Afi.VALUE);
builder.setVirtualNetworkId(vni);
- builder.setAddress((Address) new Ipv6Builder().setIpv6(address).build());
+ builder.setAddress(new Ipv6Builder().setIpv6(address).build());
return builder.build();
}
public static Eid toEid(Ipv6AddressBinary address, InstanceIdType vni) {
EidBuilder builder = new EidBuilder();
- builder.setAddressType(Ipv6BinaryAfi.class);
+ builder.setAddressType(Ipv6BinaryAfi.VALUE);
builder.setVirtualNetworkId(vni);
- builder.setAddress((Address) new Ipv6BinaryBuilder().setIpv6Binary(address).build());
+ builder.setAddress(new Ipv6BinaryBuilder().setIpv6Binary(address).build());
return builder.build();
}
public static Eid toEid(DistinguishedNameType dn, InstanceIdType vni) {
EidBuilder builder = new EidBuilder();
- builder.setAddressType(DistinguishedNameAfi.class);
+ builder.setAddressType(DistinguishedNameAfi.VALUE);
builder.setVirtualNetworkId(vni);
- builder.setAddress((Address) new DistinguishedNameBuilder().setDistinguishedName(dn).build());
+ builder.setAddress(new DistinguishedNameBuilder().setDistinguishedName(dn).build());
return builder.build();
}
public static Eid toEid(MacAddress mac, InstanceIdType vni) {
EidBuilder builder = new EidBuilder();
- builder.setAddressType(MacAfi.class);
+ builder.setAddressType(MacAfi.VALUE);
builder.setVirtualNetworkId(vni);
- builder.setAddress((Address) new MacBuilder().setMac(mac).build());
+ builder.setAddress(new MacBuilder().setMac(mac).build());
return builder.build();
}
public static Eid toEid(Ipv6Prefix prefix, InstanceIdType vni) {
EidBuilder builder = new EidBuilder();
- builder.setAddressType(Ipv6PrefixAfi.class);
+ builder.setAddressType(Ipv6PrefixAfi.VALUE);
builder.setVirtualNetworkId(vni);
- builder.setAddress((Address) new Ipv6PrefixBuilder().setIpv6Prefix(prefix).build());
+ builder.setAddress(new Ipv6PrefixBuilder().setIpv6Prefix(prefix).build());
return builder.build();
}
public static Eid toIpPrefixEid(IpAddress addr, int vni) {
// If you touch this, be sure that sfclisp compiles!
- int mask = addressTypeFromIpAddress(addr) == Ipv4Afi.class ? 32 : 128;
+ int mask = Ipv4Afi.VALUE.equals(addressTypeFromIpAddress(addr)) ? 32 : 128;
IpPrefix prefix = asIpPrefix(addr.stringValue(), mask);
// XXX getMapping rcp fails if VNI set to 0
return toEidNoVni(prefix);
public static Eid asIpv4PrefixEid(Eid eid, Inet4Address address, short mask) {
EidBuilder builder = new EidBuilder();
- builder.setAddressType(Ipv4PrefixAfi.class);
+ builder.setAddressType(Ipv4PrefixAfi.VALUE);
builder.setVirtualNetworkId(eid.getVirtualNetworkId());
builder.setAddress(new Ipv4PrefixBuilder().setIpv4Prefix(
IetfInetUtil.INSTANCE.ipv4PrefixFor(address, mask)).build());
public static Eid asIpv4PrefixBinaryEid(final String prefix, final InstanceIdType iiType) {
String address = MaskUtil.getPrefixAddress(prefix);
- short mask = Short.valueOf(MaskUtil.getPrefixMask(prefix));
+ short mask = Short.parseShort(MaskUtil.getPrefixMask(prefix));
byte[] ipv4 = InetAddresses.forString(address).getAddress();
return toEid(new Ipv4PrefixBinaryBuilder().setIpv4AddressBinary(new Ipv4AddressBinary(ipv4))
.setIpv4MaskLength(fromJava(mask)).build(), iiType);
Preconditions.checkArgument(address.length == 4,
"asIpv4PrefixBinaryEid called with incorrect length byte array ({})", address.length);
EidBuilder builder = new EidBuilder();
- builder.setAddressType(Ipv4PrefixBinaryAfi.class);
+ builder.setAddressType(Ipv4PrefixBinaryAfi.VALUE);
builder.setVirtualNetworkId(vni);
builder.setAddress(new Ipv4PrefixBinaryBuilder().setIpv4AddressBinary(new Ipv4AddressBinary(address))
.setIpv4MaskLength(fromJava(mask)).build());
public static Eid asIpv6PrefixEid(Eid eid, Inet6Address address, short mask) {
EidBuilder builder = new EidBuilder();
- builder.setAddressType(Ipv6PrefixAfi.class);
+ builder.setAddressType(Ipv6PrefixAfi.VALUE);
builder.setVirtualNetworkId(eid.getVirtualNetworkId());
builder.setAddress(new Ipv6PrefixBuilder().setIpv6Prefix(
IetfInetUtil.INSTANCE.ipv6PrefixFor(address, mask)).build());
public static Eid asIpv6PrefixBinaryEid(final String prefix, final InstanceIdType iiType) {
String address = MaskUtil.getPrefixAddress(prefix);
- short mask = Short.valueOf(MaskUtil.getPrefixMask(prefix));
+ short mask = Short.parseShort(MaskUtil.getPrefixMask(prefix));
byte[] ipv6 = InetAddresses.forString(address).getAddress();
return toEid(new Ipv6PrefixBinaryBuilder().setIpv6AddressBinary(new Ipv6AddressBinary(ipv6))
.setIpv6MaskLength(fromJava(mask)).build(), iiType);
Preconditions.checkArgument(address.length == 16,
"asIpv6PrefixBinaryEid called with incorrect length byte array ({})", address.length);
EidBuilder builder = new EidBuilder();
- builder.setAddressType(Ipv6PrefixBinaryAfi.class);
+ builder.setAddressType(Ipv6PrefixBinaryAfi.VALUE);
builder.setVirtualNetworkId(vni);
builder.setAddress(new Ipv6PrefixBinaryBuilder().setIpv6AddressBinary(new Ipv6AddressBinary(address))
.setIpv6MaskLength(fromJava(mask)).build());
public static IpPrefix asIpPrefix(String addr, int mask) {
int version = ipVersionFromString(addr);
- if (version == 4 && (mask >= 0 && mask <= 32)) {
+ if (version == 4 && mask >= 0 && mask <= 32) {
return new IpPrefix(new Ipv4Prefix(addr + "/" + mask));
- } else if (version == 6 && (mask >= 0 && mask <= 128)) {
+ } else if (version == 6 && mask >= 0 && mask <= 128) {
return new IpPrefix(new Ipv6Prefix(addr + "/" + mask));
} else {
return null;
public static Eid asServicePathEid(long vni, long servicePathId, short serviceIndex) {
EidBuilder eb = new EidBuilder();
- eb.setAddressType(ServicePathLcaf.class);
+ eb.setAddressType(ServicePathLcaf.VALUE);
if (vni >= 0) {
eb.setVirtualNetworkId(new InstanceIdType(fromJava(vni)));
}
.rev151105.lisp.address.address.KeyValueAddressBuilder()
.setKeyValueAddress(kvab.build()).build();
EidBuilder builder = new EidBuilder();
- builder.setAddressType(KeyValueAddressLcaf.class);
+ builder.setAddressType(KeyValueAddressLcaf.VALUE);
builder.setVirtualNetworkId(null);
- builder.setAddress((Address) address);
+ builder.setAddress(address);
return builder.build();
}
.rev151105.lisp.address.address.KeyValueAddressBuilder()
.setKeyValueAddress(kvab.build()).build();
RlocBuilder builder = new RlocBuilder();
- builder.setAddressType(KeyValueAddressLcaf.class);
+ builder.setAddressType(KeyValueAddressLcaf.VALUE);
builder.setVirtualNetworkId(null);
- builder.setAddress((Address) address);
+ builder.setAddress(address);
return builder.build();
}
public static Eid asSrcDstEid(String src, String dst, int smask, int dmask, long vni) {
EidBuilder builder = new EidBuilder();
- builder.setAddressType(SourceDestKeyLcaf.class);
- builder.setVirtualNetworkId(new InstanceIdType(fromJava(Long.valueOf(vni))));
+ builder.setAddressType(SourceDestKeyLcaf.VALUE);
+ builder.setVirtualNetworkId(new InstanceIdType(fromJava(vni)));
builder.setAddress(
new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.SourceDestKeyBuilder()
public static Eid asSrcDstEid(SourceDestKey sd, InstanceIdType vni) {
EidBuilder builder = new EidBuilder();
- builder.setAddressType(SourceDestKeyLcaf.class);
+ builder.setAddressType(SourceDestKeyLcaf.VALUE);
builder.setVirtualNetworkId(vni);
builder.setAddress(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
.rev151105.lisp.address.address.SourceDestKeyBuilder().setSourceDestKey(sd).build());
RlocBuilder teBuilder = new RlocBuilder();
teBuilder.setAddress(elpBuilder.build());
- teBuilder.setAddressType(ExplicitLocatorPathLcaf.class);
+ teBuilder.setAddressType(ExplicitLocatorPathLcaf.VALUE);
return teBuilder.build();
}
public static List<LocatorRecord> asLocatorRecords(List<Rloc> locators) {
- List<LocatorRecord> locatorRecords = new ArrayList<LocatorRecord>();
+ List<LocatorRecord> locatorRecords = new ArrayList<>();
for (Rloc locator : locators) {
LocatorRecordBuilder locatorBuilder = new LocatorRecordBuilder();
locatorBuilder.setLocalLocator(false).setRlocProbed(false)
public static Eid getNoAddressEid() {
EidBuilder builder = new EidBuilder();
- builder.setAddressType(NoAddressAfi.class);
+ builder.setAddressType(NoAddressAfi.VALUE);
builder.setVirtualNetworkId(null);
builder.setAddress(new NoAddressBuilder().setNoAddress(Empty.value()).build());
return builder.build();
return new Ipv6BinaryBuilder().setIpv6Binary(new Ipv6AddressBinary(addr)).build();
}
- private static Pair<Class<? extends LispAddressFamily>, Address> convertToBinary(Address addr) {
- Address convAddr = null;
- Class<? extends LispAddressFamily> convType = null;
+ private static Pair<LispAddressFamily, Address> convertToBinary(Address addr) {
+ final Address convAddr;
+ final LispAddressFamily convType;
if (addr instanceof org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf
.lisp.address.types.rev151105.lisp.address.address.Ipv4Prefix) {
convAddr = convertToBinary((org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf
.lisp.address.types.rev151105.lisp.address.address.Ipv4Prefix) addr);
- convType = Ipv4PrefixBinaryAfi.class;
+ convType = Ipv4PrefixBinaryAfi.VALUE;
} else if (addr instanceof org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf
.lisp.address.types.rev151105.lisp.address.address.Ipv6Prefix) {
convAddr = convertToBinary((org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf
.lisp.address.types.rev151105.lisp.address.address.Ipv6Prefix) addr);
- convType = Ipv6PrefixBinaryAfi.class;
+ convType = Ipv6PrefixBinaryAfi.VALUE;
} else if (addr instanceof Ipv4) {
convAddr = convertToBinary((Ipv4) addr);
- convType = Ipv4BinaryAfi.class;
+ convType = Ipv4BinaryAfi.VALUE;
} else if (addr instanceof Ipv6) {
convAddr = convertToBinary((Ipv6) addr);
- convType = Ipv6BinaryAfi.class;
+ convType = Ipv6BinaryAfi.VALUE;
+ } else {
+ convAddr = null;
+ convType = null;
}
- return new ImmutablePair<Class<? extends LispAddressFamily>, Address>(convType, convAddr);
+ return new ImmutablePair<>(convType, convAddr);
}
public static Eid convertToBinary(Eid eid) {
- Pair<Class<? extends LispAddressFamily>, Address> converted = convertToBinary(eid.getAddress());
+ Pair<LispAddressFamily, Address> converted = convertToBinary(eid.getAddress());
if (converted.getRight() == null) {
return eid;
}
}
public static Rloc convertToBinary(Rloc rloc) {
- Pair<Class<? extends LispAddressFamily>, Address> converted = convertToBinary(rloc.getAddress());
+ Pair<LispAddressFamily, Address> converted = convertToBinary(rloc.getAddress());
if (converted.getRight() == null) {
return rloc;
}
.build();
}
- private static Pair<Class<? extends LispAddressFamily>, Address> convertFromBinary(Address addr) {
- Address convAddr = null;
- Class<? extends LispAddressFamily> convType = null;
+ private static Pair<LispAddressFamily, Address> convertFromBinary(Address addr) {
+ final Address convAddr;
+ final LispAddressFamily convType;
if (addr instanceof Ipv4PrefixBinary) {
convAddr = convertFromBinary((Ipv4PrefixBinary) addr);
- convType = Ipv4PrefixAfi.class;
+ convType = Ipv4PrefixAfi.VALUE;
} else if (addr instanceof Ipv6PrefixBinary) {
convAddr = convertFromBinary((Ipv6PrefixBinary) addr);
- convType = Ipv6PrefixAfi.class;
+ convType = Ipv6PrefixAfi.VALUE;
} else if (addr instanceof Ipv4Binary) {
convAddr = convertFromBinary((Ipv4Binary) addr);
- convType = Ipv4Afi.class;
+ convType = Ipv4Afi.VALUE;
} else if (addr instanceof Ipv6Binary) {
convAddr = convertFromBinary((Ipv6Binary) addr);
- convType = Ipv6Afi.class;
+ convType = Ipv6Afi.VALUE;
+ } else {
+ convAddr = null;
+ convType = null;
}
- return new ImmutablePair<Class<? extends LispAddressFamily>, Address>(convType, convAddr);
+ return new ImmutablePair<>(convType, convAddr);
}
public static Eid convertFromBinary(Eid eid) {
- Pair<Class<? extends LispAddressFamily>, Address> converted = convertFromBinary(eid.getAddress());
+ Pair<LispAddressFamily, Address> converted = convertFromBinary(eid.getAddress());
if (converted.getRight() == null) {
return eid;
}
}
public static Rloc convertFromBinary(Rloc rloc) {
- Pair<Class<? extends LispAddressFamily>, Address> converted = convertFromBinary(rloc.getAddress());
+ Pair<LispAddressFamily, Address> converted = convertFromBinary(rloc.getAddress());
if (converted.getRight() == null) {
return rloc;
}
package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105;
-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.IpPrefixBuilder;
+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.yang.types.rev130715.MacAddress;
private static SimpleAddress tryIpAddress(String defaultValue) {
try {
- SimpleAddress address = new SimpleAddress(IpAddressBuilder.getDefaultInstance(defaultValue));
+ SimpleAddress address = new SimpleAddress(IetfInetUtil.ipAddressFor(defaultValue));
return address;
} catch (IllegalArgumentException e) {
return null;
private static SimpleAddress tryIpPrefix(String defaultValue) {
try {
- SimpleAddress address = new SimpleAddress(IpPrefixBuilder.getDefaultInstance(defaultValue));
+ SimpleAddress address = new SimpleAddress(IetfInetUtil.ipPrefixFor(defaultValue));
return address;
} catch (IllegalArgumentException e) {
return null;
assertEquals("{" + IPV4_STRING + "," + IPV6_STRING + "}", LispAddressStringifier.getString(LISP_AFI_LIST));
}
- private String getStringFromAppData(final ApplicationData appData) {
+ private static String getStringFromAppData(final ApplicationData appData) {
StringBuilder sb = new StringBuilder();
final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
.address.application.data.ApplicationData applicationData = appData.getApplicationData();
private static final Mac MAC = new MacBuilder().setMac(MAC_ADDRESS_TEST).build();
private static final Eid MAC_ADDRESS_EID = new EidBuilder()
.setAddress(MAC)
- .setAddressType(MacAfi.class)
+ .setAddressType(MacAfi.VALUE)
.setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
private static final String IPV4_ADDRESS_VALUE_TEST = "192.168.1.1";
.setIpv4Prefix(IPV4_ADDRESS_PREFIX_TEST).build();
private static final Eid IPV4_ADDRESS_PREFIX_BINARY_EID_1 = new EidBuilder()
.setAddress(IPV4_ADDRESS_PREFIX_BINARY_1)
- .setAddressType(Ipv4PrefixBinaryAfi.class)
+ .setAddressType(Ipv4PrefixBinaryAfi.VALUE)
.setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
private static final Eid IPV4_ADDRESS_PREFIX_BINARY_EID_2 = new EidBuilder()
.setAddress(IPV4_ADDRESS_PREFIX_BINARY_2)
- .setAddressType(Ipv4PrefixBinaryAfi.class)
+ .setAddressType(Ipv4PrefixBinaryAfi.VALUE)
.setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
private static final Eid IPV4_ADDRESS_BINARY_EID = new EidBuilder()
.setAddress(IPV4_BINARY)
- .setAddressType(Ipv4BinaryAfi.class)
+ .setAddressType(Ipv4BinaryAfi.VALUE)
.setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
private static final Eid IPV4_EID = new EidBuilder()
.setAddress(IPV4)
- .setAddressType(Ipv4Afi.class)
+ .setAddressType(Ipv4Afi.VALUE)
.setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
private static final Eid IPV4_PREFIX_EID = new EidBuilder()
.setAddress(IPV4_PREFIX)
- .setAddressType(Ipv4PrefixAfi.class)
+ .setAddressType(Ipv4PrefixAfi.VALUE)
.setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
private static final Rloc IPV4_RLOC = new RlocBuilder()
.setAddress(IPV4)
- .setAddressType(Ipv4Afi.class).build();
+ .setAddressType(Ipv4Afi.VALUE).build();
private static final Rloc IPV4_BINARY_RLOC = new RlocBuilder()
.setAddress(IPV4_BINARY)
- .setAddressType(Ipv4BinaryAfi.class).build();
+ .setAddressType(Ipv4BinaryAfi.VALUE).build();
private static final byte[] IPV6_ADDRESS_BYTES_A_TEST = new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16};
.setIpv6MaskLength(fromJava(MASK_OK_DEFAULT_IPV6_TEST)).build();
private static final Eid IPV6_ADDRESS_PREFIX_BINARY_EID_1 = new EidBuilder()
.setAddress(IPV6_ADDRESS_PREFIX_BINARY_1)
- .setAddressType(Ipv6PrefixBinaryAfi.class)
+ .setAddressType(Ipv6PrefixBinaryAfi.VALUE)
.setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
private static final Eid IPV6_ADDRESS_PREFIX_BINARY_EID_2 = new EidBuilder()
.setAddress(IPV6_ADDRESS_PREFIX_BINARY_2)
- .setAddressType(Ipv6PrefixBinaryAfi.class)
+ .setAddressType(Ipv6PrefixBinaryAfi.VALUE)
.setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
private static final Eid IPV6_ADDRESS_BINARY_EID = new EidBuilder()
.setAddress(IPV6_BINARY)
- .setAddressType(Ipv6BinaryAfi.class)
+ .setAddressType(Ipv6BinaryAfi.VALUE)
.setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
private static final Eid IPV6_EID = new EidBuilder()
.setAddress(IPV6)
- .setAddressType(Ipv6BinaryAfi.class)
+ .setAddressType(Ipv6BinaryAfi.VALUE)
.setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
private static final Short SERVICE_INDEX_TEST = 45;
*/
@Test
public void addressFromSimpleAddressTest_asAnyIpAddress() {
- final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress(
- SIMPLE_ADDRESS_IPV4_TEST);
- assertEquals(Ipv4BinaryAfi.class, addressClass);
+ assertEquals(Ipv4BinaryAfi.VALUE, LispAddressUtil.addressTypeFromSimpleAddress(SIMPLE_ADDRESS_IPV4_TEST));
final Address address = LispAddressUtil.addressFromSimpleAddress(SIMPLE_ADDRESS_IPV4_TEST);
assertTrue(address instanceof Ipv4Binary);
public void addressFromSimpleAddressTest_asIpPrefix() {
final SimpleAddress simpleAddress = new SimpleAddress(new IpPrefix(new Ipv4Prefix(
IPV4_ADDRESS_PREFIX_VALUE_TEST)));
- final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress(
- simpleAddress);
- assertEquals(Ipv4PrefixAfi.class, addressClass);
+ assertEquals(Ipv4PrefixAfi.VALUE, LispAddressUtil.addressTypeFromSimpleAddress(simpleAddress));
final Address address = LispAddressUtil.addressFromSimpleAddress(simpleAddress);
assertTrue(address instanceof org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address
@Test
public void addressFromSimpleAddressTest_asMacAddress() {
final SimpleAddress simpleAddress = new SimpleAddress(new MacAddress(MAC_ADDRESS_VALUE_TEST));
- final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress(
- simpleAddress);
- assertEquals(MacAfi.class, addressClass);
+ assertEquals(MacAfi.VALUE, LispAddressUtil.addressTypeFromSimpleAddress(simpleAddress));
final Address address = LispAddressUtil.addressFromSimpleAddress(simpleAddress);
assertTrue(address instanceof Mac);
@Test
public void addressFromSimpleAddressTest_asAddress() {
final SimpleAddress simpleAddress = SimpleAddressBuilder.getDefaultInstance("abcd");
- final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress(
- simpleAddress);
- assertEquals(DistinguishedNameAfi.class, addressClass);
+ assertEquals(DistinguishedNameAfi.VALUE, LispAddressUtil.addressTypeFromSimpleAddress(simpleAddress));
final Address address = LispAddressUtil.addressFromSimpleAddress(simpleAddress);
assertTrue(address instanceof DistinguishedName);
@Test
public void addressFromSimpleAddressTest_asNumber() {
final SimpleAddress simpleAddress = new SimpleAddress(new AsNumber(fromJava(NUMBER_TEST)));
- final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress(
- simpleAddress);
- assertEquals(AsNumberAfi.class, addressClass);
+ assertEquals(AsNumberAfi.VALUE, LispAddressUtil.addressTypeFromSimpleAddress(simpleAddress));
final Address address = LispAddressUtil.addressFromSimpleAddress(simpleAddress);
assertTrue(address instanceof org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address
@Test
public void binaryAddressFromInet_ipv4() throws UnknownHostException {
final InetAddress ipv4InetAddress = Inet4Address.getByAddress(IPV4_ADDRESS_BYTES_A_TEST);
- Class<? extends LispAddressFamily> addressClass = LispAddressUtil.binaryAddressTypeFromInet(ipv4InetAddress);
- assertEquals(Ipv4BinaryAfi.class, addressClass);
+ assertEquals(Ipv4BinaryAfi.VALUE, LispAddressUtil.binaryAddressTypeFromInet(ipv4InetAddress));
final Address address = LispAddressUtil.binaryAddressFromInet(ipv4InetAddress);
assertTrue(address instanceof Ipv4Binary);
@Test
public void binaryAddressFromInet_ipv6() throws UnknownHostException {
final InetAddress ipv6InetAddress = Inet6Address.getByAddress(IPV6_ADDRESS_BYTES_A_TEST);
- Class<? extends LispAddressFamily> addressClass = LispAddressUtil.binaryAddressTypeFromInet(ipv6InetAddress);
- assertEquals(Ipv6BinaryAfi.class, addressClass);
+ assertEquals(Ipv6BinaryAfi.VALUE, LispAddressUtil.binaryAddressTypeFromInet(ipv6InetAddress));
final Address address = LispAddressUtil.binaryAddressFromInet(ipv6InetAddress);
assertTrue(address instanceof Ipv6Binary);
@Test
public void addressFromIpAddress_ipv4() {
final IpAddress ipv4Address = new IpAddress(IPV4_ADDRESS_TEST);
- final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromIpAddress(ipv4Address);
- assertEquals(Ipv4Afi.class, addressClass);
+ assertEquals(Ipv4Afi.VALUE, LispAddressUtil.addressTypeFromIpAddress(ipv4Address));
final Address address = LispAddressUtil.addressFromIpAddress(ipv4Address);
assertTrue(address instanceof Ipv4);
@Test
public void addressFromIpAddress_ipv6() {
final IpAddress ipv6Address = new IpAddress(new Ipv6Address(IPV6_ADDRESS_VALUE_TEST));
- final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromIpAddress(ipv6Address);
- assertEquals(Ipv6Afi.class, addressClass);
+ assertEquals(Ipv6Afi.VALUE, LispAddressUtil.addressTypeFromIpAddress(ipv6Address));
final Address address = LispAddressUtil.addressFromIpAddress(ipv6Address);
assertTrue(address instanceof Ipv6);
*/
@Test
public void addressFromIpAddress_null() {
- final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromIpAddress(null);
- assertNull(addressClass);
-
- final Address address = LispAddressUtil.addressFromIpAddress(null);
- assertNull(address);
+ assertNull(LispAddressUtil.addressTypeFromIpAddress(null));
+ assertNull(LispAddressUtil.addressFromIpAddress(null));
}
/**
@Test
public void binaryAddressFromIpAddress_Ipv4Binary() {
final IpAddress ipv4Address = new IpAddress(new Ipv4Address(IPV4_ADDRESS_VALUE_TEST));
- final Class<? extends LispAddressFamily> addressClass = LispAddressUtil
- .binaryAddressTypeFromIpAddress(ipv4Address);
- assertEquals(Ipv4BinaryAfi.class, addressClass);
-
- final Address address = LispAddressUtil.binaryAddressFromIpAddress(ipv4Address);
- assertEquals(IPV4_BINARY, address);
+ assertEquals(Ipv4BinaryAfi.VALUE, LispAddressUtil.binaryAddressTypeFromIpAddress(ipv4Address));
+ assertEquals(IPV4_BINARY, LispAddressUtil.binaryAddressFromIpAddress(ipv4Address));
}
/**
@Test
public void binaryAddressFromIpAddress_Ipv6Binary() {
final IpAddress ipv6Address = new IpAddress(new Ipv6Address(IPV6_ADDRESS_VALUE_TEST));
- final Class<? extends LispAddressFamily> addressClass = LispAddressUtil
- .binaryAddressTypeFromIpAddress(ipv6Address);
- assertEquals(Ipv6BinaryAfi.class, addressClass);
-
- final Address address = LispAddressUtil.binaryAddressFromIpAddress(ipv6Address);
- assertEquals(IPV6_BINARY, address);
+ assertEquals(Ipv6BinaryAfi.VALUE, LispAddressUtil.binaryAddressTypeFromIpAddress(ipv6Address));
+ assertEquals(IPV6_BINARY, LispAddressUtil.binaryAddressFromIpAddress(ipv6Address));
}
/**
*/
@Test
public void binaryAddressFromIpAddress_null() {
- final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.binaryAddressTypeFromIpAddress(null);
- assertNull(addressClass);
-
- final Address address = LispAddressUtil.binaryAddressFromIpAddress(null);
- assertNull(address);
+ assertNull(LispAddressUtil.binaryAddressTypeFromIpAddress(null));
+ assertNull(LispAddressUtil.binaryAddressFromIpAddress(null));
}
/**
@Test
public void addressFromIpPrefix_ipv4() {
IpPrefix ipv4Prefix = new IpPrefix(new Ipv4Prefix(IPV4_ADDRESS_PREFIX_VALUE_TEST));
- final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromIpPrefix(ipv4Prefix);
- assertEquals(Ipv4PrefixAfi.class, addressClass);
+ assertEquals(Ipv4PrefixAfi.VALUE, LispAddressUtil.addressTypeFromIpPrefix(ipv4Prefix));
final Address address = LispAddressUtil.addressFromIpPrefix(ipv4Prefix);
assertTrue(address instanceof org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address
@Test
public void addressFromIpPrefix_ipv6() {
IpPrefix ipv6Address = new IpPrefix(new Ipv6Prefix(IPV6_ADDRESS_PREFIX_VALUE_TEST));
- final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromIpPrefix(ipv6Address);
- assertEquals(Ipv6PrefixAfi.class, addressClass);
+ assertEquals(Ipv6PrefixAfi.VALUE, LispAddressUtil.addressTypeFromIpPrefix(ipv6Address));
final Address address = LispAddressUtil.addressFromIpPrefix(ipv6Address);
assertTrue(address instanceof org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address
*/
@Test
public void addressFromIpPrefix_null() {
- final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromIpPrefix(null);
- assertNull(addressClass);
-
- final Address address = LispAddressUtil.addressFromIpPrefix(null);
- assertNull(address);
+ assertNull(LispAddressUtil.addressTypeFromIpPrefix(null));
+ assertNull(LispAddressUtil.addressFromIpPrefix(null));
}
/**
public void toRloc() throws UnknownHostException {
InetAddress ipv4AddressInet = Inet4Address.getByAddress(IPV4_ADDRESS_BYTES_A_TEST);
final Rloc rlocFromInetAddress = LispAddressUtil.toRloc(ipv4AddressInet);
- assertEquals(Ipv4BinaryAfi.class, rlocFromInetAddress.getAddressType());
+ assertEquals(Ipv4BinaryAfi.VALUE, rlocFromInetAddress.getAddressType());
assertEquals(IPV4_ADDRESS_BINARY_TEST, ((Ipv4Binary) rlocFromInetAddress.getAddress()).getIpv4Binary());
final Rloc rlocFromIpv4Address = LispAddressUtil.toRloc(IPV4_ADDRESS_TEST);
- assertEquals(Ipv4Afi.class, rlocFromIpv4Address.getAddressType());
+ assertEquals(Ipv4Afi.VALUE, rlocFromIpv4Address.getAddressType());
assertEquals(IPV4_ADDRESS_VALUE_TEST, ((Ipv4) rlocFromIpv4Address.getAddress()).getIpv4().getValue());
final Rloc rlocFromIpv6Address = LispAddressUtil.toRloc(IPV6_ADDRESS_TEST);
- assertEquals(Ipv6Afi.class, rlocFromIpv6Address.getAddressType());
+ assertEquals(Ipv6Afi.VALUE, rlocFromIpv6Address.getAddressType());
assertEquals(IPV6_ADDRESS_VALUE_TEST, ((Ipv6) rlocFromIpv6Address.getAddress()).getIpv6().getValue());
final Rloc rlocFromSimpleAddress = LispAddressUtil.toRloc(SIMPLE_ADDRESS_IPV4_TEST);
- assertEquals(Ipv4BinaryAfi.class, rlocFromSimpleAddress.getAddressType());
+ assertEquals(Ipv4BinaryAfi.VALUE, rlocFromSimpleAddress.getAddressType());
assertEquals(IPV4_ADDRESS_BINARY_TEST, ((Ipv4Binary) rlocFromSimpleAddress.getAddress()).getIpv4Binary());
}
@Test
public void asIpvRloc() {
final Rloc rlocFromIpV4 = LispAddressUtil.asIpv4Rloc(IPV4_ADDRESS_VALUE_TEST);
- assertEquals(Ipv4BinaryAfi.class, rlocFromIpV4.getAddressType());
+ assertEquals(Ipv4BinaryAfi.VALUE, rlocFromIpV4.getAddressType());
assertEquals(IPV4_ADDRESS_BINARY_TEST, ((Ipv4Binary) rlocFromIpV4.getAddress()).getIpv4Binary());
final Rloc rlocFromIpV6 = LispAddressUtil.asIpv6Rloc(IPV6_ADDRESS_VALUE_TEST);
- assertEquals(Ipv6BinaryAfi.class, rlocFromIpV6.getAddressType());
+ assertEquals(Ipv6BinaryAfi.VALUE, rlocFromIpV6.getAddressType());
assertEquals(IPV6_ADDRESS_BINARY_TEST, ((Ipv6Binary) rlocFromIpV6.getAddress()).getIpv6Binary());
}
final Inet6Address inet6Address = (Inet6Address) Inet6Address.getByName(IPV6_ADDRESS_VALUE_TEST);
Eid eidFromIpv6Prefix = LispAddressUtil.toEid(IPV6_ADDRESS_PREFIX_TEST, INSTANCE_ID_TYPE_TEST);
- verifyToEidWithIpv6Prefix(eidFromIpv6Prefix, true, MASK_OK_TEST, Ipv6PrefixAfi.class);
+ verifyToEidWithIpv6Prefix(eidFromIpv6Prefix, true, MASK_OK_TEST, Ipv6PrefixAfi.VALUE);
eidFromIpv6Prefix = LispAddressUtil.asIpv6PrefixEid(IPV6_ADDRESS_PREFIX_VALUE_TEST);
- verifyToEidWithIpv6Prefix(eidFromIpv6Prefix, false, MASK_OK_TEST, Ipv6PrefixAfi.class);
+ verifyToEidWithIpv6Prefix(eidFromIpv6Prefix, false, MASK_OK_TEST, Ipv6PrefixAfi.VALUE);
eidFromIpv6Prefix = LispAddressUtil.asIpv6PrefixEid(IPV6_ADDRESS_PREFIX_BINARY_EID_1, inet6Address,
MASK_OK_DEFAULT_IPV6_TEST);
- verifyToEidWithIpv6Prefix(eidFromIpv6Prefix, true, MASK_OK_DEFAULT_IPV6_TEST, Ipv6PrefixAfi.class);
+ verifyToEidWithIpv6Prefix(eidFromIpv6Prefix, true, MASK_OK_DEFAULT_IPV6_TEST, Ipv6PrefixAfi.VALUE);
eidFromIpv6Prefix = LispAddressUtil.asIpv6PrefixEid(IPV6_ADDRESS_TEST, INSTANCE_ID_TYPE_TEST);
- verifyToEidWithIpv6Prefix(eidFromIpv6Prefix, true, MASK_OK_DEFAULT_IPV6_TEST, Ipv6PrefixAfi.class);
+ verifyToEidWithIpv6Prefix(eidFromIpv6Prefix, true, MASK_OK_DEFAULT_IPV6_TEST, Ipv6PrefixAfi.VALUE);
}
/**
final Inet4Address inet4Address = (Inet4Address) Inet4Address.getByName(IPV4_ADDRESS_VALUE_TEST);
Eid eidFromIpv4Prefix = LispAddressUtil.toEid(IPV4_ADDRESS_PREFIX_TEST, INSTANCE_ID_TYPE_TEST);
- verifyToEidWithIpv4Prefix(eidFromIpv4Prefix, true, MASK_OK_TEST, Ipv4PrefixAfi.class);
+ verifyToEidWithIpv4Prefix(eidFromIpv4Prefix, true, MASK_OK_TEST, Ipv4PrefixAfi.VALUE);
eidFromIpv4Prefix = LispAddressUtil.asIpv4PrefixEid(IPV4_ADDRESS_PREFIX_VALUE_TEST);
- verifyToEidWithIpv4Prefix(eidFromIpv4Prefix, false, MASK_OK_TEST, Ipv4PrefixAfi.class);
+ verifyToEidWithIpv4Prefix(eidFromIpv4Prefix, false, MASK_OK_TEST, Ipv4PrefixAfi.VALUE);
eidFromIpv4Prefix = LispAddressUtil.asIpv4PrefixEid(IPV4_ADDRESS_PREFIX_BINARY_EID_1, inet4Address,
MASK_OK_DEFAULT_IPV4_TEST);
- verifyToEidWithIpv4Prefix(eidFromIpv4Prefix, true, MASK_OK_DEFAULT_IPV4_TEST, Ipv4PrefixAfi.class);
+ verifyToEidWithIpv4Prefix(eidFromIpv4Prefix, true, MASK_OK_DEFAULT_IPV4_TEST, Ipv4PrefixAfi.VALUE);
eidFromIpv4Prefix = LispAddressUtil.asIpv4PrefixEid(IPV4_ADDRESS_TEST, INSTANCE_ID_TYPE_TEST);
- verifyToEidWithIpv4Prefix(eidFromIpv4Prefix, true, MASK_OK_DEFAULT_IPV4_TEST, Ipv4PrefixAfi.class);
+ verifyToEidWithIpv4Prefix(eidFromIpv4Prefix, true, MASK_OK_DEFAULT_IPV4_TEST, Ipv4PrefixAfi.VALUE);
}
/**
@Test
public void toEid_ipv4PrefixBinary() {
Eid eidFromIpv4PrefixBinary = LispAddressUtil.toEid(IPV4_ADDRESS_PREFIX_BINARY_1, INSTANCE_ID_TYPE_TEST);
- verifyToEidWithIpv4PrefixBinary(eidFromIpv4PrefixBinary, true, MASK_OK_TEST, Ipv4PrefixBinaryAfi.class);
+ verifyToEidWithIpv4PrefixBinary(eidFromIpv4PrefixBinary, true, MASK_OK_TEST, Ipv4PrefixBinaryAfi.VALUE);
eidFromIpv4PrefixBinary = LispAddressUtil.asIpv4PrefixBinaryEid(IPV4_ADDRESS_PREFIX_VALUE_TEST);
- verifyToEidWithIpv4PrefixBinary(eidFromIpv4PrefixBinary, false, MASK_OK_TEST, Ipv4PrefixBinaryAfi.class);
+ verifyToEidWithIpv4PrefixBinary(eidFromIpv4PrefixBinary, false, MASK_OK_TEST, Ipv4PrefixBinaryAfi.VALUE);
eidFromIpv4PrefixBinary = LispAddressUtil.asIpv4PrefixBinaryEid(IPV4_ADDRESS_PREFIX_VALUE_TEST,
INSTANCE_ID_TYPE_TEST);
- verifyToEidWithIpv4PrefixBinary(eidFromIpv4PrefixBinary, true, MASK_OK_TEST, Ipv4PrefixBinaryAfi.class);
+ verifyToEidWithIpv4PrefixBinary(eidFromIpv4PrefixBinary, true, MASK_OK_TEST, Ipv4PrefixBinaryAfi.VALUE);
eidFromIpv4PrefixBinary = LispAddressUtil.asIpv4PrefixBinaryEid(IPV4_ADDRESS_PREFIX_BINARY_EID_1,
IPV4_ADDRESS_BYTES_A_TEST, MASK_OK_TEST);
- verifyToEidWithIpv4PrefixBinary(eidFromIpv4PrefixBinary, true, MASK_OK_TEST, Ipv4PrefixBinaryAfi.class);
+ verifyToEidWithIpv4PrefixBinary(eidFromIpv4PrefixBinary, true, MASK_OK_TEST, Ipv4PrefixBinaryAfi.VALUE);
}
/**
@Test
public void toEid_ipv6PrefixBinary() {
Eid eidFromIpv6PrefixBinary = LispAddressUtil.toEid(IPV6_ADDRESS_PREFIX_BINARY_1, INSTANCE_ID_TYPE_TEST);
- verifyToEidWithIpv6PrefixBinary(eidFromIpv6PrefixBinary, true, MASK_OK_TEST, Ipv6PrefixBinaryAfi.class);
+ verifyToEidWithIpv6PrefixBinary(eidFromIpv6PrefixBinary, true, MASK_OK_TEST, Ipv6PrefixBinaryAfi.VALUE);
eidFromIpv6PrefixBinary = LispAddressUtil.asIpv6PrefixBinaryEid(IPV6_ADDRESS_PREFIX_VALUE_TEST);
- verifyToEidWithIpv6PrefixBinary(eidFromIpv6PrefixBinary, false, MASK_OK_TEST, Ipv6PrefixBinaryAfi.class);
+ verifyToEidWithIpv6PrefixBinary(eidFromIpv6PrefixBinary, false, MASK_OK_TEST, Ipv6PrefixBinaryAfi.VALUE);
eidFromIpv6PrefixBinary = LispAddressUtil.asIpv6PrefixBinaryEid(IPV6_ADDRESS_PREFIX_VALUE_TEST,
INSTANCE_ID_TYPE_TEST);
- verifyToEidWithIpv6PrefixBinary(eidFromIpv6PrefixBinary, true, MASK_OK_TEST, Ipv6PrefixBinaryAfi.class);
+ verifyToEidWithIpv6PrefixBinary(eidFromIpv6PrefixBinary, true, MASK_OK_TEST, Ipv6PrefixBinaryAfi.VALUE);
eidFromIpv6PrefixBinary = LispAddressUtil.asIpv6PrefixBinaryEid(IPV6_ADDRESS_PREFIX_BINARY_EID_1,
IPV6_ADDRESS_BYTES_A_TEST, MASK_OK_TEST);
- verifyToEidWithIpv6PrefixBinary(eidFromIpv6PrefixBinary, true, MASK_OK_TEST, Ipv6PrefixBinaryAfi.class);
+ verifyToEidWithIpv6PrefixBinary(eidFromIpv6PrefixBinary, true, MASK_OK_TEST, Ipv6PrefixBinaryAfi.VALUE);
}
/**
@Test
public void toEid_ipPrefix() {
final Eid eidFromIpPrefix = LispAddressUtil.toEid(IP_ADDRESS_PREFIX_WITH_IPV4_TEST, INSTANCE_ID_TYPE_TEST);
- verifyToEidWithIpv4Prefix(eidFromIpPrefix, true, MASK_OK_TEST, Ipv4PrefixAfi.class);
+ verifyToEidWithIpv4Prefix(eidFromIpPrefix, true, MASK_OK_TEST, Ipv4PrefixAfi.VALUE);
}
/**
verifyToEidWithMacAddress(eidFromDistinguishedName, true);
}
- private void verifyToEidWithIpv6Prefix(final Eid eidFromIpv6Prefix, final boolean isVniChecked, short
- expectedMask, final Class<? extends org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp
- .address.types.rev151105.LispAddressFamily> addressType) {
+ private static void verifyToEidWithIpv6Prefix(final Eid eidFromIpv6Prefix, final boolean isVniChecked,
+ final short expectedMask, final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address
+ .types.rev151105.LispAddressFamily addressType) {
assertEquals(addressType, eidFromIpv6Prefix.getAddressType());
if (isVniChecked) {
assertEquals(INSTANCE_ID_TYPE_TEST, eidFromIpv6Prefix.getVirtualNetworkId());
.getAddress()).getIpv6Prefix().getValue());
}
- private void verifyToEidWithIpv6PrefixBinary(final Eid eidFromIpv6PrefixBinary, final boolean isVniChecked, short
- expectedMask, final Class<? extends org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp
- .address.types.rev151105.LispAddressFamily> addressType) {
+ private static void verifyToEidWithIpv6PrefixBinary(final Eid eidFromIpv6PrefixBinary, final boolean isVniChecked,
+ final short expectedMask, final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address
+ .types.rev151105.LispAddressFamily addressType) {
assertEquals(addressType, eidFromIpv6PrefixBinary.getAddressType());
if (isVniChecked) {
assertEquals(INSTANCE_ID_TYPE_TEST, eidFromIpv6PrefixBinary.getVirtualNetworkId());
((Ipv6PrefixBinary) eidFromIpv6PrefixBinary.getAddress()).getIpv6MaskLength().toJava());
}
- private void verifyToEidWithIpv4(final Eid eidFromIpv4, final boolean isVniChecked) {
- assertEquals(Ipv4Afi.class, eidFromIpv4.getAddressType());
+ private static void verifyToEidWithIpv4(final Eid eidFromIpv4, final boolean isVniChecked) {
+ assertEquals(Ipv4Afi.VALUE, eidFromIpv4.getAddressType());
if (isVniChecked) {
assertEquals(INSTANCE_ID_TYPE_TEST, eidFromIpv4.getVirtualNetworkId());
}
assertEquals(IPV4_ADDRESS_VALUE_TEST, ((Ipv4) eidFromIpv4.getAddress()).getIpv4().getValue());
}
- private void verifyToRlocWithIpv4(final Rloc rlocFromIpv4, final boolean isVniChecked) {
- assertEquals(Ipv4Afi.class, rlocFromIpv4.getAddressType());
+ private static void verifyToRlocWithIpv4(final Rloc rlocFromIpv4, final boolean isVniChecked) {
+ assertEquals(Ipv4Afi.VALUE, rlocFromIpv4.getAddressType());
if (isVniChecked) {
assertEquals(INSTANCE_ID_TYPE_TEST, rlocFromIpv4.getVirtualNetworkId());
}
assertEquals(IPV4_ADDRESS_VALUE_TEST, ((Ipv4) rlocFromIpv4.getAddress()).getIpv4().getValue());
}
- private void verifyToEidWithIpv4Binary(final Eid eidFromIpv4, final boolean isVniChecked) {
- assertEquals(Ipv4BinaryAfi.class, eidFromIpv4.getAddressType());
+ private static void verifyToEidWithIpv4Binary(final Eid eidFromIpv4, final boolean isVniChecked) {
+ assertEquals(Ipv4BinaryAfi.VALUE, eidFromIpv4.getAddressType());
if (isVniChecked) {
assertEquals(INSTANCE_ID_TYPE_TEST, eidFromIpv4.getVirtualNetworkId());
}
((Ipv4Binary) eidFromIpv4.getAddress()).getIpv4Binary().getValue());
}
- private void verifyToRlocWithIpv4Binary(final Rloc rlocFromIpv4, final boolean isVniChecked) {
- assertEquals(Ipv4BinaryAfi.class, rlocFromIpv4.getAddressType());
+ private static void verifyToRlocWithIpv4Binary(final Rloc rlocFromIpv4, final boolean isVniChecked) {
+ assertEquals(Ipv4BinaryAfi.VALUE, rlocFromIpv4.getAddressType());
if (isVniChecked) {
assertEquals(INSTANCE_ID_TYPE_TEST, rlocFromIpv4.getVirtualNetworkId());
}
((Ipv4Binary) rlocFromIpv4.getAddress()).getIpv4Binary().getValue());
}
- private void verifyToEidWithIpv6(final Eid eidFromIpv6, final boolean isVniChecked) {
- assertEquals(Ipv6Afi.class, eidFromIpv6.getAddressType());
+ private static void verifyToEidWithIpv6(final Eid eidFromIpv6, final boolean isVniChecked) {
+ assertEquals(Ipv6Afi.VALUE, eidFromIpv6.getAddressType());
if (isVniChecked) {
assertEquals(INSTANCE_ID_TYPE_TEST, eidFromIpv6.getVirtualNetworkId());
}
assertEquals(IPV6_ADDRESS_VALUE_TEST, ((Ipv6) eidFromIpv6.getAddress()).getIpv6().getValue());
}
- private void verifyToEidWithIpv4Prefix(final Eid eidFromIpv4Prefix, final boolean isVniChecked, short
- expectedMask, Class<? extends org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address
- .types.rev151105.LispAddressFamily> addressType) {
+ private static void verifyToEidWithIpv4Prefix(final Eid eidFromIpv4Prefix, final boolean isVniChecked,
+ final short expectedMask, final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address
+ .types.rev151105.LispAddressFamily addressType) {
assertEquals(addressType, eidFromIpv4Prefix.getAddressType());
if (isVniChecked) {
assertEquals(INSTANCE_ID_TYPE_TEST, eidFromIpv4Prefix.getVirtualNetworkId());
.getIpv4Prefix().getValue());
}
- private void verifyToEidWithIpv4PrefixBinary(final Eid eidFromIpv4PrefixBinary, final boolean isVniChecked, short
- expectedMask, Class<? extends org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address
- .types.rev151105.LispAddressFamily> addressType) {
+ private static void verifyToEidWithIpv4PrefixBinary(final Eid eidFromIpv4PrefixBinary, final boolean isVniChecked,
+ final short expectedMask, final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address
+ .types.rev151105.LispAddressFamily addressType) {
assertEquals(addressType, eidFromIpv4PrefixBinary.getAddressType());
if (isVniChecked) {
assertEquals(INSTANCE_ID_TYPE_TEST, eidFromIpv4PrefixBinary.getVirtualNetworkId());
((Ipv4PrefixBinary) eidFromIpv4PrefixBinary.getAddress()).getIpv4MaskLength().toJava());
}
- private void verifyToEidWithIpv6Binary(final Eid eidFromIpv6, final boolean isVniChecked) {
- assertEquals(Ipv6BinaryAfi.class, eidFromIpv6.getAddressType());
+ private static void verifyToEidWithIpv6Binary(final Eid eidFromIpv6, final boolean isVniChecked) {
+ assertEquals(Ipv6BinaryAfi.VALUE, eidFromIpv6.getAddressType());
if (isVniChecked) {
assertEquals(INSTANCE_ID_TYPE_TEST, eidFromIpv6.getVirtualNetworkId());
}
((Ipv6Binary) eidFromIpv6.getAddress()).getIpv6Binary().getValue());
}
- private void verifyToEidWithDistinguishedName(final Eid eidFromDistinguishedName, final boolean isVniChecked) {
- assertEquals(DistinguishedNameAfi.class, eidFromDistinguishedName.getAddressType());
+ private static void verifyToEidWithDistinguishedName(final Eid eidFromDistinguishedName,
+ final boolean isVniChecked) {
+ assertEquals(DistinguishedNameAfi.VALUE, eidFromDistinguishedName.getAddressType());
if (isVniChecked) {
assertEquals(INSTANCE_ID_TYPE_TEST, eidFromDistinguishedName.getVirtualNetworkId());
}
.getDistinguishedName());
}
- private void verifyToEidWithMacAddress(final Eid eidFromMac, final boolean isVniChecked) {
- assertEquals(MacAfi.class, eidFromMac.getAddressType());
+ private static void verifyToEidWithMacAddress(final Eid eidFromMac, final boolean isVniChecked) {
+ assertEquals(MacAfi.VALUE, eidFromMac.getAddressType());
if (isVniChecked) {
assertEquals(INSTANCE_ID_TYPE_TEST, eidFromMac.getVirtualNetworkId());
}
verifyKeyValueAddress(rloc, SIMPLE_ADDRESS_DISTINGUISHED_TEST);
}
- private void verifyKeyValueAddress(final LispAddress lispAddress, final SimpleAddress keyValue) {
- assertEquals(KeyValueAddressLcaf.class, lispAddress.getAddressType());
+ private static void verifyKeyValueAddress(final LispAddress lispAddress, final SimpleAddress keyValue) {
+ assertEquals(KeyValueAddressLcaf.VALUE, lispAddress.getAddressType());
assertNull(lispAddress.getVirtualNetworkId());
final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.key.value.address.KeyValueAddress keyValueAddress =
final Eid srcDstEid = LispAddressUtil.asSrcDstEid(IPV4_ADDRESS_VALUE_TEST,
IPV6_ADDRESS_VALUE_TEST, MASK_OK_TEST, MASK_OK_TEST, INSTANCE_ID_TYPE_VALUE_SHORT_TEST);
assertNotNull(srcDstEid);
- assertEquals(SourceDestKeyLcaf.class, srcDstEid.getAddressType());
+ assertEquals(SourceDestKeyLcaf.VALUE, srcDstEid.getAddressType());
final SourceDestKey sourceDestKey = ((org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns
.yang.ietf.lisp.address.types.rev151105.lisp.address.address.SourceDestKey) srcDstEid.getAddress())
.getSourceDestKey();
SIMPLE_ADDRESS_IPV4_PREFIX_TEST).setDest(SIMPLE_ADDRESS_IPV6_PREFIX_TEST).build();
final Eid srcDstEid = LispAddressUtil.asSrcDstEid(expectedSourceDestKey, INSTANCE_ID_TYPE_TEST);
assertNotNull(srcDstEid);
- assertEquals(SourceDestKeyLcaf.class, srcDstEid.getAddressType());
+ assertEquals(SourceDestKeyLcaf.VALUE, srcDstEid.getAddressType());
final SourceDestKey testedSourceDestKey = ((org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns
.yang.ietf.lisp.address.types.rev151105.lisp.address.address.SourceDestKey) srcDstEid.getAddress())
.getSourceDestKey();
IP_ADDRESS_IPV6_TEST);
final Rloc rloc = LispAddressUtil.asTeLcafRloc(ipAddresses);
assertNotNull(rloc);
- assertEquals(ExplicitLocatorPathLcaf.class, rloc.getAddressType());
+ assertEquals(ExplicitLocatorPathLcaf.VALUE, rloc.getAddressType());
final List<Hop> hops = ((ExplicitLocatorPath) rloc.getAddress()).getExplicitLocatorPath().getHop();
assertEquals(hops.size(), ipAddresses.size());
}
}
- private boolean isIpAddressInHops(final IpAddress ipAddress, final List<Hop> hops) {
+ private static boolean isIpAddressInHops(final IpAddress ipAddress, final List<Hop> hops) {
for (Hop hop : hops) {
if (hop.getAddress().getIpAddress().equals(ipAddress)) {
return true;
}
}
- private boolean isRlocInLocatorRecords(final List<LocatorRecord> locatorRecords, final Rloc rloc) {
+ private static boolean isRlocInLocatorRecords(final List<LocatorRecord> locatorRecords, final Rloc rloc) {
for (LocatorRecord locatorRecord : locatorRecords) {
if (locatorRecord.getRloc().equals(rloc)) {
return true;
@Test
public void getNoAddressEid() {
final Eid noAddressEid = LispAddressUtil.getNoAddressEid();
- assertEquals(NoAddressAfi.class, noAddressEid.getAddressType());
+ assertEquals(NoAddressAfi.VALUE, noAddressEid.getAddressType());
assertNull(noAddressEid.getVirtualNetworkId());
assertEquals(((NoAddress) noAddressEid.getAddress()).getNoAddress(), Empty.value());
}
final Eid ipv6 = new EidBuilder().setAddress(IPV6).build();
Eid resultIpv4PrefixBinary = LispAddressUtil.convertToBinary(ipv4PrefixEid);
- verifyToEidWithIpv4PrefixBinary(resultIpv4PrefixBinary, false, MASK_OK_TEST, Ipv4PrefixBinaryAfi.class);
+ verifyToEidWithIpv4PrefixBinary(resultIpv4PrefixBinary, false, MASK_OK_TEST, Ipv4PrefixBinaryAfi.VALUE);
Eid resultIpv6PrefixBinary = LispAddressUtil.convertToBinary(ipv6PrefixEid);
- verifyToEidWithIpv6PrefixBinary(resultIpv6PrefixBinary , false, MASK_OK_TEST, Ipv6PrefixBinaryAfi.class);
+ verifyToEidWithIpv6PrefixBinary(resultIpv6PrefixBinary , false, MASK_OK_TEST, Ipv6PrefixBinaryAfi.VALUE);
Eid resultIpv4Binary = LispAddressUtil.convertToBinary(ipv4);
verifyToEidWithIpv4Binary(resultIpv4Binary , false);
@Test
public void convertFromBinaryTest_eid() {
final Eid resultIpv4Prefix = LispAddressUtil.convertFromBinary(IPV4_ADDRESS_PREFIX_BINARY_EID_1);
- verifyToEidWithIpv4Prefix(resultIpv4Prefix, false, MASK_OK_TEST, Ipv4PrefixAfi.class);
+ verifyToEidWithIpv4Prefix(resultIpv4Prefix, false, MASK_OK_TEST, Ipv4PrefixAfi.VALUE);
final Eid resultIpv6Prefix = LispAddressUtil.convertFromBinary(IPV6_ADDRESS_PREFIX_BINARY_EID_1);
- verifyToEidWithIpv6Prefix(resultIpv6Prefix, false, MASK_OK_TEST, Ipv6PrefixAfi.class);
+ verifyToEidWithIpv6Prefix(resultIpv6Prefix, false, MASK_OK_TEST, Ipv6PrefixAfi.VALUE);
final Eid resultIpv4 = LispAddressUtil.convertFromBinary(IPV4_ADDRESS_BINARY_EID);
verifyToEidWithIpv4(resultIpv4, false);
SERVICE_INDEX_TEST);
assertNotNull(eid);
- assertEquals(ServicePathLcaf.class, eid.getAddressType());
+ assertEquals(ServicePathLcaf.VALUE, eid.getAddressType());
assertEquals(INSTANCE_ID_TYPE_TEST, eid.getVirtualNetworkId());
ServicePath servicePath = ((org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp
.address.types.rev151105.lisp.address.address.ServicePath) eid.getAddress()).getServicePath();
public void asEid() {
final Eid eid = LispAddressUtil.asEid(SIMPLE_ADDRESS_IPV4_TEST, INSTANCE_ID_TYPE_TEST);
assertNotNull(eid);
- assertEquals(Ipv4BinaryAfi.class, eid.getAddressType());
+ assertEquals(Ipv4BinaryAfi.VALUE, eid.getAddressType());
final Ipv4Binary address = (Ipv4Binary) eid.getAddress();
assertArrayEquals(InetAddresses.forString(SIMPLE_ADDRESS_IPV4_TEST.getIpAddress().getIpv4Address().getValue())
.getAddress(), address.getIpv4Binary().getValue());
final Eid expectedResult = new EidBuilder()
.setAddress(new Ipv4PrefixBuilder().setIpv4Prefix(IPV4_PREFIX_SOURCE).build())
.setVirtualNetworkId(INSTANCE_ID)
- .setAddressType(Ipv4PrefixAfi.class).build();
+ .setAddressType(Ipv4PrefixAfi.VALUE).build();
assertEquals(expectedResult, SourceDestKeyHelper.getSrc(EID_SOURCE_DEST_KEY));
}
final Eid expectedResult = new EidBuilder()
.setAddress(new Ipv4PrefixBuilder().setIpv4Prefix(IPV4_PREFIX_DEST).build())
.setVirtualNetworkId(INSTANCE_ID)
- .setAddressType(Ipv4PrefixAfi.class).build();
+ .setAddressType(Ipv4PrefixAfi.VALUE).build();
assertEquals(expectedResult, SourceDestKeyHelper.getDst(EID_SOURCE_DEST_KEY));
}
final Eid expectedResult = new EidBuilder()
.setAddress(IPV4_SOURCE_PREFIX_BINARY)
.setVirtualNetworkId(INSTANCE_ID)
- .setAddressType(Ipv4PrefixBinaryAfi.class).build();
+ .setAddressType(Ipv4PrefixBinaryAfi.VALUE).build();
assertEquals(expectedResult, SourceDestKeyHelper.getSrcBinary(EID_SOURCE_DEST_KEY));
}
final Eid expectedResult = new EidBuilder()
.setAddress(IPV4_DEST_PREFIX_BINARY)
.setVirtualNetworkId(INSTANCE_ID)
- .setAddressType(Ipv4PrefixBinaryAfi.class).build();
+ .setAddressType(Ipv4PrefixBinaryAfi.VALUE).build();
assertEquals(expectedResult, SourceDestKeyHelper.getDstBinary(EID_SOURCE_DEST_KEY));
}
mrBuilder.getEidItem().add(new EidItemBuilder().setEid(LispAddressUtil.getNoAddressEid()).setEidItemId("bar")
.build());
-
- assertEquals(NoAddressAfi.class, mrBuilder.getEidItem().get(0).getEid().getAddressType());
+ assertEquals(NoAddressAfi.VALUE, mrBuilder.getEidItem().get(0).getEid().getAddressType());
}
@Test
+ "00 01 AA BB CC DD " // IPv4
+ "00 02 11 22 33 44 11 22 33 44 11 22 33 44 11 22 33 44")); // IPv6
- assertEquals(AfiListLcaf.class, address.getAddressType());
+ assertEquals(AfiListLcaf.VALUE, address.getAddressType());
AfiList afiList = (AfiList) address.getAddress();
Set<SimpleAddress> addressList = afiList.getAfiList().getAddressList();
Rloc address = LispAddressSerializer.getInstance().deserializeRloc(hexToByteBuffer("40 03 00 00 "
+ "01 00 00 00 "));
- assertEquals(AfiListLcaf.class, address.getAddressType());
+ assertEquals(AfiListLcaf.VALUE, address.getAddressType());
AfiList afiList = (AfiList) address.getAddress();
assertEquals(Set.of(), afiList.getAfiList().getAddressList());
@Test(expected = LispSerializationException.class)
public void deserialize__ShorterBuffer() throws Exception {
- LispAddressSerializer.getInstance().deserializeRloc(hexToByteBuffer("40 03 00 00 "
- + "01 00 00 18 "
- + "00 01 AA BB CC DD " // IPv4
- + "00 02 11 22 33 44 11 22 33 44 11 22 33 44"));
+ LispAddressSerializer.getInstance().deserializeRloc(hexToByteBuffer("""
+ 40 03 00 00 \
+ 01 00 00 18 \
+ 00 01 AA BB CC DD \
+ 00 02 11 22 33 44 11 22 33 44 11 22 33 44"""));
}
@Test(expected = LispSerializationException.class)
SimpleAddressBuilder.getDefaultInstance("1122:3344:1122:3344:1122:3344:1122:3344")));
RlocBuilder rb = new RlocBuilder();
- rb.setAddressType(AfiListLcaf.class);
+ rb.setAddressType(AfiListLcaf.VALUE);
rb.setVirtualNetworkId(null);
rb.setAddress(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.AfiListBuilder()
listBuilder.setAddressList(Set.of());
RlocBuilder rb = new RlocBuilder();
- rb.setAddressType(AfiListLcaf.class);
+ rb.setAddressType(AfiListLcaf.VALUE);
rb.setVirtualNetworkId(null);
rb.setAddress(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.AfiListBuilder()
+ "FF DD FF DE " // remote port range
+ "00 01 11 22 33 44"), null); // AFI=1, IP=0x11223344
- assertEquals(ApplicationDataLcaf.class, address.getAddressType());
+ assertEquals(ApplicationDataLcaf.VALUE, address.getAddressType());
ApplicationData appAddress = (ApplicationData) address.getAddress();
assertEquals("17.34.51.68", appAddress.getApplicationData().getAddress().stringValue());
@Test(expected = LispSerializationException.class)
public void deserialize__ShorterBuffer() throws Exception {
- LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("40 03 00 00 "
- + "04 20 00 0A "
- + "AA BB "), null);
+ LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("""
+ 40 03 00 00 \
+ 04 20 00 0A \
+ AA BB \
+ """), null);
}
@Test(expected = LispSerializationException.class)
public void deserialize__UnknownLCAFType() throws Exception {
- LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("40 03 00 00 "
- + "AA 20 00 12 " // Type AA is unknown
- + "AA BB CC DD " // IPTOS & protocol
- + "A6 A1 A6 A2 " // local port range
- + "FF DD FF DE " // remote port range
- + "00 01 11 22 33 44"), null); // AFI=1, IP=0x11223344
+ LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("""
+ 40 03 00 00 \
+ AA 20 00 12 \
+ AA BB CC DD \
+ A6 A1 A6 A2 \
+ FF DD FF DE \
+ 00 01 11 22 33 44"""), null); // AFI=1, IP=0x11223344
}
@Test
.setAddress(new SimpleAddress(new IpAddress(new Ipv4Address("17.34.51.68"))));
EidBuilder eb = new EidBuilder();
- eb.setAddressType(ApplicationDataLcaf.class);
+ eb.setAddressType(ApplicationDataLcaf.VALUE);
eb.setVirtualNetworkId(null);
eb.setAddress(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.ApplicationDataBuilder()
public void deserialize__EmptyString() throws Exception {
Eid address = LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("00 11 00"), null);
- assertEquals(DistinguishedNameAfi.class, address.getAddressType());
+ assertEquals(DistinguishedNameAfi.VALUE, address.getAddressType());
DistinguishedName distinguishedName = (DistinguishedName) address.getAddress();
assertEquals("", distinguishedName.getDistinguishedName().getValue());
-
}
@Test
Eid address = LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("00 11 64 61 76 69 64 00"),
null);
- assertEquals(DistinguishedNameAfi.class, address.getAddressType());
+ assertEquals(DistinguishedNameAfi.VALUE, address.getAddressType());
DistinguishedName distinguishedName = (DistinguishedName) address.getAddress();
assertEquals("david", distinguishedName.getDistinguishedName().getValue());
+ "01 00 00 8 "
+ "00 11 64 61 76 69 64 00"), null);
- assertEquals(AfiListLcaf.class, address.getAddressType());
+ assertEquals(AfiListLcaf.VALUE, address.getAddressType());
assertEquals("david", ((AfiList) address.getAddress()).getAfiList().getAddressList().iterator().next()
.getDistinguishedNameType().getValue());
@Test(expected = LispSerializationException.class)
public void deserialize__ShorterBuffer() throws Exception {
- LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("40 03 00 00 "
- + "01 00 00 10 "
- + "00 11 64 61 76 69 64 00"), null);
+ LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("""
+ 40 03 00 00 \
+ 01 00 00 10 \
+ 00 11 64 61 76 69 64 00"""), null);
}
@Test(expected = LispSerializationException.class)
@Test
public void serialize__Simple() throws Exception {
EidBuilder eb = new EidBuilder();
- eb.setAddressType(DistinguishedNameAfi.class);
+ eb.setAddressType(DistinguishedNameAfi.VALUE);
eb.setVirtualNetworkId(null);
eb.setAddress(new DistinguishedNameBuilder().setDistinguishedName(new DistinguishedNameType("david")).build());
ByteBuffer expectedBuf = hexToByteBuffer("00 11 64 61 76 69 64 00");
ArrayAssert.assertEquals(expectedBuf.array(), buf.array());
}
-
}
+ "00 00 00 01 AA BB CC DD " // IPv4
+ "00 00 00 01 11 22 33 44")); // IPv4
- assertEquals(ExplicitLocatorPathLcaf.class, address.getAddressType());
+ assertEquals(ExplicitLocatorPathLcaf.VALUE, address.getAddressType());
ExplicitLocatorPath elp = (ExplicitLocatorPath) address.getAddress();
List<Hop> hops = elp.getExplicitLocatorPath().getHop();
+ "00 05 00 01 AA BB CC DD " // IPv4
+ "00 02 00 01 11 22 33 44")); // IPv4
- assertEquals(ExplicitLocatorPathLcaf.class, address.getAddressType());
+ assertEquals(ExplicitLocatorPathLcaf.VALUE, address.getAddressType());
ExplicitLocatorPath elp = (ExplicitLocatorPath) address.getAddress();
List<Hop> hops = elp.getExplicitLocatorPath().getHop();
Rloc address = LispAddressSerializer.getInstance().deserializeRloc(hexToByteBuffer("40 03 00 00 "
+ "0A 00 00 00 "));
- assertEquals(ExplicitLocatorPathLcaf.class, address.getAddressType());
+ assertEquals(ExplicitLocatorPathLcaf.VALUE, address.getAddressType());
ExplicitLocatorPath elp = (ExplicitLocatorPath) address.getAddress();
List<Hop> hops = elp.getExplicitLocatorPath().getHop();
@Test(expected = LispSerializationException.class)
public void deserialize__ShorterBuffer() throws Exception {
- LispAddressSerializer.getInstance().deserializeRloc(hexToByteBuffer("40 03 00 00 "
- + "0A 00 00 18 "
- + "00 01 AA BB CC DD " // IPv4
- + "00 02 11 22 33 44 11 22 33 44 11 22 33 44"));
+ LispAddressSerializer.getInstance().deserializeRloc(hexToByteBuffer("""
+ 40 03 00 00 \
+ 0A 00 00 18 \
+ 00 01 AA BB CC DD \
+ 00 02 11 22 33 44 11 22 33 44 11 22 33 44"""));
}
@Test(expected = LispSerializationException.class)
elpb.setHop(hops);
RlocBuilder rb = new RlocBuilder();
- rb.setAddressType(ExplicitLocatorPathLcaf.class);
+ rb.setAddressType(ExplicitLocatorPathLcaf.VALUE);
rb.setVirtualNetworkId(null);
rb.setAddress(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.ExplicitLocatorPathBuilder()
@Test
public void serialize__NoAddresses() throws Exception {
RlocBuilder rb = new RlocBuilder();
- rb.setAddressType(ExplicitLocatorPathLcaf.class);
+ rb.setAddressType(ExplicitLocatorPathLcaf.VALUE);
rb.setVirtualNetworkId(null);
rb.setAddress(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.ExplicitLocatorPathBuilder().build());
+ "00 01 11 22 33 44"), // AFI=1, IP=0x11223344
new LispAddressSerializerContext(null));
- assertEquals(Ipv4BinaryAfi.class, address.getAddressType());
+ assertEquals(Ipv4BinaryAfi.VALUE, address.getAddressType());
Ipv4Binary ipv4 = (Ipv4Binary) address.getAddress();
assertArrayEquals(new byte[] {0x11, 0x22, 0x33, 0x44}, ipv4.getIpv4Binary().getValue());
@Test(expected = LispSerializationException.class)
public void deserialize__ShorterBuffer() throws Exception {
- LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("40 03 00 00 "
- + "02 20 00 0A "
- + "AA BB "),
- new LispAddressSerializerContext(null));
+ LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("""
+ 40 03 00 00 \
+ 02 20 00 0A \
+ AA BB \
+ """), new LispAddressSerializerContext(null));
}
@Test(expected = LispSerializationException.class)
public void deserialize__UnknownLCAFType() throws Exception {
- LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("40 03 00 00 "
- + "AA 20 00 0A " // Type AA is unknown
- + "00 BB CC DD " // instance ID
- + "00 01 11 22 33 44"), // AFI=1, IP=0x11223344
- new LispAddressSerializerContext(null));
+ LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("""
+ 40 03 00 00 \
+ AA 20 00 0A \
+ 00 BB CC DD \
+ 00 01 11 22 33 44"""), // AFI=1, IP=0x11223344
+ new LispAddressSerializerContext(null));
}
@Test(expected = LispSerializationException.class)
public void deserialize__LongInstanceID() throws Exception {
- LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("40 03 00 00 "
- + "02 20 00 0A " // Type AA is unknown
- + "AA BB CC DD " // instance ID
- + "00 01 11 22 33 44"), // AFI=1, IP=0x11223344
- new LispAddressSerializerContext(null));
+ LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("""
+ 40 03 00 00 \
+ 02 20 00 0A \
+ AA BB CC DD \
+ 00 01 11 22 33 44"""), // AFI=1, IP=0x11223344
+ new LispAddressSerializerContext(null));
}
@Test
* 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.lispflowmapping.serializer.address;
import static org.junit.Assert.assertArrayEquals;
public void constructor__Name() throws Exception {
Rloc rloc = LispAddressUtil.asIpv6Rloc("0:0:0:0:0:0:0:0");
- assertEquals(Ipv6BinaryAfi.class, rloc.getAddressType());
+ assertEquals(Ipv6BinaryAfi.VALUE, rloc.getAddressType());
assertEquals(18, LispAddressSerializer.getInstance().getAddressSize(rloc));
assertArrayEquals(new byte[] {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
((Ipv6Binary) rloc.getAddress()).getIpv6Binary().getValue());
public void constructor__Buffer() throws Exception {
Rloc rloc = LispAddressUtil.asIpv6Rloc("0:0:0:0:0:0:0:1");
- assertEquals(Ipv6BinaryAfi.class, rloc.getAddressType());
+ assertEquals(Ipv6BinaryAfi.VALUE, rloc.getAddressType());
assertEquals(18, LispAddressSerializer.getInstance().getAddressSize(rloc));
assertArrayEquals(new byte[] {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
((Ipv6Binary) rloc.getAddress()).getIpv6Binary().getValue());
+ "00 01 11 22 33 44 " // AFI=1, IP=0x11223344
+ "00 01 22 33 44 55"), null); // AFI=1, IP=0x22334455
- assertEquals(KeyValueAddressLcaf.class, address.getAddressType());
+ assertEquals(KeyValueAddressLcaf.VALUE, address.getAddressType());
KeyValueAddress srcDestAddress = (KeyValueAddress) address.getAddress();
assertEquals("17.34.51.68", srcDestAddress.getKeyValueAddress().getKey().stringValue());
@Test(expected = LispSerializationException.class)
public void deserialize__ShorterBuffer() throws Exception {
- LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("40 03 00 00 "
- + "02 20 00 0A "
- + "AA BB "), null);
+ LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("""
+ 40 03 00 00 \
+ 02 20 00 0A \
+ AA BB \
+ """), null);
}
@Test(expected = LispSerializationException.class)
public void deserialize__UnknownLCAFType() throws Exception {
- LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("40 03 00 00 "
- + "AA 20 00 0A " // Type AA is unknown
- + "00 01 11 22 33 44 " // AFI=1, IP=0x11223344
- + "00 01 22 33 44 55"), null); // AFI=1, IP=0x22334455
+ LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("""
+ 40 03 00 00 \
+ AA 20 00 0A \
+ 00 01 11 22 33 44 \
+ 00 01 22 33 44 55"""), null); // AFI=1, IP=0x22334455
}
@Test
addressBuilder.setValue(new SimpleAddress(new IpAddress(new Ipv4Address("34.51.68.85"))));
EidBuilder eb = new EidBuilder();
- eb.setAddressType(KeyValueAddressLcaf.class);
+ eb.setAddressType(KeyValueAddressLcaf.VALUE);
eb.setVirtualNetworkId(null);
eb.setAddress(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.KeyValueAddressBuilder()
+ "11 00 00 04 "
+ "AA BB CC FF"),
new LispAddressSerializerContext(null));
- assertEquals(ServicePathLcaf.class, address.getAddressType());
+ assertEquals(ServicePathLcaf.VALUE, address.getAddressType());
ServicePath sp = (ServicePath) address.getAddress();
assertEquals(ByteUtil.getPartialInt(new byte[] { (byte) 0xAA, (byte) 0xBB, (byte) 0xCC }),
+ "00 01 22 33 44 55"), // AFI=1, IP=0x22334455
new LispAddressSerializerContext(null));
- assertEquals(SourceDestKeyLcaf.class, address.getAddressType());
+ assertEquals(SourceDestKeyLcaf.VALUE, address.getAddressType());
SourceDestKey srcDestAddress = (SourceDestKey) address.getAddress();
assertEquals((byte) 0x10, MaskUtil.getMaskForAddress(srcDestAddress.getSourceDestKey().getSource()));
@Test(expected = LispSerializationException.class)
public void deserialize__ShorterBuffer() throws Exception {
- LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("40 03 00 00 "
- + "02 20 00 0A "
- + "AA BB "), new LispAddressSerializerContext(null));
+ LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("""
+ 40 03 00 00 \
+ 02 20 00 0A \
+ AA BB \
+ """), new LispAddressSerializerContext(null));
}
@Test(expected = LispSerializationException.class)
public void deserialize__UnknownLCAFType() throws Exception {
- LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("40 03 00 00 "
- + "AA 20 00 0A " // Type AA is unknown
- + "00 00 CC DD " // reserved + masks
- + "00 01 11 22 33 44 " // AFI=1, IP=0x11223344
- + "00 01 22 33 44 55"), // AFI=1, IP=0x22334455
+ LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("""
+ 40 03 00 00 \
+ AA 20 00 0A \
+ 00 00 CC DD \
+ 00 01 11 22 33 44 \
+ 00 01 22 33 44 55"""), // AFI=1, IP=0x22334455
new LispAddressSerializerContext(null));
}
addressBuilder.setDest(new SimpleAddress(new IpPrefix(new Ipv4Prefix("34.51.68.85/16"))));
EidBuilder eb = new EidBuilder();
- eb.setAddressType(SourceDestKeyLcaf.class);
+ eb.setAddressType(SourceDestKeyLcaf.VALUE);
eb.setVirtualNetworkId(null);
eb.setAddress(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
.lisp.address.address.SourceDestKeyBuilder()
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</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>
<type>pom</type>
<scope>import</scope>
</dependency>
assertEquals(LispAddressUtil.asIpv6PrefixBinaryEid("2610:d0:ffff:192:0:0:0:1/128"),
eidToLocatorRecord.getEid());
- assertEquals(Ipv6PrefixBinaryAfi.class, eidToLocatorRecord.getEid().getAddressType());
+ assertEquals(Ipv6PrefixBinaryAfi.VALUE, eidToLocatorRecord.getEid().getAddressType());
assertEquals(LispAddressUtil.asIpv4Rloc("10.0.58.156"), eidToLocatorRecord.getLocatorRecord().get(0).getRloc());
}
List<EidItem> eids = captor.getValue().getMapRequest().getEidItem();
assertEquals(1, eids.size());
Eid lispAddress = eids.get(0).getEid();
- assertEquals(Ipv4PrefixBinaryAfi.class, lispAddress.getAddressType());
+ assertEquals(Ipv4PrefixBinaryAfi.VALUE, lispAddress.getAddressType());
assertEquals(LispAddressUtil.asIpv4PrefixBinaryEid("1.2.3.4/32"), lispAddress);
assertEquals(0x3d8d2acd39c8d608L, captor.getValue().getMapRequest().getNonce().longValue());
}
ArgumentCaptor<RequestMapping> captor = ArgumentCaptor.forClass(RequestMapping.class);
handleMapRequestAsByteArray(mapRequestPacket);
Mockito.verify(mockLispSouthboundPlugin).sendNotificationIfPossible(captor.capture());
- assertEquals(Ipv4BinaryAfi.class, captor.getValue().getMapRequest().getSourceEid().getEid().getAddressType());
+ assertEquals(Ipv4BinaryAfi.VALUE, captor.getValue().getMapRequest().getSourceEid().getEid().getAddressType());
}
private static MapRequestBuilder getDefaultMapRequestBuilder() {
final Rloc rloc = new RlocBuilder()
- .setAddressType(Ipv4BinaryAfi.class)
+ .setAddressType(Ipv4BinaryAfi.VALUE)
.setAddress(new Ipv4BinaryBuilder()
.setIpv4Binary(new Ipv4AddressBinary(new byte[]{127, 0, 0, 2})).build())
.build();
Code Review / lispflowmapping.git / commitdiff