From 9c7a8c27e7b02e64ca213577e95f3ef4cc5f2c30 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 11 Jul 2022 18:54:54 +0200 Subject: [PATCH] Bump upstreams for 2022.09 Chlorine Adopt the following versions: - odlparent-11.0.0 - infrautils-4.0.0 - yangtools-9.0.0 - mdsal-10.0.0 - controller-6.0.0 - aaa-0.16.0 - netconf-4.0.0 Change-Id: I8b300fc2dde4be772af7bb6cb5802bfba89dfd4a Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- commons/parent/pom.xml | 7 +- features/features-lispflowmapping/pom.xml | 2 +- .../odl-lispflowmapping-inmemorydb/pom.xml | 4 +- .../src/main/feature/feature.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 4 +- features/odl-lispflowmapping-models/pom.xml | 4 +- .../src/main/feature/feature.xml | 4 +- features/odl-lispflowmapping-msmr/pom.xml | 2 +- .../odl-lispflowmapping-southbound/pom.xml | 6 +- .../src/main/feature/feature.xml | 4 +- features/pom.xml | 2 +- integrationtest/pom.xml | 2 +- .../MappingServiceIntegrationTest.java | 34 +-- .../MappingServiceIntegrationTestUtil.java | 4 +- lispflowmapping-karaf/pom.xml | 2 +- mappingservice/api/pom.xml | 2 +- .../implementation/MappingSystem.java | 8 +- .../implementation/lisp/MapResolver.java | 24 +- .../implementation/MappingSystemTest.java | 4 +- .../implementation/lisp/MapResolverTest.java | 26 +- mappingservice/lisp-proto/pom.xml | 2 +- .../serializer/address/AfiListSerializer.java | 4 +- .../address/ApplicationDataSerializer.java | 6 +- .../address/DistinguishedNameSerializer.java | 6 +- .../ExplicitLocatorPathSerializer.java | 6 +- .../address/InstanceIdSerializer.java | 2 +- .../address/Ipv4BinarySerializer.java | 4 +- .../address/Ipv4PrefixBinarySerializer.java | 2 +- .../address/Ipv4PrefixSerializer.java | 2 +- .../serializer/address/Ipv4Serializer.java | 5 +- .../address/Ipv6BinarySerializer.java | 4 +- .../address/Ipv6PrefixBinarySerializer.java | 2 +- .../address/Ipv6PrefixSerializer.java | 2 +- .../serializer/address/Ipv6Serializer.java | 4 +- .../address/KeyValueAddressSerializer.java | 6 +- .../serializer/address/LcafSerializer.java | 9 +- .../address/LispAddressSerializer.java | 14 +- .../serializer/address/MacSerializer.java | 7 +- .../address/NoAddressSerializer.java | 4 +- .../address/ServicePathSerializer.java | 4 +- .../address/SimpleAddressSerializer.java | 2 +- .../address/SourceDestKeySerializer.java | 6 +- .../factory/LispAddressSerializerFactory.java | 48 ++-- .../lisp/util/AddressTypeMap.java | 60 ++--- .../lisp/util/LispAddressUtil.java | 202 +++++++-------- .../types/rev151105/SimpleAddressBuilder.java | 7 +- .../lisp/util/LispAddressStringifierTest.java | 2 +- .../lisp/util/LispAddressUtilTest.java | 230 ++++++++---------- .../lisp/util/SourceDestKeyHelperTest.java | 8 +- .../MapRequestSerializationTest.java | 3 +- .../address/AfiListSerializerTest.java | 17 +- .../ApplicationDataSerializerTest.java | 25 +- .../DistinguishedNameSerializerTest.java | 17 +- .../ExplicitLocatorPathSerializerTest.java | 19 +- .../address/InstanceIdSerializerTest.java | 33 +-- .../address/Ipv6SerializerTest.java | 5 +- .../KeyValueAddressSerializerTest.java | 21 +- .../serializer/address/ServicePathTest.java | 2 +- .../address/SourceDestKeySerializerTest.java | 23 +- mappingservice/pom.xml | 4 +- .../lisp/LispSouthboundHandlerTest.java | 6 +- .../lisp/LispXtrSouthboundHandlerTest.java | 2 +- 64 files changed, 485 insertions(+), 505 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index ce0e081da..6272507b7 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 10.0.2 + 11.0.0 diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index 5c1afb039..c978ed8d5 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -15,7 +15,7 @@ for plugin configuration etc. --> org.opendaylight.odlparent odlparent - 10.0.2 + 11.0.0 @@ -28,7 +28,6 @@ ODL :: lispflowmapping :: ${project.artifactId} - 3.0.5 1.0.0 0.5.0 1.16.0-SNAPSHOT @@ -46,7 +45,7 @@ org.opendaylight.mdsal mdsal-artifacts - 9.0.4 + 10.0.0 pom import @@ -68,7 +67,7 @@ org.opendaylight.controller controller-artifacts - 5.0.5 + 6.0.0 pom import diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml index fcd6cf4ec..f1eea9fdb 100644 --- a/features/features-lispflowmapping/pom.xml +++ b/features/features-lispflowmapping/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent feature-repo-parent - 10.0.2 + 11.0.0 diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml index 9daa7655f..1ebb6e0d9 100644 --- a/features/odl-lispflowmapping-inmemorydb/pom.xml +++ b/features/odl-lispflowmapping-inmemorydb/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 10.0.2 + 11.0.0 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller controller-artifacts - 5.0.5 + 6.0.0 pom import diff --git a/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml b/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml index c1466b173..4df83ec11 100644 --- a/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml +++ b/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml @@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> - odl-mdsal-broker - odl-controller-blueprint + odl-mdsal-broker + odl-controller-blueprint diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml index 88a08cce4..152c3f3ac 100644 --- a/features/odl-lispflowmapping-mappingservice-shell/pom.xml +++ b/features/odl-lispflowmapping-mappingservice-shell/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 10.0.2 + 11.0.0 diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml index c4dce7605..3eecf588c 100644 --- a/features/odl-lispflowmapping-mappingservice/pom.xml +++ b/features/odl-lispflowmapping-mappingservice/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 10.0.2 + 11.0.0 @@ -28,7 +28,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf odl-restconf - 3.0.5 + 4.0.0 xml features diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml index 8b72be46c..942df2662 100644 --- a/features/odl-lispflowmapping-models/pom.xml +++ b/features/odl-lispflowmapping-models/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 10.0.2 + 11.0.0 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 9.0.4 + 10.0.0 pom import diff --git a/features/odl-lispflowmapping-models/src/main/feature/feature.xml b/features/odl-lispflowmapping-models/src/main/feature/feature.xml index 0a5c3c9f0..0c98d8b68 100644 --- a/features/odl-lispflowmapping-models/src/main/feature/feature.xml +++ b/features/odl-lispflowmapping-models/src/main/feature/feature.xml @@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> - odl-apache-commons-lang3 - odl-mdsal-model-rfc6991 + odl-apache-commons-lang3 + odl-mdsal-model-rfc6991 diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml index f52592cc3..fdfa103e4 100644 --- a/features/odl-lispflowmapping-msmr/pom.xml +++ b/features/odl-lispflowmapping-msmr/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 10.0.2 + 11.0.0 diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml index f99dd3576..0c1bb68e0 100644 --- a/features/odl-lispflowmapping-southbound/pom.xml +++ b/features/odl-lispflowmapping-southbound/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 10.0.2 + 11.0.0 @@ -28,14 +28,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf odl-restconf - 3.0.5 + 4.0.0 xml features org.opendaylight.controller odl-mdsal-broker - 5.0.5 + 6.0.0 xml features diff --git a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml index 729aae01d..e5272d230 100644 --- a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml +++ b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml @@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> - odl-netty-4 - odl-mdsal-broker + odl-netty-4 + odl-mdsal-broker diff --git a/features/pom.xml b/features/pom.xml index 238afead1..a7d4229a5 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 10.0.2 + 11.0.0 diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml index e65724383..e97c14675 100644 --- a/integrationtest/pom.xml +++ b/integrationtest/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller mdsal-it-parent - 5.0.5 + 6.0.0 diff --git a/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java b/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java index f78241564..a03edb0c9 100644 --- a/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java +++ b/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java @@ -1705,7 +1705,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { 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); @@ -2500,7 +2500,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { 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()); @@ -2508,7 +2508,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { 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(); @@ -2539,7 +2539,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { 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(); @@ -2554,14 +2554,14 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { // 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); } @@ -2577,7 +2577,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { 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(); @@ -2603,7 +2603,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { 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()); @@ -2612,7 +2612,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { Eid receivedAddress = reply.getMappingRecordItem().get(0).getMappingRecord().getEid(); - assertEquals(AfiListLcaf.class, receivedAddress.getAddressType()); + assertEquals(AfiListLcaf.VALUE, receivedAddress.getAddressType()); AfiList listAddrFromNetwork = (AfiList) receivedAddress.getAddress(); Iterator addrList = listAddrFromNetwork.getAfiList().getAddressList().iterator(); @@ -2632,7 +2632,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { 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()); @@ -2640,7 +2640,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { 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()); @@ -2664,14 +2664,14 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { 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) @@ -2715,7 +2715,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { 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()); @@ -2725,7 +2725,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { 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()); @@ -2887,7 +2887,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { 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() @@ -2941,7 +2941,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase { 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() diff --git a/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTestUtil.java b/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTestUtil.java index 1ccf05d47..e2da6222e 100644 --- a/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTestUtil.java +++ b/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTestUtil.java @@ -463,11 +463,11 @@ final class MappingServiceIntegrationTestUtil { 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; } diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml index 069eaf252..5d4d02117 100644 --- a/lispflowmapping-karaf/pom.xml +++ b/lispflowmapping-karaf/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent karaf4-parent - 10.0.2 + 11.0.0 diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml index 528ccfce1..f405bee67 100644 --- a/mappingservice/api/pom.xml +++ b/mappingservice/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.mdsal binding-parent - 9.0.4 + 10.0.0 diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingSystem.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingSystem.java index 47203289e..d28cdf1ee 100644 --- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingSystem.java +++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingSystem.java @@ -103,7 +103,7 @@ public class MappingSystem implements IMappingSystem { public MappingSystem(ILispDAO dao, boolean iterateMask, NotificationPublishService nps, boolean mappingMerge) { this.dao = dao; - this.notificationPublishService = nps; + notificationPublishService = nps; this.mappingMerge = mappingMerge; buildMapCaches(); @@ -113,7 +113,7 @@ public class MappingSystem implements IMappingSystem { } public void setDataStoreBackEnd(DataStoreBackEnd dataStoreBackEnd) { - this.dsbe = dataStoreBackEnd; + dsbe = dataStoreBackEnd; } @Override @@ -308,8 +308,8 @@ public class MappingSystem implements IMappingSystem { 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); diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java index 3928cb6cc..6bc2f336a 100644 --- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java +++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java @@ -10,6 +10,7 @@ package org.opendaylight.lispflowmapping.implementation.lisp; 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; @@ -28,6 +29,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.addres 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; @@ -57,6 +59,10 @@ import org.slf4j.LoggerFactory; public class MapResolver implements IMapResolverAsync { private static final Logger LOG = LoggerFactory.getLogger(MapResolver.class); + private static final ImmutableSet IPV4_AFIS = ImmutableSet.of(Ipv4Afi.VALUE, Ipv4BinaryAfi.VALUE, + Ipv4PrefixAfi.VALUE, Ipv4PrefixBinaryAfi.VALUE); + private static final ImmutableSet IPV6_AFIS = ImmutableSet.of(Ipv6Afi.VALUE, Ipv6BinaryAfi.VALUE, + Ipv6PrefixAfi.VALUE, Ipv6PrefixBinaryAfi.VALUE); private final IMappingService mapService; private boolean subscriptionService; @@ -68,7 +74,7 @@ public class MapResolver implements IMapResolverAsync { 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; @@ -138,16 +144,10 @@ public class MapResolver implements IMapResolverAsync { 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; @@ -200,8 +200,8 @@ public class MapResolver implements IMapResolverAsync { // 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); } @@ -355,7 +355,7 @@ public class MapResolver implements IMapResolverAsync { @Override public void setShouldAuthenticate(boolean shouldAuthenticate) { - this.authenticate = shouldAuthenticate; + authenticate = shouldAuthenticate; } @Override diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java index 867d8a874..f129a0e76 100644 --- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java +++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java @@ -621,7 +621,7 @@ public class MappingSystemTest { return new RlocBuilder() .setAddress(explicitLocatorPath) - .setAddressType(ExplicitLocatorPathLcaf.class).build(); + .setAddressType(ExplicitLocatorPathLcaf.VALUE).build(); } private static Rloc getIpPrefixTypeRloc() { @@ -631,6 +631,6 @@ public class MappingSystemTest { return new RlocBuilder() .setAddress(address) - .setAddressType(Ipv4PrefixAfi.class).build(); + .setAddressType(Ipv4PrefixAfi.VALUE).build(); } } diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolverTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolverTest.java index f912aef19..7d370d5f9 100644 --- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolverTest.java +++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolverTest.java @@ -226,8 +226,8 @@ public class MapResolverTest { // ---------------------- // with sourceRloc = null List itrRlocList = Lists.newArrayList( - newItrRloc(MacAfi.class, null), - newItrRloc(Ipv4BinaryAfi.class, IPV4_ADDRESS)); + newItrRloc(MacAfi.VALUE, null), + newItrRloc(Ipv4BinaryAfi.VALUE, IPV4_ADDRESS)); ArgumentCaptor captor = ArgumentCaptor.forClass(Subscriber.class); mapResolver.handleMapRequest(mapRequestBuilder.setSourceRloc(null).setItrRloc(itrRlocList).build()); @@ -238,8 +238,8 @@ public class MapResolverTest { // ---------------------- // 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) @@ -253,9 +253,9 @@ public class MapResolverTest { // ---------------------- // 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) @@ -269,9 +269,9 @@ public class MapResolverTest { // ---------------------- // 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) @@ -286,8 +286,8 @@ public class MapResolverTest { // 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) @@ -499,7 +499,7 @@ public class MapResolverTest { Mockito.verify(lispMappingServiceMock).handleMapReply(mapReplyBuilder.build()); } - private static ItrRloc newItrRloc(Class clazz, Address address) { + private static ItrRloc newItrRloc(LispAddressFamily clazz, Address address) { return new ItrRlocBuilder().setRloc(new RlocBuilder() .setAddress(address) .setAddressType(clazz).build()).build(); diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml index 0b4cd8eac..56a85a37c 100644 --- a/mappingservice/lisp-proto/pom.xml +++ b/mappingservice/lisp-proto/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 9.0.4 + 10.0.0 diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/AfiListSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/AfiListSerializer.java index 6bf628812..e7c24c09d 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/AfiListSerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/AfiListSerializer.java @@ -67,7 +67,7 @@ public final class AfiListSerializer extends LcafSerializer { @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(); @@ -76,7 +76,7 @@ public final class AfiListSerializer extends LcafSerializer { @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(); diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ApplicationDataSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ApplicationDataSerializer.java index d13285ba1..ccb198f40 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ApplicationDataSerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ApplicationDataSerializer.java @@ -86,7 +86,7 @@ public final class ApplicationDataSerializer extends LcafSerializer { @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(); @@ -96,13 +96,13 @@ public final class ApplicationDataSerializer extends LcafSerializer { 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); diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/DistinguishedNameSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/DistinguishedNameSerializer.java index 7c3cd04b7..40953f161 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/DistinguishedNameSerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/DistinguishedNameSerializer.java @@ -64,7 +64,7 @@ public final class DistinguishedNameSerializer extends LispAddressSerializer { @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(); @@ -73,7 +73,7 @@ public final class DistinguishedNameSerializer extends LispAddressSerializer { @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(); @@ -85,7 +85,7 @@ public final class DistinguishedNameSerializer extends LispAddressSerializer { 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) { diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ExplicitLocatorPathSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ExplicitLocatorPathSerializer.java index aa328131b..79ad03fca 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ExplicitLocatorPathSerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ExplicitLocatorPathSerializer.java @@ -83,7 +83,7 @@ public final class ExplicitLocatorPathSerializer extends LcafSerializer { @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(); @@ -93,13 +93,13 @@ public final class ExplicitLocatorPathSerializer extends LcafSerializer { 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 hops = new ArrayList<>(); short length = lcafLength; while (length > 0) { diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/InstanceIdSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/InstanceIdSerializer.java index e2dca6c9d..60e1b4f32 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/InstanceIdSerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/InstanceIdSerializer.java @@ -59,7 +59,7 @@ public final class InstanceIdSerializer extends LcafSerializer { 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()); } diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4BinarySerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4BinarySerializer.java index e76c91527..54609f558 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4BinarySerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4BinarySerializer.java @@ -79,7 +79,7 @@ public final class Ipv4BinarySerializer extends LispAddressSerializer { @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(); @@ -88,7 +88,7 @@ public final class Ipv4BinarySerializer extends LispAddressSerializer { @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(); diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixBinarySerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixBinarySerializer.java index acc5ddd2d..72c05ff18 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixBinarySerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixBinarySerializer.java @@ -86,7 +86,7 @@ public final class Ipv4PrefixBinarySerializer extends LispAddressSerializer { .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(); diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixSerializer.java index 7c9a9e64a..06a128120 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixSerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixSerializer.java @@ -78,7 +78,7 @@ public final class Ipv4PrefixSerializer extends LispAddressSerializer { @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(); diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4Serializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4Serializer.java index b60a1b2f3..f69216ac2 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4Serializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4Serializer.java @@ -82,7 +82,7 @@ public final class Ipv4Serializer extends LispAddressSerializer { @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(); @@ -91,7 +91,7 @@ public final class Ipv4Serializer extends LispAddressSerializer { @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(); @@ -111,5 +111,4 @@ public final class Ipv4Serializer extends LispAddressSerializer { protected interface Length { int IPV4 = 4; } - } diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6BinarySerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6BinarySerializer.java index 11650e60f..af75f8b03 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6BinarySerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6BinarySerializer.java @@ -75,7 +75,7 @@ public final class Ipv6BinarySerializer extends LispAddressSerializer { @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(); @@ -84,7 +84,7 @@ public final class Ipv6BinarySerializer extends LispAddressSerializer { @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(); diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixBinarySerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixBinarySerializer.java index 2cf8fddb5..7e027e34a 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixBinarySerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixBinarySerializer.java @@ -85,7 +85,7 @@ public final class Ipv6PrefixBinarySerializer extends LispAddressSerializer { .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(); diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixSerializer.java index 22fd3ba84..7fdee6707 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixSerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixSerializer.java @@ -83,7 +83,7 @@ public final class Ipv6PrefixSerializer extends LispAddressSerializer { @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(); diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6Serializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6Serializer.java index 77b3bd1ae..0c4bee3fc 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6Serializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6Serializer.java @@ -74,7 +74,7 @@ public final class Ipv6Serializer extends LispAddressSerializer { @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(); @@ -83,7 +83,7 @@ public final class Ipv6Serializer extends LispAddressSerializer { @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(); diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/KeyValueAddressSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/KeyValueAddressSerializer.java index 630049f82..ae8e5ab77 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/KeyValueAddressSerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/KeyValueAddressSerializer.java @@ -60,7 +60,7 @@ public final class KeyValueAddressSerializer extends LcafSerializer { @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(); @@ -70,13 +70,13 @@ public final class KeyValueAddressSerializer extends LcafSerializer { 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(); diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LcafSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LcafSerializer.java index 773b71b2d..3f548c9bf 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LcafSerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LcafSerializer.java @@ -41,6 +41,7 @@ public class LcafSerializer extends LispAddressSerializer { return Length.LCAF_HEADER; } + @Override protected short getLcafLength(LispAddress lispAddress) { throw new LispSerializationException("Unimplemented method"); } @@ -66,7 +67,7 @@ public class LcafSerializer extends LispAddressSerializer { - 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); @@ -78,7 +79,7 @@ public class LcafSerializer extends LispAddressSerializer { protected Eid deserializeEidData(ByteBuffer buffer, LispAddressSerializerContext ctx) { buffer.position(buffer.position() + Length.RES + Length.FLAGS); byte lcafType = (byte) ByteUtil.getUnsignedByte(buffer); - Class 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(); @@ -89,7 +90,7 @@ public class LcafSerializer extends LispAddressSerializer { } // 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); @@ -99,7 +100,7 @@ public class LcafSerializer extends LispAddressSerializer { protected Rloc deserializeRlocData(ByteBuffer buffer) { buffer.position(buffer.position() + Length.RES + Length.FLAGS); byte lcafType = (byte) ByteUtil.getUnsignedByte(buffer); - Class addressType = AddressTypeMap.getLcafType(lcafType); + LispAddressFamily addressType = AddressTypeMap.getLcafType(lcafType); byte res2 = buffer.get(); short length = buffer.getShort(); diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LispAddressSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LispAddressSerializer.java index 1f60503aa..c7d4125ad 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LispAddressSerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LispAddressSerializer.java @@ -92,8 +92,7 @@ public class LispAddressSerializer { } 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); } @@ -111,18 +110,17 @@ public class LispAddressSerializer { } 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); @@ -141,7 +139,7 @@ public class LispAddressSerializer { if ((afi == 1 || afi == 2) && ctx.getMaskLen() != LispAddressSerializerContext.MASK_LEN_MISSING) { afi *= -1; } - Class addressType = AddressTypeMap.getAddressType(afi); + LispAddressFamily addressType = AddressTypeMap.getAddressType(afi); LispAddressSerializer serializer = LispAddressSerializerFactory.getSerializer(addressType); if (serializer == null) { throw new LispSerializationException("Unknown AFI: " + afi); @@ -156,7 +154,7 @@ public class LispAddressSerializer { @SuppressWarnings("checkstyle:IllegalCatch") public Rloc deserializeRloc(ByteBuffer buffer) { short afi = buffer.getShort(); - Class addressType = AddressTypeMap.getAddressType(afi); + LispAddressFamily addressType = AddressTypeMap.getAddressType(afi); LispAddressSerializer serializer = LispAddressSerializerFactory.getSerializer(addressType); if (serializer == null) { throw new LispSerializationException("Unknown AFI: " + afi); diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/MacSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/MacSerializer.java index d66cfcce1..7f0bd3c07 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/MacSerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/MacSerializer.java @@ -62,7 +62,7 @@ public final class MacSerializer extends LispAddressSerializer { @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(); @@ -71,7 +71,7 @@ public final class MacSerializer extends LispAddressSerializer { @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(); @@ -82,7 +82,7 @@ public final class MacSerializer extends LispAddressSerializer { 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); @@ -91,5 +91,4 @@ public final class MacSerializer extends LispAddressSerializer { private interface Length { int MAC = 6; } - } diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/NoAddressSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/NoAddressSerializer.java index 6ee4fd911..ba950545d 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/NoAddressSerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/NoAddressSerializer.java @@ -45,7 +45,7 @@ public final class NoAddressSerializer extends LispAddressSerializer { @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(); @@ -54,7 +54,7 @@ public final class NoAddressSerializer extends LispAddressSerializer { @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(); diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ServicePathSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ServicePathSerializer.java index 7d933759f..5bd6341d0 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ServicePathSerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ServicePathSerializer.java @@ -67,13 +67,13 @@ public final class ServicePathSerializer extends LcafSerializer { @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); diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/SimpleAddressSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/SimpleAddressSerializer.java index 4f77e6300..eb25126b6 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/SimpleAddressSerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/SimpleAddressSerializer.java @@ -53,7 +53,7 @@ public class SimpleAddressSerializer { && ctx.getMaskLen() != LispAddressSerializerContext.MASK_LEN_MISSING) { afi *= -1; } - Class addressType = AddressTypeMap.getAddressType(afi); + LispAddressFamily addressType = AddressTypeMap.getAddressType(afi); LispAddressSerializer serializer = LispAddressSerializerFactory.getSerializer(addressType); if (serializer == null) { throw new LispSerializationException("Unknown AFI: " + afi); diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/SourceDestKeySerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/SourceDestKeySerializer.java index 68501690b..e51861b5b 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/SourceDestKeySerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/SourceDestKeySerializer.java @@ -79,7 +79,7 @@ public final class SourceDestKeySerializer extends LcafSerializer { @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(); @@ -89,13 +89,13 @@ public final class SourceDestKeySerializer extends LcafSerializer { 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(); diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/factory/LispAddressSerializerFactory.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/factory/LispAddressSerializerFactory.java index bb0fbd466..5b86fa1a8 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/factory/LispAddressSerializerFactory.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/factory/LispAddressSerializerFactory.java @@ -54,39 +54,39 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.typ * Factory for LispAddress (de)serializers. * * @author Lorand Jakab - * */ public final class LispAddressSerializerFactory { - private static Map, LispAddressSerializer> addressTypeToSerializerMap; + private static Map addressTypeToSerializerMap; - // Class should not be instantiated private LispAddressSerializerFactory() { + // Class should not be instantiated } private static void initializeMap() { - addressTypeToSerializerMap = new HashMap, 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 clazz) { + public static LispAddressSerializer getSerializer(LispAddressFamily clazz) { if (addressTypeToSerializerMap == null) { initializeMap(); } diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/AddressTypeMap.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/AddressTypeMap.java index d2fc7fe09..0f75075c4 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/AddressTypeMap.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/AddressTypeMap.java @@ -40,78 +40,78 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.typ * @author Lorand Jakab */ public final class AddressTypeMap { - private static Map> afiToAddressTypeMap; - private static Map> lcafToAddressTypeMap; + private static Map afiToAddressTypeMap; + private static Map lcafToAddressTypeMap; // Utility class, should not be instantiated private AddressTypeMap() { } private static void initializeAfiMap() { - afiToAddressTypeMap = new HashMap>(); - 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>(); - 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 getAddressType(short afi) { + public static LispAddressFamily getAddressType(short afi) { if (afiToAddressTypeMap == null) { initializeAfiMap(); } return afiToAddressTypeMap.get(afi); } - public static Class getLcafType(short lcafType) { + public static LispAddressFamily getLcafType(short lcafType) { if (lcafToAddressTypeMap == null) { initializeLcafMap(); } return lcafToAddressTypeMap.get(lcafType); } - public static Class 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; } diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java index 295d4b85f..f24b58965 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java @@ -105,17 +105,17 @@ public final class LispAddressUtil { private LispAddressUtil() { } - public static Class 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; } @@ -146,53 +146,53 @@ public final class LispAddressUtil { 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 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 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 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; } @@ -201,10 +201,10 @@ public final class LispAddressUtil { 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; @@ -215,22 +215,22 @@ public final class LispAddressUtil { 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 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; } @@ -239,10 +239,10 @@ public final class LispAddressUtil { 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; @@ -252,7 +252,7 @@ public final class LispAddressUtil { if (address == null) { return null; } else { - return (Address) new MacBuilder().setMac(address).build(); + return new MacBuilder().setMac(address).build(); } } @@ -260,7 +260,7 @@ public final class LispAddressUtil { if (address == null) { return null; } else { - return (Address) new ServicePathBuilder().setServicePath(address).build(); + return new ServicePathBuilder().setServicePath(address).build(); } } @@ -268,7 +268,7 @@ public final class LispAddressUtil { if (address == null) { return null; } else { - return (Address) new DistinguishedNameBuilder().setDistinguishedName(address).build(); + return new DistinguishedNameBuilder().setDistinguishedName(address).build(); } } @@ -276,7 +276,7 @@ public final class LispAddressUtil { if (address == null) { return null; } else { - return (Address) new AsNumberBuilder().setAsNumber(address).build(); + return new AsNumberBuilder().setAsNumber(address).build(); } } @@ -298,33 +298,33 @@ public final class LispAddressUtil { 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(); } @@ -338,41 +338,41 @@ public final class LispAddressUtil { 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(); } @@ -386,41 +386,41 @@ public final class LispAddressUtil { 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(); } @@ -434,7 +434,7 @@ public final class LispAddressUtil { 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); @@ -463,7 +463,7 @@ public final class LispAddressUtil { 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()); @@ -481,7 +481,7 @@ public final class LispAddressUtil { 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); @@ -499,7 +499,7 @@ public final class LispAddressUtil { 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()); @@ -534,7 +534,7 @@ public final class LispAddressUtil { 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()); @@ -552,7 +552,7 @@ public final class LispAddressUtil { 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); @@ -570,7 +570,7 @@ public final class LispAddressUtil { 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()); @@ -630,9 +630,9 @@ public final class LispAddressUtil { 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; @@ -641,7 +641,7 @@ public final class LispAddressUtil { 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))); } @@ -678,9 +678,9 @@ public final class LispAddressUtil { .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(); } @@ -692,9 +692,9 @@ public final class LispAddressUtil { .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(); } @@ -711,8 +711,8 @@ public final class LispAddressUtil { 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() @@ -723,7 +723,7 @@ public final class LispAddressUtil { 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()); @@ -749,12 +749,12 @@ public final class LispAddressUtil { RlocBuilder teBuilder = new RlocBuilder(); teBuilder.setAddress(elpBuilder.build()); - teBuilder.setAddressType(ExplicitLocatorPathLcaf.class); + teBuilder.setAddressType(ExplicitLocatorPathLcaf.VALUE); return teBuilder.build(); } public static List asLocatorRecords(List locators) { - List locatorRecords = new ArrayList(); + List locatorRecords = new ArrayList<>(); for (Rloc locator : locators) { LocatorRecordBuilder locatorBuilder = new LocatorRecordBuilder(); locatorBuilder.setLocalLocator(false).setRlocProbed(false) @@ -768,7 +768,7 @@ public final class LispAddressUtil { 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(); @@ -816,31 +816,34 @@ public final class LispAddressUtil { return new Ipv6BinaryBuilder().setIpv6Binary(new Ipv6AddressBinary(addr)).build(); } - private static Pair, Address> convertToBinary(Address addr) { - Address convAddr = null; - Class convType = null; + private static Pair 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, Address>(convType, convAddr); + return new ImmutablePair<>(convType, convAddr); } public static Eid convertToBinary(Eid eid) { - Pair, Address> converted = convertToBinary(eid.getAddress()); + Pair converted = convertToBinary(eid.getAddress()); if (converted.getRight() == null) { return eid; } @@ -851,7 +854,7 @@ public final class LispAddressUtil { } public static Rloc convertToBinary(Rloc rloc) { - Pair, Address> converted = convertToBinary(rloc.getAddress()); + Pair converted = convertToBinary(rloc.getAddress()); if (converted.getRight() == null) { return rloc; } @@ -914,27 +917,30 @@ public final class LispAddressUtil { .build(); } - private static Pair, Address> convertFromBinary(Address addr) { - Address convAddr = null; - Class convType = null; + private static Pair 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, Address>(convType, convAddr); + return new ImmutablePair<>(convType, convAddr); } public static Eid convertFromBinary(Eid eid) { - Pair, Address> converted = convertFromBinary(eid.getAddress()); + Pair converted = convertFromBinary(eid.getAddress()); if (converted.getRight() == null) { return eid; } @@ -945,7 +951,7 @@ public final class LispAddressUtil { } public static Rloc convertFromBinary(Rloc rloc) { - Pair, Address> converted = convertFromBinary(rloc.getAddress()); + Pair converted = convertFromBinary(rloc.getAddress()); if (converted.getRight() == null) { return rloc; } diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/SimpleAddressBuilder.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/SimpleAddressBuilder.java index b201f9419..2ce451704 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/SimpleAddressBuilder.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/SimpleAddressBuilder.java @@ -1,7 +1,6 @@ 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; @@ -40,7 +39,7 @@ public class SimpleAddressBuilder { 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; @@ -49,7 +48,7 @@ public class SimpleAddressBuilder { 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; diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressStringifierTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressStringifierTest.java index 90700b6bf..dfb947306 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressStringifierTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressStringifierTest.java @@ -407,7 +407,7 @@ public class LispAddressStringifierTest { 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(); diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtilTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtilTest.java index 33c0e2af5..6423fc07b 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtilTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtilTest.java @@ -112,7 +112,7 @@ public class LispAddressUtilTest { 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"; @@ -136,30 +136,30 @@ public class LispAddressUtilTest { .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}; @@ -186,19 +186,19 @@ public class LispAddressUtilTest { .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; @@ -226,9 +226,7 @@ public class LispAddressUtilTest { */ @Test public void addressFromSimpleAddressTest_asAnyIpAddress() { - final Class 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); @@ -243,9 +241,7 @@ public class LispAddressUtilTest { public void addressFromSimpleAddressTest_asIpPrefix() { final SimpleAddress simpleAddress = new SimpleAddress(new IpPrefix(new Ipv4Prefix( IPV4_ADDRESS_PREFIX_VALUE_TEST))); - final Class 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 @@ -260,9 +256,7 @@ public class LispAddressUtilTest { @Test public void addressFromSimpleAddressTest_asMacAddress() { final SimpleAddress simpleAddress = new SimpleAddress(new MacAddress(MAC_ADDRESS_VALUE_TEST)); - final Class addressClass = LispAddressUtil.addressTypeFromSimpleAddress( - simpleAddress); - assertEquals(MacAfi.class, addressClass); + assertEquals(MacAfi.VALUE, LispAddressUtil.addressTypeFromSimpleAddress(simpleAddress)); final Address address = LispAddressUtil.addressFromSimpleAddress(simpleAddress); assertTrue(address instanceof Mac); @@ -276,9 +270,7 @@ public class LispAddressUtilTest { @Test public void addressFromSimpleAddressTest_asAddress() { final SimpleAddress simpleAddress = SimpleAddressBuilder.getDefaultInstance("abcd"); - final Class addressClass = LispAddressUtil.addressTypeFromSimpleAddress( - simpleAddress); - assertEquals(DistinguishedNameAfi.class, addressClass); + assertEquals(DistinguishedNameAfi.VALUE, LispAddressUtil.addressTypeFromSimpleAddress(simpleAddress)); final Address address = LispAddressUtil.addressFromSimpleAddress(simpleAddress); assertTrue(address instanceof DistinguishedName); @@ -292,9 +284,7 @@ public class LispAddressUtilTest { @Test public void addressFromSimpleAddressTest_asNumber() { final SimpleAddress simpleAddress = new SimpleAddress(new AsNumber(fromJava(NUMBER_TEST))); - final Class 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 @@ -340,8 +330,7 @@ public class LispAddressUtilTest { @Test public void binaryAddressFromInet_ipv4() throws UnknownHostException { final InetAddress ipv4InetAddress = Inet4Address.getByAddress(IPV4_ADDRESS_BYTES_A_TEST); - Class addressClass = LispAddressUtil.binaryAddressTypeFromInet(ipv4InetAddress); - assertEquals(Ipv4BinaryAfi.class, addressClass); + assertEquals(Ipv4BinaryAfi.VALUE, LispAddressUtil.binaryAddressTypeFromInet(ipv4InetAddress)); final Address address = LispAddressUtil.binaryAddressFromInet(ipv4InetAddress); assertTrue(address instanceof Ipv4Binary); @@ -355,8 +344,7 @@ public class LispAddressUtilTest { @Test public void binaryAddressFromInet_ipv6() throws UnknownHostException { final InetAddress ipv6InetAddress = Inet6Address.getByAddress(IPV6_ADDRESS_BYTES_A_TEST); - Class addressClass = LispAddressUtil.binaryAddressTypeFromInet(ipv6InetAddress); - assertEquals(Ipv6BinaryAfi.class, addressClass); + assertEquals(Ipv6BinaryAfi.VALUE, LispAddressUtil.binaryAddressTypeFromInet(ipv6InetAddress)); final Address address = LispAddressUtil.binaryAddressFromInet(ipv6InetAddress); assertTrue(address instanceof Ipv6Binary); @@ -371,8 +359,7 @@ public class LispAddressUtilTest { @Test public void addressFromIpAddress_ipv4() { final IpAddress ipv4Address = new IpAddress(IPV4_ADDRESS_TEST); - final Class addressClass = LispAddressUtil.addressTypeFromIpAddress(ipv4Address); - assertEquals(Ipv4Afi.class, addressClass); + assertEquals(Ipv4Afi.VALUE, LispAddressUtil.addressTypeFromIpAddress(ipv4Address)); final Address address = LispAddressUtil.addressFromIpAddress(ipv4Address); assertTrue(address instanceof Ipv4); @@ -387,8 +374,7 @@ public class LispAddressUtilTest { @Test public void addressFromIpAddress_ipv6() { final IpAddress ipv6Address = new IpAddress(new Ipv6Address(IPV6_ADDRESS_VALUE_TEST)); - final Class addressClass = LispAddressUtil.addressTypeFromIpAddress(ipv6Address); - assertEquals(Ipv6Afi.class, addressClass); + assertEquals(Ipv6Afi.VALUE, LispAddressUtil.addressTypeFromIpAddress(ipv6Address)); final Address address = LispAddressUtil.addressFromIpAddress(ipv6Address); assertTrue(address instanceof Ipv6); @@ -402,11 +388,8 @@ public class LispAddressUtilTest { */ @Test public void addressFromIpAddress_null() { - final Class addressClass = LispAddressUtil.addressTypeFromIpAddress(null); - assertNull(addressClass); - - final Address address = LispAddressUtil.addressFromIpAddress(null); - assertNull(address); + assertNull(LispAddressUtil.addressTypeFromIpAddress(null)); + assertNull(LispAddressUtil.addressFromIpAddress(null)); } /** @@ -417,12 +400,8 @@ public class LispAddressUtilTest { @Test public void binaryAddressFromIpAddress_Ipv4Binary() { final IpAddress ipv4Address = new IpAddress(new Ipv4Address(IPV4_ADDRESS_VALUE_TEST)); - final Class 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)); } /** @@ -433,12 +412,8 @@ public class LispAddressUtilTest { @Test public void binaryAddressFromIpAddress_Ipv6Binary() { final IpAddress ipv6Address = new IpAddress(new Ipv6Address(IPV6_ADDRESS_VALUE_TEST)); - final Class 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)); } /** @@ -448,11 +423,8 @@ public class LispAddressUtilTest { */ @Test public void binaryAddressFromIpAddress_null() { - final Class addressClass = LispAddressUtil.binaryAddressTypeFromIpAddress(null); - assertNull(addressClass); - - final Address address = LispAddressUtil.binaryAddressFromIpAddress(null); - assertNull(address); + assertNull(LispAddressUtil.binaryAddressTypeFromIpAddress(null)); + assertNull(LispAddressUtil.binaryAddressFromIpAddress(null)); } /** @@ -463,8 +435,7 @@ public class LispAddressUtilTest { @Test public void addressFromIpPrefix_ipv4() { IpPrefix ipv4Prefix = new IpPrefix(new Ipv4Prefix(IPV4_ADDRESS_PREFIX_VALUE_TEST)); - final Class 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 @@ -481,8 +452,7 @@ public class LispAddressUtilTest { @Test public void addressFromIpPrefix_ipv6() { IpPrefix ipv6Address = new IpPrefix(new Ipv6Prefix(IPV6_ADDRESS_PREFIX_VALUE_TEST)); - final Class 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 @@ -499,11 +469,8 @@ public class LispAddressUtilTest { */ @Test public void addressFromIpPrefix_null() { - final Class addressClass = LispAddressUtil.addressTypeFromIpPrefix(null); - assertNull(addressClass); - - final Address address = LispAddressUtil.addressFromIpPrefix(null); - assertNull(address); + assertNull(LispAddressUtil.addressTypeFromIpPrefix(null)); + assertNull(LispAddressUtil.addressFromIpPrefix(null)); } /** @@ -612,20 +579,20 @@ public class LispAddressUtilTest { 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()); } @@ -636,11 +603,11 @@ public class LispAddressUtilTest { @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()); } @@ -657,17 +624,17 @@ public class LispAddressUtilTest { 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); } /** @@ -725,17 +692,17 @@ public class LispAddressUtilTest { 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); } /** @@ -749,18 +716,18 @@ public class LispAddressUtilTest { @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); } /** @@ -774,18 +741,18 @@ public class LispAddressUtilTest { @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); } /** @@ -819,7 +786,7 @@ public class LispAddressUtilTest { @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); } /** @@ -842,9 +809,9 @@ public class LispAddressUtilTest { verifyToEidWithMacAddress(eidFromDistinguishedName, true); } - private void verifyToEidWithIpv6Prefix(final Eid eidFromIpv6Prefix, final boolean isVniChecked, short - expectedMask, final Class 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()); @@ -854,9 +821,9 @@ public class LispAddressUtilTest { .getAddress()).getIpv6Prefix().getValue()); } - private void verifyToEidWithIpv6PrefixBinary(final Eid eidFromIpv6PrefixBinary, final boolean isVniChecked, short - expectedMask, final Class 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()); @@ -867,24 +834,24 @@ public class LispAddressUtilTest { ((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()); } @@ -892,8 +859,8 @@ public class LispAddressUtilTest { ((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()); } @@ -901,17 +868,17 @@ public class LispAddressUtilTest { ((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 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()); @@ -922,9 +889,9 @@ public class LispAddressUtilTest { .getIpv4Prefix().getValue()); } - private void verifyToEidWithIpv4PrefixBinary(final Eid eidFromIpv4PrefixBinary, final boolean isVniChecked, short - expectedMask, Class 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()); @@ -935,8 +902,8 @@ public class LispAddressUtilTest { ((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()); } @@ -944,8 +911,9 @@ public class LispAddressUtilTest { ((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()); } @@ -953,8 +921,8 @@ public class LispAddressUtilTest { .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()); } @@ -1135,8 +1103,8 @@ public class LispAddressUtilTest { 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 = @@ -1166,7 +1134,7 @@ public class LispAddressUtilTest { 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(); @@ -1184,7 +1152,7 @@ public class LispAddressUtilTest { 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(); @@ -1202,7 +1170,7 @@ public class LispAddressUtilTest { IP_ADDRESS_IPV6_TEST); final Rloc rloc = LispAddressUtil.asTeLcafRloc(ipAddresses); assertNotNull(rloc); - assertEquals(ExplicitLocatorPathLcaf.class, rloc.getAddressType()); + assertEquals(ExplicitLocatorPathLcaf.VALUE, rloc.getAddressType()); final List hops = ((ExplicitLocatorPath) rloc.getAddress()).getExplicitLocatorPath().getHop(); assertEquals(hops.size(), ipAddresses.size()); @@ -1221,7 +1189,7 @@ public class LispAddressUtilTest { } } - private boolean isIpAddressInHops(final IpAddress ipAddress, final List hops) { + private static boolean isIpAddressInHops(final IpAddress ipAddress, final List hops) { for (Hop hop : hops) { if (hop.getAddress().getIpAddress().equals(ipAddress)) { return true; @@ -1258,7 +1226,7 @@ public class LispAddressUtilTest { } } - private boolean isRlocInLocatorRecords(final List locatorRecords, final Rloc rloc) { + private static boolean isRlocInLocatorRecords(final List locatorRecords, final Rloc rloc) { for (LocatorRecord locatorRecord : locatorRecords) { if (locatorRecord.getRloc().equals(rloc)) { return true; @@ -1273,7 +1241,7 @@ public class LispAddressUtilTest { @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()); } @@ -1339,10 +1307,10 @@ public class LispAddressUtilTest { 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); @@ -1357,10 +1325,10 @@ public class LispAddressUtilTest { @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); @@ -1497,7 +1465,7 @@ public class LispAddressUtilTest { 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(); @@ -1543,7 +1511,7 @@ public class LispAddressUtilTest { 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()); diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/SourceDestKeyHelperTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/SourceDestKeyHelperTest.java index 11a1bdfbf..197ace666 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/SourceDestKeyHelperTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/SourceDestKeyHelperTest.java @@ -63,7 +63,7 @@ public class SourceDestKeyHelperTest { 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)); } @@ -83,7 +83,7 @@ public class SourceDestKeyHelperTest { 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)); } @@ -103,7 +103,7 @@ public class SourceDestKeyHelperTest { 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)); } @@ -123,7 +123,7 @@ public class SourceDestKeyHelperTest { 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)); } diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRequestSerializationTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRequestSerializationTest.java index 6102a3f80..fce1ed52b 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRequestSerializationTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRequestSerializationTest.java @@ -45,8 +45,7 @@ public class MapRequestSerializationTest extends BaseTestCase { 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 diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/AfiListSerializerTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/AfiListSerializerTest.java index 864ec1fec..677a8f143 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/AfiListSerializerTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/AfiListSerializerTest.java @@ -36,7 +36,7 @@ public class AfiListSerializerTest extends BaseTestCase { + "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 addressList = afiList.getAfiList().getAddressList(); @@ -52,7 +52,7 @@ public class AfiListSerializerTest extends BaseTestCase { 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()); @@ -60,10 +60,11 @@ public class AfiListSerializerTest extends BaseTestCase { @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) @@ -80,7 +81,7 @@ public class AfiListSerializerTest extends BaseTestCase { 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() @@ -101,7 +102,7 @@ public class AfiListSerializerTest extends BaseTestCase { 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() diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ApplicationDataSerializerTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ApplicationDataSerializerTest.java index 247588d0d..c34e5aa96 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ApplicationDataSerializerTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ApplicationDataSerializerTest.java @@ -39,7 +39,7 @@ public class ApplicationDataSerializerTest extends BaseTestCase { + "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()); @@ -54,19 +54,22 @@ public class ApplicationDataSerializerTest extends BaseTestCase { @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 @@ -96,7 +99,7 @@ public class ApplicationDataSerializerTest extends BaseTestCase { .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() diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/DistinguishedNameSerializerTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/DistinguishedNameSerializerTest.java index e09b4e47f..351093a3c 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/DistinguishedNameSerializerTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/DistinguishedNameSerializerTest.java @@ -30,11 +30,10 @@ public class DistinguishedNameSerializerTest extends BaseTestCase { 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 @@ -42,7 +41,7 @@ public class DistinguishedNameSerializerTest extends BaseTestCase { 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()); @@ -55,7 +54,7 @@ public class DistinguishedNameSerializerTest extends BaseTestCase { + "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()); @@ -63,9 +62,10 @@ public class DistinguishedNameSerializerTest extends BaseTestCase { @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) @@ -87,7 +87,7 @@ public class DistinguishedNameSerializerTest extends BaseTestCase { @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()); @@ -96,5 +96,4 @@ public class DistinguishedNameSerializerTest extends BaseTestCase { ByteBuffer expectedBuf = hexToByteBuffer("00 11 64 61 76 69 64 00"); ArrayAssert.assertEquals(expectedBuf.array(), buf.array()); } - } diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ExplicitLocatorPathSerializerTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ExplicitLocatorPathSerializerTest.java index 20bf562be..fc6f2cbb2 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ExplicitLocatorPathSerializerTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ExplicitLocatorPathSerializerTest.java @@ -35,7 +35,7 @@ public class ExplicitLocatorPathSerializerTest extends BaseTestCase { + "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 hops = elp.getExplicitLocatorPath().getHop(); @@ -52,7 +52,7 @@ public class ExplicitLocatorPathSerializerTest extends BaseTestCase { + "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 hops = elp.getExplicitLocatorPath().getHop(); @@ -73,7 +73,7 @@ public class ExplicitLocatorPathSerializerTest extends BaseTestCase { 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 hops = elp.getExplicitLocatorPath().getHop(); @@ -82,10 +82,11 @@ public class ExplicitLocatorPathSerializerTest extends BaseTestCase { @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) @@ -106,7 +107,7 @@ public class ExplicitLocatorPathSerializerTest extends BaseTestCase { 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() @@ -124,7 +125,7 @@ public class ExplicitLocatorPathSerializerTest extends BaseTestCase { @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()); diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/InstanceIdSerializerTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/InstanceIdSerializerTest.java index cbcb1bb85..dfaaa5cee 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/InstanceIdSerializerTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/InstanceIdSerializerTest.java @@ -33,7 +33,7 @@ public class InstanceIdSerializerTest extends BaseTestCase { + "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()); @@ -42,28 +42,31 @@ public class InstanceIdSerializerTest extends BaseTestCase { @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 diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/Ipv6SerializerTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/Ipv6SerializerTest.java index 7b5e4ebc9..8296a264e 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/Ipv6SerializerTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/Ipv6SerializerTest.java @@ -5,7 +5,6 @@ * 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; @@ -25,7 +24,7 @@ public class Ipv6SerializerTest extends BaseTestCase { 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()); @@ -35,7 +34,7 @@ public class Ipv6SerializerTest extends BaseTestCase { 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()); diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/KeyValueAddressSerializerTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/KeyValueAddressSerializerTest.java index 22d846c2c..05e16ce79 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/KeyValueAddressSerializerTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/KeyValueAddressSerializerTest.java @@ -33,7 +33,7 @@ public class KeyValueAddressSerializerTest extends BaseTestCase { + "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()); @@ -42,17 +42,20 @@ public class KeyValueAddressSerializerTest extends BaseTestCase { @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 @@ -76,7 +79,7 @@ public class KeyValueAddressSerializerTest extends BaseTestCase { 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() diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ServicePathTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ServicePathTest.java index a24cbf2e6..c10e334cf 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ServicePathTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ServicePathTest.java @@ -34,7 +34,7 @@ public class ServicePathTest extends BaseTestCase { + "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 }), diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/SourceDestKeySerializerTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/SourceDestKeySerializerTest.java index 0aa82d876..564bcc8ae 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/SourceDestKeySerializerTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/SourceDestKeySerializerTest.java @@ -37,7 +37,7 @@ public class SourceDestKeySerializerTest extends BaseTestCase { + "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())); @@ -49,18 +49,21 @@ public class SourceDestKeySerializerTest extends BaseTestCase { @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)); } @@ -87,7 +90,7 @@ public class SourceDestKeySerializerTest extends BaseTestCase { 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() diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml index 32a6dcf65..4318f6634 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent - 10.0.2 + 11.0.0 @@ -38,7 +38,7 @@ org.opendaylight.mdsal mdsal-artifacts - 9.0.4 + 10.0.0 pom import diff --git a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandlerTest.java b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandlerTest.java index 5d3f42bd4..641acb874 100644 --- a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandlerTest.java +++ b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandlerTest.java @@ -327,7 +327,7 @@ public class LispSouthboundHandlerTest extends BaseTestCase { 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()); } @@ -723,7 +723,7 @@ public class LispSouthboundHandlerTest extends BaseTestCase { List 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()); } @@ -811,7 +811,7 @@ public class LispSouthboundHandlerTest extends BaseTestCase { ArgumentCaptor 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()); } diff --git a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispXtrSouthboundHandlerTest.java b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispXtrSouthboundHandlerTest.java index 8c77ec184..e7362a0c9 100644 --- a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispXtrSouthboundHandlerTest.java +++ b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispXtrSouthboundHandlerTest.java @@ -216,7 +216,7 @@ public class LispXtrSouthboundHandlerTest { 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(); -- 2.36.6