Checkstyle: fix issues and enforce on lisp-proto 51/42751/1
authorLorand Jakab <lojakab@cisco.com>
Fri, 29 Jul 2016 00:39:09 +0000 (19:39 -0500)
committerLorand Jakab <lojakab@cisco.com>
Fri, 29 Jul 2016 01:00:38 +0000 (20:00 -0500)
Change-Id: Iebaaba5c730c7e1c6a25c8786248a2190d7aaa13
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
47 files changed:
mappingservice/lisp-proto/pom.xml
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/authentication/LispKeyIDEnum.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/authentication/LispMACAuthentication.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/LocatorRecordSerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MapNotifySerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MapRegisterSerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MapRequestSerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MappingRecordSerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/DistinguishedNameSerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ExplicitLocatorPathSerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4BinarySerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixBinarySerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixSerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4Serializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6BinarySerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixBinarySerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixSerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6Serializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LcafSerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LispAddressSerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LispAddressSerializerContext.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/MacSerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ServicePathSerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/SimpleAddressSerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/factory/LispAddressSerializerFactory.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/type/LispCanonicalAddressFormatEnum.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/AddressTypeMap.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/ByteUtil.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressStringifier.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispSimpleAddressStringifier.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/SourceDestKeyHelper.java
mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/authentication/LispAuthenticationTest.java
mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/authentication/LispMACAuthenticationTest.java
mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressStringifierTest.java
mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtilTest.java
mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispSimpleAddressStringifierTest.java
mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/MapRequestUtilTest.java
mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtilTest.java
mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/SourceDestKeyHelperTest.java
mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapNotifySerializationTest.java
mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRegisterSerializationTest.java
mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapReplySerializationTest.java
mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRequestSerializationTest.java
mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/AfiListSerializerTest.java
mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ServicePathTest.java

index 0c6ea23634c7ac91ed13905bb0711d757f6c55b9..efd988e20091fd82f924c206ff7651b722e6b7f6 100644 (file)
@@ -65,31 +65,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <pluginManagement>
       <plugins>
         <plugin>
-          <!-- Temporarily override the odlparent checkstyle configuration.
-               We want to enforce some simple rules and add more as we clean up code -->
+          <!-- Enforce odlparent checkstyle -->
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
           <configuration>
-            <configLocation>checkstyle/java_rules.xml</configLocation>
             <includeTestSourceDirectory>true</includeTestSourceDirectory>
-            <excludes>org/opendaylight/yang/gen/**,**/config/yang/**</excludes>
-            <failsOnError>true</failsOnError>
-            <consoleOutput>true</consoleOutput>
+            <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
           </configuration>
-          <dependencies>
-            <dependency>
-              <groupId>org.opendaylight.lispflowmapping</groupId>
-              <artifactId>common.build.tools</artifactId>
-              <version>${project.version}</version>
-            </dependency>
-          </dependencies>
-          <executions>
-            <execution>
-              <goals>
-                <goal>check</goal>
-              </goals>
-              <phase>process-sources</phase>
-            </execution>
-          </executions>
         </plugin>
       </plugins>
     </pluginManagement>
index 982426d9734eaacb91accf6fa7c2ab91f5622591..2a9007723e229ecbe39c19de0216f57ba10c97d0 100644 (file)
@@ -16,7 +16,7 @@ public enum LispKeyIDEnum {
     private short keyID;
     private String authenticationName;
 
-    private LispKeyIDEnum(int keyID, String authenticationName) {
+    LispKeyIDEnum(int keyID, String authenticationName) {
         this.keyID = (short) keyID;
         this.authenticationName = authenticationName;
     }
index 413fad6e6b3925a352de92efed8887439392f22f..0e6d45c96007fc5c0b8450de9b9bd909d9cf4e8a 100644 (file)
@@ -73,18 +73,6 @@ public class LispMACAuthentication implements ILispAuthentication {
         return null;
     }
 
-    public int getAuthenticationLength() {
-        return authenticationLength;
-    }
-
-    public String getAlgorithm() {
-        return algorithm;
-    }
-
-    public void setAlgorithm(String algorithm) {
-        this.algorithm = algorithm;
-    }
-
     public byte[] getAuthenticationData(final ByteBuffer buffer, final String key) {
         byte[] bufferAsArray;
         if (buffer.hasArray()) {
@@ -96,4 +84,15 @@ public class LispMACAuthentication implements ILispAuthentication {
         return getAuthenticationData(bufferAsArray, key);
     }
 
-}
+    public int getAuthenticationLength() {
+        return authenticationLength;
+    }
+
+    public String getAlgorithm() {
+        return algorithm;
+    }
+
+    public void setAlgorithm(String algorithm) {
+        this.algorithm = algorithm;
+    }
+}
\ No newline at end of file
index 00b704be5998d66787e12c34b91e2014d463b178..391a0ac7defe79b763ac70fc3ee52e3acf868a02 100644 (file)
@@ -52,9 +52,9 @@ public final class LocatorRecordSerializer {
         replyBuffer.put((byte) NumberUtil.asShort(record.getMulticastPriority()));
         replyBuffer.put((byte) NumberUtil.asShort(record.getMulticastWeight()));
         replyBuffer.position(replyBuffer.position() + Length.UNUSED_FLAGS);
-        replyBuffer.put((byte) (ByteUtil.boolToBit(BooleanUtils.isTrue(record.isLocalLocator()), Flags.LOCAL_LOCATOR) |
-                ByteUtil.boolToBit(BooleanUtils.isTrue(record.isRlocProbed()), Flags.RLOC_PROBED) |
-                ByteUtil.boolToBit(BooleanUtils.isTrue(record.isRouted()), Flags.ROUTED)));
+        replyBuffer.put((byte) (ByteUtil.boolToBit(BooleanUtils.isTrue(record.isLocalLocator()), Flags.LOCAL_LOCATOR)
+                | ByteUtil.boolToBit(BooleanUtils.isTrue(record.isRlocProbed()), Flags.RLOC_PROBED)
+                ByteUtil.boolToBit(BooleanUtils.isTrue(record.isRouted()), Flags.ROUTED)));
         LispAddressSerializer.getInstance().serialize(replyBuffer, record.getRloc());
     }
 
index 368becb835d065e9da2700868f9b425571518b94..c039752f8ea194430e67c0efd12de9072253083e 100644 (file)
@@ -44,16 +44,16 @@ public final class MapNotifySerializer {
             size += mapNotify.getAuthenticationData().length;
         }
         if (mapNotify.isXtrSiteIdPresent() != null && mapNotify.isXtrSiteIdPresent()) {
-            size += org.opendaylight.lispflowmapping.lisp.serializer.MapRegisterSerializer.Length.XTRID_SIZE +
-                    org.opendaylight.lispflowmapping.lisp.serializer.MapRegisterSerializer.Length.SITEID_SIZE;
+            size += org.opendaylight.lispflowmapping.lisp.serializer.MapRegisterSerializer.Length.XTRID_SIZE
+                  + org.opendaylight.lispflowmapping.lisp.serializer.MapRegisterSerializer.Length.SITEID_SIZE;
         }
         for (MappingRecordItem mappingRecord : mapNotify.getMappingRecordItem()) {
             size += MappingRecordSerializer.getInstance().getSerializationSize(mappingRecord.getMappingRecord());
         }
 
         ByteBuffer replyBuffer = ByteBuffer.allocate(size);
-        replyBuffer.put((byte) ((byte) (MessageType.MapNotify.getIntValue() << 4) |
-                ByteUtil.boolToBit(BooleanUtils.isTrue(mapNotify.isXtrSiteIdPresent()), Flags.XTRSITEID)));
+        replyBuffer.put((byte) ((byte) (MessageType.MapNotify.getIntValue() << 4)
+                ByteUtil.boolToBit(BooleanUtils.isTrue(mapNotify.isXtrSiteIdPresent()), Flags.XTRSITEID)));
         replyBuffer.position(replyBuffer.position() + Length.RES);
         replyBuffer.put(ByteUtil.boolToBit(BooleanUtils.isTrue(mapNotify.isMergeEnabled()), Flags.MERGE_ENABLED));
         if (mapNotify.getMappingRecordItem() != null) {
@@ -84,6 +84,7 @@ public final class MapNotifySerializer {
         return replyBuffer;
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     public MapNotify deserialize(ByteBuffer notifyBuffer) {
         try {
             MapNotifyBuilder builder = new MapNotifyBuilder();
index fc23523d1c8c7d36baf42fe040a6637fb037f8de..449441c0c90e4c955ddc8877f6eb14fffdf01704 100644 (file)
@@ -13,7 +13,6 @@ import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.commons.lang3.BooleanUtils;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
 import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;
@@ -58,13 +57,13 @@ public final class MapRegisterSerializer {
         }
 
         ByteBuffer registerBuffer = ByteBuffer.allocate(size);
-        registerBuffer.put((byte) ((byte) (MessageType.MapRegister.getIntValue() << 4) |
-                ByteUtil.boolToBit(BooleanUtils.isTrue(mapRegister.isProxyMapReply()), Flags.PROXY) |
-                ByteUtil.boolToBit(BooleanUtils.isTrue(mapRegister.isXtrSiteIdPresent()), Flags.XTRSITEID)));
+        registerBuffer.put((byte) ((byte) (MessageType.MapRegister.getIntValue() << 4)
+                | ByteUtil.boolToBit(BooleanUtils.isTrue(mapRegister.isProxyMapReply()), Flags.PROXY)
+                ByteUtil.boolToBit(BooleanUtils.isTrue(mapRegister.isXtrSiteIdPresent()), Flags.XTRSITEID)));
         registerBuffer.position(registerBuffer.position() + Length.RES);
         registerBuffer.put((byte)
-                (ByteUtil.boolToBit(BooleanUtils.isTrue(mapRegister.isMergeEnabled()), Flags.MERGE_ENABLED) |
-                ByteUtil.boolToBit(BooleanUtils.isTrue(mapRegister.isWantMapNotify()), Flags.WANT_MAP_NOTIFY)));
+                (ByteUtil.boolToBit(BooleanUtils.isTrue(mapRegister.isMergeEnabled()), Flags.MERGE_ENABLED)
+                ByteUtil.boolToBit(BooleanUtils.isTrue(mapRegister.isWantMapNotify()), Flags.WANT_MAP_NOTIFY)));
         registerBuffer.put((byte) mapRegister.getMappingRecordItem().size());
         registerBuffer.putLong(NumberUtil.asLong(mapRegister.getNonce()));
         registerBuffer.putShort(NumberUtil.asShort(mapRegister.getKeyId()));
@@ -87,6 +86,7 @@ public final class MapRegisterSerializer {
         return registerBuffer;
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     public MapRegister deserialize(ByteBuffer registerBuffer, InetAddress sourceRloc) {
         try {
             MapRegisterBuilder builder = new MapRegisterBuilder();
index 7c26d7fb98fb6f63e40cf92c322818b93ca12af2..4340cdfb589dc317ba71ae47a4dd943f83642ad0 100644 (file)
@@ -9,7 +9,6 @@ package org.opendaylight.lispflowmapping.lisp.serializer;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
-
 import org.apache.commons.lang3.BooleanUtils;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializerContext;
@@ -70,11 +69,11 @@ public final class MapRequestSerializer {
         requestBuffer.put((byte) (ByteUtil.boolToBit(BooleanUtils.isTrue(mapRequest.isPitr()), Flags.PITR)
                 | ByteUtil.boolToBit(BooleanUtils.isTrue(mapRequest.isSmrInvoked()), Flags.SMR_INVOKED)));
         if (mapRequest.getItrRloc() != null) {
-            int IRC = mapRequest.getItrRloc().size();
-            if (IRC > 0) {
-                IRC--;
+            int irc = mapRequest.getItrRloc().size();
+            if (irc > 0) {
+                irc--;
             }
-            requestBuffer.put((byte) (IRC));
+            requestBuffer.put((byte) (irc));
         } else {
             requestBuffer.put((byte) 0);
 
@@ -115,22 +114,23 @@ public final class MapRequestSerializer {
         return requestBuffer;
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     public MapRequest deserialize(ByteBuffer requestBuffer) {
         try {
             MapRequestBuilder builder = new MapRequestBuilder();
 
-            byte typeAndFlags = requestBuffer.get();
+            final byte typeAndFlags = requestBuffer.get();
             builder.setAuthoritative(ByteUtil.extractBit(typeAndFlags, Flags.AUTHORITATIVE));
             builder.setMapDataPresent(ByteUtil.extractBit(typeAndFlags, Flags.MAP_DATA_PRESENT));
             builder.setProbe(ByteUtil.extractBit(typeAndFlags, Flags.PROBE));
             builder.setSmr(ByteUtil.extractBit(typeAndFlags, Flags.SMR));
 
-            byte moreFlags = requestBuffer.get();
+            final byte moreFlags = requestBuffer.get();
             builder.setPitr(ByteUtil.extractBit(moreFlags, Flags.PITR));
             builder.setSmrInvoked(ByteUtil.extractBit(moreFlags, Flags.SMR_INVOKED));
 
-            int itrCount = ByteUtil.getUnsignedByte(requestBuffer) + 1;
-            int recordCount = ByteUtil.getUnsignedByte(requestBuffer);
+            final int itrCount = ByteUtil.getUnsignedByte(requestBuffer) + 1;
+            final int recordCount = ByteUtil.getUnsignedByte(requestBuffer);
             builder.setNonce(requestBuffer.getLong());
             LispAddressSerializerContext ctx = new LispAddressSerializerContext(
                     LispAddressSerializerContext.MASK_LEN_MISSING);
index 8174608b0b80b9a8f883b76e50528ebbbc646c78..7d9c6a29ecb9b6b52d1e5b738988232f925a1042 100644 (file)
@@ -40,9 +40,9 @@ public final class MappingRecordSerializer {
     public MappingRecordBuilder deserializeToBuilder(ByteBuffer buffer) {
         MappingRecordBuilder builder = new MappingRecordBuilder();
         builder.setRecordTtl(buffer.getInt());
-        byte locatorCount = (byte) ByteUtil.getUnsignedByte(buffer);
-        short maskLength = ((short) ByteUtil.getUnsignedByte(buffer));
-        byte actionAndAuthoritative = buffer.get();
+        final byte locatorCount = (byte) ByteUtil.getUnsignedByte(buffer);
+        final short maskLength = ((short) ByteUtil.getUnsignedByte(buffer));
+        final byte actionAndAuthoritative = buffer.get();
         Action act = Action.forValue(actionAndAuthoritative >> 5);
         if (act == null) {
             act = Action.NoAction;
index 0a1673f33437e49a024ba14f759e0692b162d07e..69d58986a124183bec73ba43fcb8a623364a7d3e 100644 (file)
@@ -89,10 +89,10 @@ public final class DistinguishedNameSerializer extends LispAddressSerializer {
 
     private DistinguishedNameType deserializeData(ByteBuffer buffer) {
         StringBuilder sb = new StringBuilder();
-        byte b = buffer.get();
-        while (b != 0) {
-            sb.append((char) b);
-            b = buffer.get();
+        byte character = buffer.get();
+        while (character != 0) {
+            sb.append((char) character);
+            character = buffer.get();
         }
         return new DistinguishedNameType(sb.toString());
     }
index 101ad52d33065ecbf5ba59b2c43ed7b664fe1010..145c612416769ca0ac64dd287da57bff5879ef4a 100644 (file)
@@ -71,9 +71,9 @@ public final class ExplicitLocatorPathSerializer extends LcafSerializer {
                 buffer.put((byte) 0);
                 if (hop.getLrsBits() != null) {
                     buffer.put((byte) (
-                            ByteUtil.boolToBit(BooleanUtils.isTrue(hop.getLrsBits().isLookup()), Flags.LOOKUP) |
-                            ByteUtil.boolToBit(BooleanUtils.isTrue(hop.getLrsBits().isRlocProbe()), Flags.RLOC_PROBE) |
-                            ByteUtil.boolToBit(BooleanUtils.isTrue(hop.getLrsBits().isStrict()), Flags.STRICT)));
+                            ByteUtil.boolToBit(BooleanUtils.isTrue(hop.getLrsBits().isLookup()), Flags.LOOKUP)
+                          | ByteUtil.boolToBit(BooleanUtils.isTrue(hop.getLrsBits().isRlocProbe()), Flags.RLOC_PROBE)
+                          | ByteUtil.boolToBit(BooleanUtils.isTrue(hop.getLrsBits().isStrict()), Flags.STRICT)));
                 } else {
                     buffer.put((byte) 0);
                 }
@@ -113,7 +113,7 @@ public final class ExplicitLocatorPathSerializer extends LcafSerializer {
             HopBuilder builder = new HopBuilder();
             builder.setLrsBits(new LrsBits(lookup, rlocProbe, strict));
             builder.setAddress(address);
-            builder.setHopId("Hop " + (hops.size()+1));
+            builder.setHopId("Hop " + (hops.size() + 1));
             length -= SimpleAddressSerializer.getInstance().getAddressSize(address) + 2;
             hops.add(builder.build());
         }
index cce8b91d693509bf219d1b346cf34d207f292bd4..fbd48b935eaf08bb3b58071b46be5fde66b15fdb 100644 (file)
@@ -29,6 +29,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
+ * Class to (de)serialize IPv4 addresses from/to byte[] representation.
+ *
  * @author Lorand Jakab
  *
  */
index 80372ea31f803257590496e38f0bee2f1cefaae1..2022a5e64206e5807a9afb57cc1c72ba8d702ad1 100644 (file)
@@ -29,6 +29,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
+ * Class to (de)serialize IPv4 prefixes from/to String representation.
+ *
  * @author Lorand Jakab
  *
  */
@@ -93,7 +95,7 @@ public final class Ipv4PrefixSerializer extends LispAddressSerializer {
     }
 
     private static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix
-    deserializeData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
+            deserializeData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
         byte[] ipBuffer = new byte[4];
         InetAddress address = null;
         buffer.get(ipBuffer);
index 94528e3df70170a7bbbba2783a597f338325ec6e..5d10530f38a89cb88d3d6ec33e92e96ba09432bf 100644 (file)
@@ -28,6 +28,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
+ * Class to (de)serialize IPv4 addresses from/to String representation.
+ *
  * @author Lorand Jakab
  *
  */
index cc0aed529a188a50dd4aaf387abe00a3497ca0b5..af9b5210db485b9337fae6b00c0eb19269bab363 100644 (file)
@@ -30,6 +30,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
+ * Class to (de)serialize IPv6 addresses from/to byte[] representation.
+ *
  * @author Lorand Jakab
  *
  */
index df30843fe1730a46b9da80f1bd7a7b19b9ad2b12..81a28d1bdca48ddccbc1ad0aceb6f9672b203431 100644 (file)
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
+import com.google.common.net.InetAddresses;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
-
 import org.opendaylight.lispflowmapping.lisp.serializer.address.Ipv6Serializer.Length;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.afn.safi.rev130704.AddressFamily;
@@ -28,9 +28,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rl
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.net.InetAddresses;
-
 /**
+ * Class to (de)serialize IPv6 prefixes from/to byte[] representation.
+ *
  * @author Lorand Jakab
  *
  */
index d25ec5a5965ecebf67f1fc461e1542d2d8f1ac9e..ac8dc03128b8f89381806868d75d3b088f808ed9 100644 (file)
@@ -29,6 +29,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
+ * Class to (de)serialize IPv6 prefixes from/to String representation.
+ *
  * @author Lorand Jakab
  *
  */
@@ -93,7 +95,7 @@ public final class Ipv6PrefixSerializer extends LispAddressSerializer {
     }
 
     private static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix
-    deserializeData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
+            deserializeData(ByteBuffer buffer, LispAddressSerializerContext ctx) {
         byte[] ipBuffer = new byte[16];
         InetAddress address = null;
         buffer.get(ipBuffer);
index 48b2b30892544ae79498583669a77dcda6c7eb19..0363583c254de34ac967de15905ce6743b2d9140 100644 (file)
@@ -28,6 +28,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
+ * Class to (de)serialize IPv6 addresses from/to String representation.
+ *
  * @author Lorand Jakab
  *
  */
index 1d0eca9e2a608120f7ece8841752ada19a482332..082a486c872554817baf1ec6f51860a405f33835 100644 (file)
@@ -64,8 +64,8 @@ public class LcafSerializer extends LispAddressSerializer {
         LispAddressSerializer lcafSerializer = InstanceIdSerializer.getInstance();
         serializeLCAFAddressHeader(buffer, lispAddress, lcafSerializer);
         buffer.put(buffer.position() - 1, DEFAULT_IID_MASK_LENGTH);
-        buffer.putShort((short) (lcafSerializer.getLcafLength(lispAddress) -
-                LispAddressSerializer.getInstance().getInstanceIdExtraSize()));
+        buffer.putShort((short) (lcafSerializer.getLcafLength(lispAddress)
+                LispAddressSerializer.getInstance().getInstanceIdExtraSize()));
     }
 
     private void serializeLCAFAddressHeader(ByteBuffer buffer, LispAddress lispAddress,
@@ -79,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 <? extends LispAddressFamily> addressType = AddressTypeMap.getLcafType(lcafType);
+        Class<? extends LispAddressFamily> addressType = AddressTypeMap.getLcafType(lcafType);
         // TODO move these to ctx to shorten the list of arguments
         byte res2 = buffer.get();
         short length = buffer.getShort();
@@ -100,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 <? extends LispAddressFamily> addressType = AddressTypeMap.getLcafType(lcafType);
+        Class<? extends LispAddressFamily> addressType = AddressTypeMap.getLcafType(lcafType);
         byte res2 = buffer.get();
         short length = buffer.getShort();
 
index 0b2bd836cf3088afe32e19bf1a867b402af19110..009cf962294fd3e1148a7e27bb050579df87a30b 100644 (file)
@@ -8,7 +8,6 @@
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
 import java.nio.ByteBuffer;
-
 import org.opendaylight.lispflowmapping.lisp.serializer.address.factory.LispAddressSerializerFactory;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
 import org.opendaylight.lispflowmapping.lisp.util.AddressTypeMap;
@@ -85,6 +84,19 @@ public class LispAddressSerializer {
         throw new LispSerializationException("Unimplemented method");
     }
 
+    public int getAddressSize(LispAddress lispAddress) {
+        int size = Length.AFI;
+        if (lispAddress.getVirtualNetworkId() != null) {
+            size += getInstanceIdExtraSize();
+        }
+        LispAddressSerializer serializer = LispAddressSerializerFactory.getSerializer(lispAddress.getAddressType());
+        if (serializer == null) {
+            throw new LispSerializationException("Unknown address type: "
+                    + lispAddress.getAddressType().getSimpleName());
+        }
+        return size + serializer.getAddressSize(lispAddress);
+    }
+
     protected InstanceIdType getVni(LispAddressSerializerContext ctx) {
         if (ctx != null) {
             return ctx.getVni();
@@ -115,32 +127,20 @@ public class LispAddressSerializer {
         InstanceIdSerializer.getInstance().serializeNonLcafAddress(buffer, lispAddress);
     }
 
-    public int getAddressSize(LispAddress lispAddress) {
-        int size = Length.AFI;
-        if (lispAddress.getVirtualNetworkId() != null) {
-            size += getInstanceIdExtraSize();
-        }
-        LispAddressSerializer serializer = LispAddressSerializerFactory.getSerializer(lispAddress.getAddressType());
-        if (serializer == null) {
-            throw new LispSerializationException("Unknown address type: "
-                    + lispAddress.getAddressType().getSimpleName());
-        }
-        return size + serializer.getAddressSize(lispAddress);
-    }
-
     int getInstanceIdExtraSize() {
-        return LcafSerializer.getInstance().getLcafHeaderSize() +
-                InstanceIdSerializer.getInstance().getInstanceIdSize() +
-                Length.AFI;
+        return LcafSerializer.getInstance().getLcafHeaderSize()
+                + InstanceIdSerializer.getInstance().getInstanceIdSize()
+                Length.AFI;
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     public Eid deserializeEid(ByteBuffer buffer, LispAddressSerializerContext ctx) {
         short afi = buffer.getShort();
         // AddressTypeMap indexes IPv4 and IPv6 prefixes (vs simple addresses) with the negative AFI values -1 and -2
         if ((afi == 1 || afi == 2) && ctx.getMaskLen() != LispAddressSerializerContext.MASK_LEN_MISSING) {
             afi *= -1;
         }
-        Class <? extends LispAddressFamily> addressType = AddressTypeMap.getAddressType(afi);
+        Class<? extends LispAddressFamily> addressType = AddressTypeMap.getAddressType(afi);
         LispAddressSerializer serializer = LispAddressSerializerFactory.getSerializer(addressType);
         if (serializer == null) {
             throw new LispSerializationException("Unknown AFI: " + afi);
@@ -152,9 +152,10 @@ public class LispAddressSerializer {
         }
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     public Rloc deserializeRloc(ByteBuffer buffer) {
         short afi = buffer.getShort();
-        Class <? extends LispAddressFamily> addressType = AddressTypeMap.getAddressType(afi);
+        Class<? extends LispAddressFamily> addressType = AddressTypeMap.getAddressType(afi);
         LispAddressSerializer serializer = LispAddressSerializerFactory.getSerializer(addressType);
         if (serializer == null) {
             throw new LispSerializationException("Unknown AFI: " + afi);
index 6b22f61c3299232f5a8ead2f12b7d68984c77347..14d3ddd55af5a0abee8382c7ec1c3c64085b0e38 100644 (file)
@@ -10,6 +10,8 @@ package org.opendaylight.lispflowmapping.lisp.serializer.address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.InstanceIdType;
 
 /**
+ * Class to pass around (de)serialization context information.
+ *
  * @author Lorand Jakab
  *
  */
index c0fd96b4b6d6cfac4dc80507a17fab59de338120..7a20b3a0982b0c217f18fa52d2c9c5316db16e8c 100644 (file)
@@ -8,15 +8,14 @@
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
 import java.nio.ByteBuffer;
-
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.afn.safi.rev130704.AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.IetfYangUtil;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.LispAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.MacAfi;
 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.lisp.address.address.Mac;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.MacBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.IetfYangUtil;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.EidBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc;
index 07b13290ff53ead259fc9a43273e178dd819c20d..fdd0f2f5d35ac873e7b026a3d4da075070d93f3b 100644 (file)
@@ -23,6 +23,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.ei
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.EidBuilder;
 
 /**
+ * Class to (de)serialize Service Path data type.
+ *
  * @author Lorand Jakab
  *
  */
index ed86c46d352c9da521966dae14d5313e3ae7cfeb..4f77e63004f0b85ebcfd88d685c8813d6be43d83 100644 (file)
@@ -8,7 +8,6 @@
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
 import java.nio.ByteBuffer;
-
 import org.opendaylight.lispflowmapping.lisp.serializer.address.factory.LispAddressSerializerFactory;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
 import org.opendaylight.lispflowmapping.lisp.util.AddressTypeMap;
@@ -16,6 +15,8 @@ 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.SimpleAddress;
 
 /**
+ * Class to (de)serialize addresses that can be used in an LCAF.
+ *
  * @author Lorand Jakab
  *
  */
@@ -44,14 +45,15 @@ public class SimpleAddressSerializer {
         serializer.serializeData(buffer, address);
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     public SimpleAddress deserialize(ByteBuffer buffer, LispAddressSerializerContext ctx) {
         short afi = buffer.getShort();
         // AddressTypeMap indexes IPv4 and IPv6 prefixes (vs simple addresses) with the negative AFI values -1 and -2
-        if ((afi == 1 || afi == 2) && ctx != null &&
-                ctx.getMaskLen() != LispAddressSerializerContext.MASK_LEN_MISSING) {
+        if ((afi == 1 || afi == 2) && ctx != null
+                && ctx.getMaskLen() != LispAddressSerializerContext.MASK_LEN_MISSING) {
             afi *= -1;
         }
-        Class <? extends LispAddressFamily> addressType = AddressTypeMap.getAddressType(afi);
+        Class<? extends LispAddressFamily> addressType = AddressTypeMap.getAddressType(afi);
         LispAddressSerializer serializer = LispAddressSerializerFactory.getSerializer(addressType);
         if (serializer == null) {
             throw new LispSerializationException("Unknown AFI: " + afi);
index c6e58f0a587053206c67732f4adcbb76bae065c4..bb0fbd4668dbaadf502e28e0d64dbfdf528d69fe 100644 (file)
@@ -9,7 +9,6 @@ package org.opendaylight.lispflowmapping.lisp.serializer.address.factory;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.opendaylight.lispflowmapping.lisp.serializer.address.AfiListSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.ApplicationDataSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.DistinguishedNameSerializer;
@@ -18,6 +17,7 @@ import org.opendaylight.lispflowmapping.lisp.serializer.address.InstanceIdSerial
 import org.opendaylight.lispflowmapping.lisp.serializer.address.Ipv4BinarySerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.Ipv4PrefixBinarySerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.Ipv4PrefixSerializer;
+import org.opendaylight.lispflowmapping.lisp.serializer.address.Ipv4Serializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.Ipv6BinarySerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.Ipv6PrefixBinarySerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.Ipv6PrefixSerializer;
@@ -25,7 +25,6 @@ import org.opendaylight.lispflowmapping.lisp.serializer.address.Ipv6Serializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.KeyValueAddressSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LcafSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer;
-import org.opendaylight.lispflowmapping.lisp.serializer.address.Ipv4Serializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.MacSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.NoAddressSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.ServicePathSerializer;
@@ -52,7 +51,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.typ
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv6PrefixBinaryAfi;
 
 /**
- * Factory for LispAddress (de)serializers
+ * Factory for LispAddress (de)serializers.
  *
  * @author Lorand Jakab
  *
index 94dec8af977b5b305c122640f191342dea909abb..33d6e22ec1d54348e862b688e7a25506fedc20b1 100644 (file)
@@ -23,7 +23,7 @@ public enum LispCanonicalAddressFormatEnum {
 
     private byte lispCode;
 
-    private LispCanonicalAddressFormatEnum(int lispCode) {
+    LispCanonicalAddressFormatEnum(int lispCode) {
         this.lispCode = (byte) lispCode;
     }
 
index 440ab34bcd82f38b83c48fb291b2ecbb7c6d3d29..17997bdcf575a816ea9bb823bc3fb247cbbaf135 100644 (file)
@@ -36,7 +36,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.typ
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv6PrefixBinaryAfi;
 
 /**
- * This class contains static HashMaps of AFIs and LCAF types to LispAddressFamily identities
+ * This class contains static HashMaps of AFIs and LCAF types to LispAddressFamily identities.
  *
  * @author Lorand Jakab
  *
@@ -93,7 +93,7 @@ public final class AddressTypeMap {
         return lcafToAddressTypeMap.get(lcafType);
     }
 
-    public static Class <? extends LispAddressFamily> getSimpleAddressInnerType(SimpleAddress address) {
+    public static Class<? extends LispAddressFamily> getSimpleAddressInnerType(SimpleAddress address) {
         if (address == null) {
             return null;
         } else if (address.getIpAddress() != null) {
index 8d22c0b790ae72fa780bfe5577f08aed0f0525d9..1b4061084bc0523cb1ab841f9936d45ca448052d 100644 (file)
@@ -12,7 +12,7 @@ import java.nio.ByteBuffer;
 
 public final class ByteUtil {
 
-    final protected static char[] hexArray = "0123456789ABCDEF".toCharArray();
+    protected static final char[] HEX_ARRAY = "0123456789ABCDEF".toCharArray();
 
     // Utility class, should not be instantiated
     private ByteUtil() {
@@ -54,16 +54,16 @@ public final class ByteUtil {
         return buffer.getInt();
     }
 
-    public static short asUnsignedByte(byte b) {
-        return (short) ((short) b & 0xFF);
+    public static short asUnsignedByte(byte byteArg) {
+        return (short) ((short) byteArg & 0xFF);
     }
 
-    public static int asUnsignedShort(short s) {
-        return s & 0xFFFF;
+    public static int asUnsignedShort(short shortArg) {
+        return shortArg & 0xFFFF;
     }
 
-    public static long asUnsignedInteger(int i) {
-        return i & 0xFFFFFFFF;
+    public static long asUnsignedInteger(int intArg) {
+        return intArg & 0xFFFFFFFF;
     }
 
     public static byte[] partialIntToByteArray(int number, int length) {
@@ -89,10 +89,10 @@ public final class ByteUtil {
 
     public static String bytesToHex(byte[] bytes, int length) {
         char[] hexChars = new char[length * 2];
-        for ( int j = 0; j < length; j++ ) {
-            int v = bytes[j] & 0xFF;
-            hexChars[j * 2] = hexArray[v >>> 4];
-            hexChars[j * 2 + 1] = hexArray[v & 0x0F];
+        for (int j = 0; j < length; j++) {
+            int vv = bytes[j] & 0xFF;
+            hexChars[j * 2] = HEX_ARRAY[vv >>> 4];
+            hexChars[j * 2 + 1] = HEX_ARRAY[vv & 0x0F];
         }
         return new String(hexChars);
     }
index d846d55ec19cd7fe858e72c1f4614cc90723bbd6..5e5ad815b5c821cc8f7c135892643b0dd23312a8 100644 (file)
@@ -7,11 +7,13 @@
  */
 package org.opendaylight.lispflowmapping.lisp.util;
 
+import com.google.common.base.Preconditions;
+import com.google.common.io.BaseEncoding;
+import com.google.common.net.InetAddresses;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.UnknownHostException;
 import java.util.List;
-
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.LispAddress;
 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.lisp.address.Address;
@@ -28,10 +30,10 @@ 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.lisp.address.address.KeyValueAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Mac;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.NoAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ServicePath;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.SourceDestKey;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.explicit.locator.path.Hop;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.explicit.locator.path.Hop.LrsBits;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ServicePath;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4Binary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4PrefixBinary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv6Binary;
@@ -40,10 +42,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.Xt
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Preconditions;
-import com.google.common.io.BaseEncoding;
-import com.google.common.net.InetAddresses;
-
 /**
  * Utility class with static methods returning string representations of
  * supported LISP address types, both for use in URLs and for user friendly
@@ -56,11 +54,13 @@ public class LispAddressStringifier {
     protected static final Logger LOG = LoggerFactory.getLogger(LispAddressStringifier.class);
 
     private static final String PREFIX_SEPARATOR = ":";
+
     /*
      * In the unlikely event that a AFI 0 address is used a key, we use a
      * sequence number to ensure uniqueness
      */
     protected static int noAddrSeq = 0;
+
     /*
      * There are three possible destinations for rendering an address as a
      * string:
@@ -82,20 +82,20 @@ public class LispAddressStringifier {
         return getAddrString(Destination.USER, lispAddress);
     }
 
-    public static String getURIString(LispAddress lispAddress) {
-        return getAddrString(Destination.URI, lispAddress);
+    public static String getString(XtrId xtrId) {
+        return getXtrIdString(xtrId);
     }
 
-    public static String getURLString(LispAddress lispAddress) {
-        return getAddrString(Destination.URL, lispAddress);
+    public static String getURIString(LispAddress lispAddress) {
+        return getAddrString(Destination.URI, lispAddress);
     }
 
-    public static String getString(XtrId xtrId) {
+    public static String getURIString(XtrId xtrId) {
         return getXtrIdString(xtrId);
     }
 
-    public static String getURIString(XtrId xtrId) {
-        return getXtrIdString(xtrId);
+    public static String getURLString(LispAddress lispAddress) {
+        return getAddrString(Destination.URL, lispAddress);
     }
 
     public static String getURLString(XtrId xtrId) {
@@ -283,6 +283,7 @@ public class LispAddressStringifier {
         // AFI = 18; Autonomous System Number
         return "AS" + addr.getAsNumber().getValue();
     }
+
     protected static String getStringFromAfiList(Destination dst, AfiList addr) {
         // AFI 16387, LCAF Type 1; Address List
         // Example rendering:
index 83b0ffc7906e5dfd9fdd1a2a3f6990d5195025d3..e8f238eea48f1964ccd58a863d51e29d08965ece 100644 (file)
@@ -9,17 +9,16 @@ package org.opendaylight.lispflowmapping.lisp.util;
 
 import com.google.common.base.Preconditions;
 import com.google.common.net.InetAddresses;
-
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
-
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
+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.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
@@ -56,6 +55,15 @@ 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.lisp.address.address.MacBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.NoAddressBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ServicePathBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.ExplicitLocatorPathBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.explicit.locator.path.Hop;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.explicit.locator.path.Hop.LrsBits;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.explicit.locator.path.HopBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.key.value.address.KeyValueAddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.service.path.ServicePath;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.source.dest.key.SourceDestKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.source.dest.key.SourceDestKeyBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv4AddressBinary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv6AddressBinary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv4BinaryAfi;
@@ -76,16 +84,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.lo
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecordBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.RlocBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.key.value.address.KeyValueAddressBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.service.path.ServicePath;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.source.dest.key.SourceDestKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.source.dest.key.SourceDestKeyBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.ExplicitLocatorPathBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.explicit.locator.path.Hop;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.explicit.locator.path.Hop.LrsBits;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.explicit.locator.path.HopBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -277,6 +275,7 @@ public final class LispAddressUtil {
             return (Address) new AsNumberBuilder().setAsNumber(address).build();
         }
     }
+
     public static Rloc toRloc(SimpleAddress address) {
         RlocBuilder builder = new RlocBuilder();
         builder.setAddressType(addressTypeFromSimpleAddress(address));
@@ -373,19 +372,59 @@ public final class LispAddressUtil {
         return builder.build();
     }
 
-    // XXX getMapping rcp fails if VNI set to 0
-    public static Eid toEidNoVni(IpPrefix prefix) {
+    public static Eid toEid(IpPrefix prefix, InstanceIdType vni) {
         EidBuilder builder = new EidBuilder();
         builder.setAddress(addressFromIpPrefix(prefix));
         builder.setAddressType(addressTypeFromIpPrefix(prefix));
+        builder.setVirtualNetworkId(vni);
         return builder.build();
     }
 
-    public static Eid toEid(IpPrefix prefix, InstanceIdType vni) {
+    public static Eid toEid(Ipv6Address address, InstanceIdType vni) {
+        EidBuilder builder = new EidBuilder();
+        builder.setAddressType(Ipv6Afi.class);
+        builder.setVirtualNetworkId(vni);
+        builder.setAddress((Address) 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.setVirtualNetworkId(vni);
+        builder.setAddress((Address) 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.setVirtualNetworkId(vni);
+        builder.setAddress((Address) 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.setVirtualNetworkId(vni);
+        builder.setAddress((Address) 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.setVirtualNetworkId(vni);
+        builder.setAddress((Address) new Ipv6PrefixBuilder().setIpv6Prefix(prefix).build());
+        return builder.build();
+    }
+
+    // XXX getMapping rcp fails if VNI set to 0
+    public static Eid toEidNoVni(IpPrefix prefix) {
         EidBuilder builder = new EidBuilder();
         builder.setAddress(addressFromIpPrefix(prefix));
         builder.setAddressType(addressTypeFromIpPrefix(prefix));
-        builder.setVirtualNetworkId(vni);
         return builder.build();
     }
 
@@ -410,10 +449,23 @@ public final class LispAddressUtil {
         return asIpv4PrefixEid(prefix, null);
     }
 
+    public static Eid asIpv4PrefixEid(Ipv4Address addr, InstanceIdType vni) {
+        return toEid(new IpPrefix(IetfInetUtil.INSTANCE.ipv4PrefixFor(addr)), vni);
+    }
+
     public static Eid asIpv4PrefixEid(final String prefix, final InstanceIdType iiType) {
         return toEid(new Ipv4Prefix(prefix), iiType);
     }
 
+    public static Eid asIpv4PrefixEid(Eid eid, Inet4Address address, short mask) {
+        EidBuilder builder = new EidBuilder();
+        builder.setAddressType(Ipv4PrefixAfi.class);
+        builder.setVirtualNetworkId(eid.getVirtualNetworkId());
+        builder.setAddress(new Ipv4PrefixBuilder().setIpv4Prefix(
+                IetfInetUtil.INSTANCE.ipv4PrefixFor(address, mask)).build());
+        return builder.build();
+    }
+
     public static Eid asIpv4PrefixBinaryEid(final String prefix) {
         return asIpv4PrefixBinaryEid(prefix, null);
     }
@@ -426,32 +478,27 @@ public final class LispAddressUtil {
                 .setIpv4MaskLength(mask).build(), iiType);
     }
 
-    public static Eid asIpv4Eid(String address) {
-        return toEid(new Ipv4AddressBinary(InetAddresses.forString(address).getAddress()), null);
-    }
-
-    public static Eid toEid(Ipv6Prefix prefix, InstanceIdType vni) {
+    public static Eid asIpv4PrefixBinaryEid(Eid eid, byte[] address, short mask) {
+        Preconditions.checkArgument(address.length == 4,
+                "asIpv4PrefixBinaryEid called with incorrect length byte array ({})", address.length);
         EidBuilder builder = new EidBuilder();
-        builder.setAddressType(Ipv6PrefixAfi.class);
-        builder.setVirtualNetworkId(vni);
-        builder.setAddress((Address) new Ipv6PrefixBuilder().setIpv6Prefix(prefix).build());
+        builder.setAddressType(Ipv4PrefixBinaryAfi.class);
+        builder.setVirtualNetworkId(eid.getVirtualNetworkId());
+        builder.setAddress(new Ipv4PrefixBinaryBuilder().setIpv4AddressBinary(new Ipv4AddressBinary(address))
+                .setIpv4MaskLength(mask).build());
         return builder.build();
     }
 
-    public static Eid toEid(Ipv6Address address, InstanceIdType vni) {
-        EidBuilder builder = new EidBuilder();
-        builder.setAddressType(Ipv6Afi.class);
-        builder.setVirtualNetworkId(vni);
-        builder.setAddress((Address) new Ipv6Builder().setIpv6(address).build());
-        return builder.build();
+    public static Eid asIpv4Eid(String address) {
+        return toEid(new Ipv4AddressBinary(InetAddresses.forString(address).getAddress()), null);
     }
 
-    public static Eid toEid(Ipv6AddressBinary address, InstanceIdType vni) {
-        EidBuilder builder = new EidBuilder();
-        builder.setAddressType(Ipv6BinaryAfi.class);
-        builder.setVirtualNetworkId(vni);
-        builder.setAddress((Address) new Ipv6BinaryBuilder().setIpv6Binary(address).build());
-        return builder.build();
+    public static Eid asIpv4Eid(String address, long vni) {
+        return toEid(new Ipv4AddressBinary(InetAddresses.forString(address).getAddress()), new InstanceIdType(vni));
+    }
+
+    public static Eid asIpv6Eid(String address) {
+        return toEid(new Ipv6AddressBinary(InetAddresses.forString(address).getAddress()), null);
     }
 
     public static Eid asIpv6Eid(String address, long vni) {
@@ -462,8 +509,17 @@ public final class LispAddressUtil {
         return toEid(new Ipv6Prefix(prefix), null);
     }
 
-    public static Eid asIpv6Eid(String address) {
-        return toEid(new Ipv6AddressBinary(InetAddresses.forString(address).getAddress()), null);
+    public static Eid asIpv6PrefixEid(Ipv6Address addr, InstanceIdType vni) {
+        return toEid(new IpPrefix(IetfInetUtil.INSTANCE.ipv6PrefixFor(addr)), vni);
+    }
+
+    public static Eid asIpv6PrefixEid(Eid eid, Inet6Address address, short mask) {
+        EidBuilder builder = new EidBuilder();
+        builder.setAddressType(Ipv6PrefixAfi.class);
+        builder.setVirtualNetworkId(eid.getVirtualNetworkId());
+        builder.setAddress(new Ipv6PrefixBuilder().setIpv6Prefix(
+                IetfInetUtil.INSTANCE.ipv6PrefixFor(address, mask)).build());
+        return builder.build();
     }
 
     public static Eid asIpv6PrefixBinaryEid(final String prefix) {
@@ -478,8 +534,15 @@ public final class LispAddressUtil {
                 .setIpv6MaskLength(mask).build(), iiType);
     }
 
-    public static Eid asIpv4Eid(String address, long vni) {
-        return toEid(new Ipv4AddressBinary(InetAddresses.forString(address).getAddress()), new InstanceIdType(vni));
+    public static Eid asIpv6PrefixBinaryEid(Eid eid, byte[] address, short mask) {
+        Preconditions.checkArgument(address.length == 16,
+                "asIpv6PrefixBinaryEid called with incorrect length byte array ({})", address.length);
+        EidBuilder builder = new EidBuilder();
+        builder.setAddressType(Ipv6PrefixBinaryAfi.class);
+        builder.setVirtualNetworkId(eid.getVirtualNetworkId());
+        builder.setAddress(new Ipv6PrefixBinaryBuilder().setIpv6AddressBinary(new Ipv6AddressBinary(address))
+                .setIpv6MaskLength(mask).build());
+        return builder.build();
     }
 
     public static Eid asBinaryEid(SimpleAddress address, InstanceIdType iid) {
@@ -515,61 +578,13 @@ public final class LispAddressUtil {
         int version = ipVersionFromString(addr);
         if (version == 4 && (mask >= 0 && mask <= 32)) {
             return new IpPrefix(new Ipv4Prefix(addr + "/" + mask));
-        } else if (version == 6 && (mask >=0 && mask <= 128)) {
+        } else if (version == 6 && (mask >= 0 && mask <= 128)) {
             return new IpPrefix(new Ipv6Prefix(addr + "/" + mask));
         } else {
             return null;
         }
     }
 
-    public static Eid asIpv4PrefixEid(Ipv4Address addr, InstanceIdType vni) {
-        return toEid(new IpPrefix(IetfInetUtil.INSTANCE.ipv4PrefixFor(addr)), vni);
-    }
-
-    public static Eid asIpv6PrefixEid(Ipv6Address addr, InstanceIdType vni) {
-        return toEid(new IpPrefix(IetfInetUtil.INSTANCE.ipv6PrefixFor(addr)), vni);
-    }
-
-    public static Eid asIpv4PrefixEid(Eid eid, Inet4Address address, short mask) {
-        EidBuilder builder = new EidBuilder();
-        builder.setAddressType(Ipv4PrefixAfi.class);
-        builder.setVirtualNetworkId(eid.getVirtualNetworkId());
-        builder.setAddress(new Ipv4PrefixBuilder().setIpv4Prefix(
-                IetfInetUtil.INSTANCE.ipv4PrefixFor(address, mask)).build());
-        return builder.build();
-    }
-
-    public static Eid asIpv6PrefixEid(Eid eid, Inet6Address address, short mask) {
-        EidBuilder builder = new EidBuilder();
-        builder.setAddressType(Ipv6PrefixAfi.class);
-        builder.setVirtualNetworkId(eid.getVirtualNetworkId());
-        builder.setAddress(new Ipv6PrefixBuilder().setIpv6Prefix(
-                IetfInetUtil.INSTANCE.ipv6PrefixFor(address, mask)).build());
-        return builder.build();
-    }
-
-    public static Eid asIpv4PrefixBinaryEid(Eid eid, byte[] address, short mask) {
-        Preconditions.checkArgument(address.length == 4,
-                "asIpv4PrefixBinaryEid called with incorrect length byte array ({})", address.length);
-        EidBuilder builder = new EidBuilder();
-        builder.setAddressType(Ipv4PrefixBinaryAfi.class);
-        builder.setVirtualNetworkId(eid.getVirtualNetworkId());
-        builder.setAddress(new Ipv4PrefixBinaryBuilder().setIpv4AddressBinary(new Ipv4AddressBinary(address))
-                .setIpv4MaskLength(mask).build());
-        return builder.build();
-    }
-
-    public static Eid asIpv6PrefixBinaryEid(Eid eid, byte[] address, short mask) {
-        Preconditions.checkArgument(address.length == 16,
-                "asIpv6PrefixBinaryEid called with incorrect length byte array ({})", address.length);
-        EidBuilder builder = new EidBuilder();
-        builder.setAddressType(Ipv6PrefixBinaryAfi.class);
-        builder.setVirtualNetworkId(eid.getVirtualNetworkId());
-        builder.setAddress(new Ipv6PrefixBinaryBuilder().setIpv6AddressBinary(new Ipv6AddressBinary(address))
-                .setIpv6MaskLength(mask).build());
-        return builder.build();
-    }
-
     public static Eid asServicePathEid(long vni, long servicePathId, short serviceIndex) {
         EidBuilder eb = new EidBuilder();
         eb.setAddressType(ServicePathLcaf.class);
@@ -585,14 +600,6 @@ public final class LispAddressUtil {
         return eb.setAddress(addressFromServicePath(spb.build())).build();
     }
 
-    public static Eid toEid(MacAddress mac, InstanceIdType vni) {
-        EidBuilder builder = new EidBuilder();
-        builder.setAddressType(MacAfi.class);
-        builder.setVirtualNetworkId(vni);
-        builder.setAddress((Address) new MacBuilder().setMac(mac).build());
-        return builder.build();
-    }
-
     public static Eid asMacEid(String address, long vni) {
         return toEid(new MacAddress(address), new InstanceIdType(vni));
     }
@@ -601,14 +608,6 @@ public final class LispAddressUtil {
         return toEid(new MacAddress(address), null);
     }
 
-    public static Eid toEid(DistinguishedNameType dn, InstanceIdType vni) {
-        EidBuilder builder = new EidBuilder();
-        builder.setAddressType(DistinguishedNameAfi.class);
-        builder.setVirtualNetworkId(vni);
-        builder.setAddress((Address) new DistinguishedNameBuilder().setDistinguishedName(dn).build());
-        return builder.build();
-    }
-
     public static Eid asDistinguishedNameEid(String address, long vni) {
         return toEid(new MacAddress(address), new InstanceIdType(vni));
     }
@@ -678,11 +677,6 @@ public final class LispAddressUtil {
     }
 
     public static Rloc asTeLcafRloc(List<IpAddress> hopList) {
-        RlocBuilder teBuilder = new RlocBuilder();
-        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
-                .lisp.address.address.ExplicitLocatorPathBuilder elpBuilder =
-                new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
-                .lisp.address.address.ExplicitLocatorPathBuilder();
         ExplicitLocatorPathBuilder teAddrBuilder = new ExplicitLocatorPathBuilder();
         teAddrBuilder.setHop(new ArrayList<Hop>());
         for (IpAddress hop : hopList) {
@@ -693,7 +687,13 @@ public final class LispAddressUtil {
             teAddrBuilder.getHop().add(hopBuilder.build());
         }
 
+        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
+            .lisp.address.address.ExplicitLocatorPathBuilder elpBuilder =
+            new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
+            .lisp.address.address.ExplicitLocatorPathBuilder();
         elpBuilder.setExplicitLocatorPath(teAddrBuilder.build());
+
+        RlocBuilder teBuilder = new RlocBuilder();
         teBuilder.setAddress(elpBuilder.build());
         teBuilder.setAddressType(ExplicitLocatorPathLcaf.class);
         return teBuilder.build();
@@ -742,13 +742,6 @@ public final class LispAddressUtil {
         return pb.build();
     }
 
-    private static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
-            .lisp.address.address.Ipv4Prefix convertFromBinary(Ipv4PrefixBinary prefix) {
-        return new Ipv4PrefixBuilder().setIpv4Prefix(IetfInetUtil.INSTANCE.ipv4PrefixFor(
-                prefix.getIpv4AddressBinary().getValue(),
-                prefix.getIpv4MaskLength())).build();
-    }
-
     private static Ipv6PrefixBinary convertToBinary(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf
             .lisp.address.types.rev151105.lisp.address.address.Ipv6Prefix prefix) {
         Ipv6PrefixBinaryBuilder pb = new Ipv6PrefixBinaryBuilder();
@@ -758,33 +751,16 @@ public final class LispAddressUtil {
         return pb.build();
     }
 
-    private static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
-            .lisp.address.address.Ipv6Prefix convertFromBinary(Ipv6PrefixBinary prefix) {
-        return new Ipv6PrefixBuilder().setIpv6Prefix(IetfInetUtil.INSTANCE.ipv6PrefixFor(
-                prefix.getIpv6AddressBinary().getValue(),
-                prefix.getIpv6MaskLength())).build();
-}
-
     private static Ipv4Binary convertToBinary(Ipv4 address) {
         byte[] addr = InetAddresses.forString(address.getIpv4().getValue()).getAddress();
         return new Ipv4BinaryBuilder().setIpv4Binary(new Ipv4AddressBinary(addr)).build();
     }
 
-    private static Ipv4 convertFromBinary(Ipv4Binary address) {
-        return new Ipv4Builder().setIpv4(IetfInetUtil.INSTANCE.ipv4AddressFor(address.getIpv4Binary().getValue()))
-                .build();
-    }
-
     private static Ipv6Binary convertToBinary(Ipv6 address) {
         byte[] addr = InetAddresses.forString(address.getIpv6().getValue()).getAddress();
         return new Ipv6BinaryBuilder().setIpv6Binary(new Ipv6AddressBinary(addr)).build();
     }
 
-    private static Ipv6 convertFromBinary(Ipv6Binary address) {
-        return new Ipv6Builder().setIpv6(IetfInetUtil.INSTANCE.ipv6AddressFor(address.getIpv6Binary().getValue()))
-                .build();
-    }
-
     private static Pair<Class<? extends LispAddressFamily>, Address> convertToBinary(Address addr) {
         Address convAddr = null;
         Class<? extends LispAddressFamily> convType = null;
@@ -808,6 +784,52 @@ public final class LispAddressUtil {
         return new ImmutablePair<Class<? extends LispAddressFamily>, Address>(convType, convAddr);
     }
 
+    public static Eid convertToBinary(Eid eid) {
+        Pair<Class<? extends LispAddressFamily>, Address> converted = convertToBinary(eid.getAddress());
+        if (converted.getRight() == null) {
+            return eid;
+        }
+        EidBuilder eb = new EidBuilder(eid);
+        eb.setAddressType(converted.getLeft());
+        eb.setAddress(converted.getRight());
+        return eb.build();
+    }
+
+    public static Rloc convertToBinary(Rloc rloc) {
+        Pair<Class<? extends LispAddressFamily>, Address> converted = convertToBinary(rloc.getAddress());
+        if (converted.getRight() == null) {
+            return rloc;
+        }
+        RlocBuilder rb = new RlocBuilder(rloc);
+        rb.setAddressType(converted.getLeft());
+        rb.setAddress(converted.getRight());
+        return rb.build();
+    }
+
+    private static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
+            .lisp.address.address.Ipv4Prefix convertFromBinary(Ipv4PrefixBinary prefix) {
+        return new Ipv4PrefixBuilder().setIpv4Prefix(IetfInetUtil.INSTANCE.ipv4PrefixFor(
+                prefix.getIpv4AddressBinary().getValue(),
+                prefix.getIpv4MaskLength())).build();
+    }
+
+    private static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
+            .lisp.address.address.Ipv6Prefix convertFromBinary(Ipv6PrefixBinary prefix) {
+        return new Ipv6PrefixBuilder().setIpv6Prefix(IetfInetUtil.INSTANCE.ipv6PrefixFor(
+                prefix.getIpv6AddressBinary().getValue(),
+                prefix.getIpv6MaskLength())).build();
+    }
+
+    private static Ipv4 convertFromBinary(Ipv4Binary address) {
+        return new Ipv4Builder().setIpv4(IetfInetUtil.INSTANCE.ipv4AddressFor(address.getIpv4Binary().getValue()))
+                .build();
+    }
+
+    private static Ipv6 convertFromBinary(Ipv6Binary address) {
+        return new Ipv6Builder().setIpv6(IetfInetUtil.INSTANCE.ipv6AddressFor(address.getIpv6Binary().getValue()))
+                .build();
+    }
+
     private static Pair<Class<? extends LispAddressFamily>, Address> convertFromBinary(Address addr) {
         Address convAddr = null;
         Class<? extends LispAddressFamily> convType = null;
@@ -827,17 +849,6 @@ public final class LispAddressUtil {
         return new ImmutablePair<Class<? extends LispAddressFamily>, Address>(convType, convAddr);
     }
 
-    public static Eid convertToBinary(Eid eid) {
-        Pair<Class<? extends LispAddressFamily>, Address> converted = convertToBinary(eid.getAddress());
-        if (converted.getRight() == null) {
-            return eid;
-        }
-        EidBuilder eb = new EidBuilder(eid);
-        eb.setAddressType(converted.getLeft());
-        eb.setAddress(converted.getRight());
-        return eb.build();
-    }
-
     public static Eid convertFromBinary(Eid eid) {
         Pair<Class<? extends LispAddressFamily>, Address> converted = convertFromBinary(eid.getAddress());
         if (converted.getRight() == null) {
@@ -849,17 +860,6 @@ public final class LispAddressUtil {
         return eb.build();
     }
 
-    public static Rloc convertToBinary(Rloc rloc) {
-        Pair<Class<? extends LispAddressFamily>, Address> converted = convertToBinary(rloc.getAddress());
-        if (converted.getRight() == null) {
-            return rloc;
-        }
-        RlocBuilder rb = new RlocBuilder(rloc);
-        rb.setAddressType(converted.getLeft());
-        rb.setAddress(converted.getRight());
-        return rb.build();
-    }
-
     public static Rloc convertFromBinary(Rloc rloc) {
         Pair<Class<? extends LispAddressFamily>, Address> converted = convertFromBinary(rloc.getAddress());
         if (converted.getRight() == null) {
@@ -872,10 +872,10 @@ public final class LispAddressUtil {
     }
 
     public static boolean addressNeedsConversionToBinary(Address address) {
-        if (address instanceof Ipv4 || address instanceof Ipv6 ||
-                address instanceof org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf
-                        .lisp.address.types.rev151105.lisp.address.address.Ipv4Prefix ||
-                address instanceof org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf
+        if (address instanceof Ipv4 || address instanceof Ipv6
+                || address instanceof org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf
+                        .lisp.address.types.rev151105.lisp.address.address.Ipv4Prefix
+                || address instanceof org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf
                         .lisp.address.types.rev151105.lisp.address.address.Ipv6Prefix) {
             return true;
         }
@@ -883,33 +883,32 @@ public final class LispAddressUtil {
     }
 
     public static boolean addressNeedsConversionFromBinary(Address address) {
-        if (address instanceof Ipv4Binary || address instanceof Ipv6Binary ||
-                address instanceof Ipv4PrefixBinary || address instanceof Ipv6PrefixBinary) {
+        if (address instanceof Ipv4Binary || address instanceof Ipv6Binary
+                || address instanceof Ipv4PrefixBinary || address instanceof Ipv6PrefixBinary) {
             return true;
         }
         return false;
     }
 
-    public static int compareIpAddressByteArrays(byte[] a, byte[] b) {
-        int i;
-        if (a.length < b.length) {
+    public static int compareIpAddressByteArrays(byte[] one, byte[] two) {
+        if (one.length < two.length) {
             return -1;
-        } else if (a.length > b.length) {
+        } else if (one.length > two.length) {
             return 1;
-        } else if (a.length == 4 && b.length == 4) {
-            for (i = 0; i < 4; i++) {
-                if (a[i] < b[i]) {
+        } else if (one.length == 4 && two.length == 4) {
+            for (int i = 0; i < 4; i++) {
+                if (one[i] < two[i]) {
                     return -1;
-                } else if (a[i] > b[i]) {
+                } else if (one[i] > two[i]) {
                     return 1;
                 }
             }
             return 0;
-        } else if (a.length == 16 && b.length == 16) {
-            for (i = 0; i < 16; i++) {
-                if (a[i] < b[i]) {
+        } else if (one.length == 16 && two.length == 16) {
+            for (int i = 0; i < 16; i++) {
+                if (one[i] < two[i]) {
                     return -1;
-                } else if (a[i] > b[i]) {
+                } else if (one[i] > two[i]) {
                     return 1;
                 }
             }
index 3599de34f241f1d814a03457de03a82f88732d25..6833cbaf268880c95548103910947f8f89f97713 100644 (file)
@@ -7,14 +7,13 @@
  */
 package org.opendaylight.lispflowmapping.lisp.util;
 
+import com.google.common.base.Preconditions;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier.Destination;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SimpleAddress;
 
-import com.google.common.base.Preconditions;
-
 /**
  * Utility class with static methods returning string representations of
- * supported LISP simple address types
+ * supported LISP simple address types.
  *
  * @author Lorand Jakab
  *
index 207cb96b8d1da1f00c6d86e617f0807898c420d9..6fa17c40c69efe76190e3540aa97970c3f535ffb 100644 (file)
@@ -63,7 +63,7 @@ public final class MaskUtil {
         return false;
     }
 
-    private static final int slashPosition(final String prefix) {
+    private static int slashPosition(final String prefix) {
         final int slash = prefix.lastIndexOf('/');
         Preconditions.checkArgument(slash >= 0, "Argument %s does not contain a slash", prefix);
         return slash;
@@ -181,13 +181,13 @@ public final class MaskUtil {
 
     private static byte[] normalizeByteArray(byte[] address, short maskLength) {
         ByteBuffer byteRepresentation = ByteBuffer.wrap(address);
-        byte b = (byte) 0xff;
+        byte byteMask = (byte) 0xff;
         int mask = maskLength;
         for (int i = 0; i < byteRepresentation.array().length; i++) {
             if (mask >= 8) {
-                byteRepresentation.put(i, (byte) (b & byteRepresentation.get(i)));
+                byteRepresentation.put(i, (byte) (byteMask & byteRepresentation.get(i)));
             } else if (mask > 0) {
-                byteRepresentation.put(i, (byte) ((byte) (b << (8 - mask)) & byteRepresentation.get(i)));
+                byteRepresentation.put(i, (byte) ((byte) (byteMask << (8 - mask)) & byteRepresentation.get(i)));
             } else {
                 byteRepresentation.put(i, (byte) (0 & byteRepresentation.get(i)));
             }
@@ -209,13 +209,6 @@ public final class MaskUtil {
         }
     }
 
-    public static short getMaskForAddress(SimpleAddress address) {
-        if (address.getIpPrefix() == null) {
-            return -1;
-        }
-        return getMaskForIpPrefix(address.getIpPrefix());
-    }
-
     private static String getIpPrefixString(IpPrefix prefix) {
         if (prefix.getIpv4Prefix() != null) {
             return prefix.getIpv4Prefix().getValue();
@@ -242,6 +235,13 @@ public final class MaskUtil {
         return getPrefixAddress(prefix.getIpv6Prefix().getValue());
     }
 
+    public static short getMaskForAddress(SimpleAddress address) {
+        if (address.getIpPrefix() == null) {
+            return -1;
+        }
+        return getMaskForIpPrefix(address.getIpPrefix());
+    }
+
     public static short getMaskForAddress(Address address) {
         if (address instanceof Ipv4) {
             return IPV4_MAX_MASK;
index fc530a36c57201f937bbc841031695d826fe4518..1c1083837ae6c853dbfac546ceb7cb12b48f80f9 100644 (file)
@@ -15,6 +15,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
+ * Helper methods for Source/Dest Key type LCAF addresses.
+ *
  * @author Lorand Jakab
  *
  */
@@ -24,7 +26,8 @@ public final class SourceDestKeyHelper {
     private SourceDestKeyHelper() {
     }
 
-    private final static Logger LOG = LoggerFactory.getLogger(SourceDestKeyHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SourceDestKeyHelper.class);
+
     public static Eid getSrc(Eid eid) {
         Address addr = eid.getAddress();
         if (addr instanceof SourceDestKey) {
index 50f01ebfec380188496a26d61c41f3d6be79c27e..92ee16448e9554fa76e9f05289a79dfb70af3def 100644 (file)
@@ -7,28 +7,26 @@
  */
 package org.opendaylight.lispflowmapping.lisp.authentication;
 
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
-
 import junitx.framework.ArrayAssert;
-
 import org.junit.Test;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapNotifySerializer;
-import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapRegisterSerializer;
+import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
 import org.opendaylight.lispflowmapping.tools.junit.BaseTestCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapRegister;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecord;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapnotifymessage.MapNotifyBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkeyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecordBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list.MappingRecordItem;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list.MappingRecordItemBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkeyBuilder;
 
 public class LispAuthenticationTest extends BaseTestCase {
     private static final String PASSWORD = "password";
index 6fc9b8007c1d802befabb50b7a7e877b9f278040..2dac55a67e3576e23362e938dfec3ced597d6bef 100644 (file)
@@ -23,9 +23,9 @@ public class LispMACAuthenticationTest {
     private static final String KEY = "pass";
     private static final String ALGORITHM = LispKeyIDEnum.SHA1.getAuthenticationName();
     private static final String MAP_REQUEST_PACKET =
-            "10 00 00 01 3d 8d 2a cd 39 c8 d6 " +
-            "08 00 01 01 02 03 04 00 01 7f 00 " +
-            "00 02 00 20 00 01 7f 00 00 01";
+            "10 00 00 01 3d 8d 2a cd 39 c8 d6 "
+          + "08 00 01 01 02 03 04 00 01 7f 00 "
+          + "00 02 00 20 00 01 7f 00 00 01";
 
     private static int macLength;
     private static byte[] expectedAuthData;
index a77e87ada1cac8c4ef90616e9dc159edca1a6923..d9281f0b3f3e6b6a4cf1c42358f3eb6e443d2d70 100644 (file)
@@ -11,10 +11,8 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 import com.google.common.io.BaseEncoding;
-
 import java.util.ArrayList;
 import java.util.List;
-
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
@@ -29,83 +27,47 @@ 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.LispAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.ServicePathIdType;
 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.lisp.address.address
-        .AfiList;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .AfiListBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .ApplicationData;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .ApplicationDataBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .AsNumberBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .DistinguishedName;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .DistinguishedNameBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .ExplicitLocatorPath;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .ExplicitLocatorPathBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .InstanceId;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .InstanceIdBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .Ipv4;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .Ipv4Builder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .Ipv4PrefixBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .Ipv6;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .Ipv6Builder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .Ipv6PrefixBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .KeyValueAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .KeyValueAddressBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .Mac;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .MacBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .NoAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .NoAddressBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .ServicePath;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .ServicePathBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .SourceDestKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .SourceDestKeyBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .explicit.locator.path.explicit.locator.path.Hop;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .explicit.locator.path.explicit.locator.path.HopBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .explicit.locator.path.explicit.locator.path.HopKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.AfiList;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.AfiListBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ApplicationData;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ApplicationDataBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.AsNumberBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.DistinguishedName;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.DistinguishedNameBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ExplicitLocatorPath;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ExplicitLocatorPathBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.InstanceId;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.InstanceIdBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4Builder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4PrefixBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv6;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv6Builder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv6PrefixBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.KeyValueAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.KeyValueAddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Mac;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.MacBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.NoAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.NoAddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ServicePath;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ServicePathBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.SourceDestKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.SourceDestKeyBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.explicit.locator.path.Hop;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.explicit.locator.path.HopBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.explicit.locator.path.HopKey;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv4AddressBinary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv6AddressBinary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4Binary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4BinaryBuilder;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv4PrefixBinary;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv4PrefixBinaryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4PrefixBinary;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4PrefixBinaryBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv6Binary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv6BinaryBuilder;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv6PrefixBinary;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv6PrefixBinaryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv6PrefixBinary;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv6PrefixBinaryBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.EidBuilder;
 
@@ -138,7 +100,7 @@ public class LispAddressStringifierTest {
 
     // Ipv6Binary
     private static final byte[] IPV6_BYTES = new byte[]
-            {17, 17, 34, 34, 51, 51, 68, 68, 85, 85, 102, 102, 119, 119, -120, -120};
+        {17, 17, 34, 34, 51, 51, 68, 68, 85, 85, 102, 102, 119, 119, -120, -120};
     private static final Ipv6AddressBinary IPV6_ADDRESS_BINARY = new Ipv6AddressBinary(IPV6_BYTES);
     private static final Ipv6Binary IPV6_BINARY = new Ipv6BinaryBuilder().setIpv6Binary(IPV6_ADDRESS_BINARY).build();
     private static final LispAddress LISP_IPV6_BINARY = new EidBuilder().setAddress(IPV6_BINARY).build();
@@ -472,20 +434,20 @@ public class LispAddressStringifierTest {
     private static String getStringFromExplicLocPath() {
         StringBuilder sb = new StringBuilder();
         sb.append("{")
-        .append(IPV4_STRING)
-        .append("|")
-        .append("l")
-        .append("p")
-        .append("s")
+            .append(IPV4_STRING)
+            .append("|")
+            .append("l")
+            .append("p")
+            .append("s")
 
-        .append("->")
+            .append("->")
 
-        .append(IPV6_STRING)
-        .append("|")
-        .append("l")
-        .append("p")
-        .append("s")
-        .append("}");
+            .append(IPV6_STRING)
+            .append("|")
+            .append("l")
+            .append("p")
+            .append("s")
+            .append("}");
 
         return sb.toString();
     }
@@ -504,8 +466,8 @@ public class LispAddressStringifierTest {
     private static String getStringFromSrcDstKey() {
         StringBuilder sb = new StringBuilder();
         sb.append(IPV4_STRING)
-        .append("|")
-        .append(IPV6_STRING);
+            .append("|")
+            .append(IPV6_STRING);
 
         return sb.toString();
     }
index 6707b805fbe1772440b0583a1224a6432f88ffd3..137ff4ca8252c70ff119b8a49fbac6a864d50394 100644 (file)
@@ -15,13 +15,13 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import com.google.common.net.InetAddresses;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Arrays;
 import java.util.List;
-
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
@@ -33,8 +33,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.AsNumberAfi;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.DistinguishedNameAfi;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.DistinguishedNameType;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
-        .ExplicitLocatorPathLcaf;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.ExplicitLocatorPathLcaf;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.InstanceIdType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.Ipv4Afi;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.Ipv4PrefixAfi;
@@ -50,40 +49,22 @@ 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.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;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .DistinguishedName;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .ExplicitLocatorPath;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .Ipv4;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .Ipv4Builder;
-
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.Ipv4PrefixBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .Ipv6;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .Ipv6Builder;
-
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.Ipv6PrefixBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .KeyValueAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .Mac;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .MacBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .NoAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .explicit.locator.path.explicit.locator.path.Hop;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .service.path.ServicePath;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .source.dest.key.SourceDestKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address
-        .source.dest.key.SourceDestKeyBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.DistinguishedName;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ExplicitLocatorPath;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4Builder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4PrefixBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv6;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv6Builder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv6PrefixBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.KeyValueAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Mac;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.MacBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.NoAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.explicit.locator.path.Hop;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.service.path.ServicePath;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.source.dest.key.SourceDestKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.source.dest.key.SourceDestKeyBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv4AddressBinary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv6AddressBinary;
@@ -91,30 +72,18 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.typ
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv4PrefixBinaryAfi;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv6BinaryAfi;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv6PrefixBinaryAfi;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv4Binary;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv4BinaryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv4PrefixBinary;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv4PrefixBinaryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv6Binary;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv6BinaryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv6PrefixBinary;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv6PrefixBinaryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4Binary;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4BinaryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4PrefixBinary;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4PrefixBinaryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv6Binary;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv6BinaryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv6PrefixBinary;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv6PrefixBinaryBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.EidBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecord;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc;
-
-import com.google.common.net.InetAddresses;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.RlocBuilder;
 
 public class LispAddressUtilTest {
@@ -175,9 +144,9 @@ public class LispAddressUtilTest {
             .setAddressType(Ipv4BinaryAfi.class).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};
+        15, 16};
     private static final byte[] IPV6_ADDRESS_BYTES_B_TEST = new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
-            15, 17};
+        15, 17};
     private static final String IPV6_ADDRESS_VALUE_TEST = "102:304:506:708:90a:b0c:d0e:f10";
     private static final String IPV6_ADDRESS_PREFIX_VALUE_TEST = IPV6_ADDRESS_VALUE_TEST + "/" + MASK_OK_TEST;
     private static final Ipv6Prefix IPV6_ADDRESS_PREFIX_TEST = new Ipv6Prefix(IPV6_ADDRESS_PREFIX_VALUE_TEST);
@@ -207,29 +176,29 @@ public class LispAddressUtilTest {
     private static final Long DUMMY_SERVICE_PATH_ID_TYPE = 46L;
     private static final String DISTINGUISHED_NAME_TYPE_VALUE_TEST = "dummy distinguished name type";
     private static final String DISTINGUISHED_NAME_TYPE_VALUE_WITH_MAC_TEST = MAC_ADDRESS_VALUE_TEST;
-    private static final DistinguishedNameType DISTINGUISHED_NAME_TYPE_TEST = new DistinguishedNameType
-            (DISTINGUISHED_NAME_TYPE_VALUE_TEST);
+    private static final DistinguishedNameType DISTINGUISHED_NAME_TYPE_TEST = new DistinguishedNameType(
+            DISTINGUISHED_NAME_TYPE_VALUE_TEST);
 
     private static final SimpleAddress SIMPLE_ADDRESS_IPV4_TEST = new SimpleAddress(IP_ADDRESS_IPV4_TEST);
     private static final SimpleAddress SIMPLE_ADDRESS_IPV6_TEST = new SimpleAddress(IP_ADDRESS_IPV6_TEST);
     private static final SimpleAddress SIMPLE_ADDRESS_MAC_TEST = new SimpleAddress(MAC_ADDRESS_TEST);
     private static final SimpleAddress SIMPLE_ADDRESS_DISTINGUISHED_TEST =
             new SimpleAddress(DISTINGUISHED_NAME_TYPE_TEST);
-    private static final SimpleAddress SIMPLE_ADDRESS_IPV4_PREFIX_TEST = new SimpleAddress
-            (IP_ADDRESS_PREFIX_WITH_IPV4_TEST);
-    private static final SimpleAddress SIMPLE_ADDRESS_IPV6_PREFIX_TEST = new SimpleAddress
-            (IP_ADDRESS_PREFIX_WITH_IPV6_TEST);
+    private static final SimpleAddress SIMPLE_ADDRESS_IPV4_PREFIX_TEST = new SimpleAddress(
+            IP_ADDRESS_PREFIX_WITH_IPV4_TEST);
+    private static final SimpleAddress SIMPLE_ADDRESS_IPV6_PREFIX_TEST = new SimpleAddress(
+            IP_ADDRESS_PREFIX_WITH_IPV6_TEST);
     private static final Long SERVICE_PATH_ID_TEST = 2121L;
 
     /**
      * Tests {@link LispAddressUtil#addressTypeFromSimpleAddress} and {@link
      * LispAddressUtil#addressFromSimpleAddress} methods
-     * with ipAddress
+     * with ipAddress.
      */
     @Test
     public void addressFromSimpleAddressTest_asAnyIpAddress() {
-        final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress
-                (SIMPLE_ADDRESS_IPV4_TEST);
+        final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress(
+                SIMPLE_ADDRESS_IPV4_TEST);
         assertEquals(Ipv4BinaryAfi.class, addressClass);
 
         final Address address = LispAddressUtil.addressFromSimpleAddress(SIMPLE_ADDRESS_IPV4_TEST);
@@ -239,14 +208,14 @@ public class LispAddressUtilTest {
     /**
      * Tests {@link LispAddressUtil#addressTypeFromSimpleAddress} and {@link
      * LispAddressUtil#addressFromSimpleAddress} methods
-     * with ipPrefix
+     * with ipPrefix.
      */
     @Test
     public void addressFromSimpleAddressTest_asIpPrefix() {
         final SimpleAddress simpleAddress = new SimpleAddress(new IpPrefix(new Ipv4Prefix(
                 IPV4_ADDRESS_PREFIX_VALUE_TEST)));
-        final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress
-                (simpleAddress);
+        final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress(
+                simpleAddress);
         assertEquals(Ipv4PrefixAfi.class, addressClass);
 
         final Address address = LispAddressUtil.addressFromSimpleAddress(simpleAddress);
@@ -257,13 +226,13 @@ public class LispAddressUtilTest {
     /**
      * Tests {@link LispAddressUtil#addressTypeFromSimpleAddress} and {@link
      * LispAddressUtil#addressFromSimpleAddress} methods
-     * with mac address
+     * with mac address.
      */
     @Test
     public void addressFromSimpleAddressTest_asMacAddress() {
         final SimpleAddress simpleAddress = new SimpleAddress(new MacAddress(MAC_ADDRESS_VALUE_TEST));
-        final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress
-                (simpleAddress);
+        final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress(
+                simpleAddress);
         assertEquals(MacAfi.class, addressClass);
 
         final Address address = LispAddressUtil.addressFromSimpleAddress(simpleAddress);
@@ -273,13 +242,13 @@ public class LispAddressUtilTest {
     /**
      * Tests {@link LispAddressUtil#addressTypeFromSimpleAddress} and {@link
      * LispAddressUtil#addressFromSimpleAddress} methods
-     * with general address
+     * with general address.
      */
     @Test
     public void addressFromSimpleAddressTest_asAddress() {
         final SimpleAddress simpleAddress = new SimpleAddress(DUMMY_CHARACTER_ARRAY_TEST);
-        final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress
-                (simpleAddress);
+        final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress(
+                simpleAddress);
         assertEquals(DistinguishedNameAfi.class, addressClass);
 
         final Address address = LispAddressUtil.addressFromSimpleAddress(simpleAddress);
@@ -289,13 +258,13 @@ public class LispAddressUtilTest {
     /**
      * Tests {@link LispAddressUtil#addressTypeFromSimpleAddress} and {@link
      * LispAddressUtil#addressFromSimpleAddress} methods
-     * with address as number
+     * with address as number.
      */
     @Test
     public void addressFromSimpleAddressTest_asNumber() {
         final SimpleAddress simpleAddress = new SimpleAddress(new AsNumber(NUMBER_TEST));
-        final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress
-                (simpleAddress);
+        final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress(
+                simpleAddress);
         assertEquals(AsNumberAfi.class, addressClass);
 
         final Address address = LispAddressUtil.addressFromSimpleAddress(simpleAddress);
@@ -306,9 +275,7 @@ public class LispAddressUtilTest {
     /**
      * Tests {@link LispAddressUtil#addressFromInet(InetAddress)} and {@link LispAddressUtil#addressTypeFromInet
      * (InetAddress)}
-     * methods with ipv4 address
-     *
-     * @throws UnknownHostException
+     * methods with ipv4 address.
      */
     @Test
     public void addressFromInet_ipv4() throws UnknownHostException {
@@ -324,9 +291,7 @@ public class LispAddressUtilTest {
     /**
      * Tests {@link LispAddressUtil#addressFromInet(InetAddress)} and {@link LispAddressUtil#addressTypeFromInet
      * (InetAddress)}
-     * methods with ipv6 address
-     *
-     * @throws UnknownHostException
+     * methods with ipv6 address.
      */
     @Test
     public void addressFromInet_ipv6() throws UnknownHostException {
@@ -341,9 +306,7 @@ public class LispAddressUtilTest {
 
     /**
      * Tests {@link LispAddressUtil#binaryAddressFromInet(InetAddress)} and
-     * {@link LispAddressUtil#binaryAddressTypeFromInet(InetAddress)} methods with ipv4 address
-     *
-     * @throws UnknownHostException
+     * {@link LispAddressUtil#binaryAddressTypeFromInet(InetAddress)} methods with ipv4 address.
      */
     @Test
     public void binaryAddressFromInet_ipv4() throws UnknownHostException {
@@ -358,9 +321,7 @@ public class LispAddressUtilTest {
 
     /**
      * Tests {@link LispAddressUtil#binaryAddressFromInet(InetAddress)} and
-     * {@link LispAddressUtil#binaryAddressTypeFromInet(InetAddress)} methods with ipv6 address
-     *
-     * @throws UnknownHostException
+     * {@link LispAddressUtil#binaryAddressTypeFromInet(InetAddress)} methods with ipv6 address.
      */
     @Test
     public void binaryAddressFromInet_ipv6() throws UnknownHostException {
@@ -376,7 +337,7 @@ public class LispAddressUtilTest {
     /**
      * Tests {@link LispAddressUtil#addressFromIpAddress(IpAddress)} and {@link
      * LispAddressUtil#addressTypeFromIpAddress(IpAddress)}
-     * methods with ipv4 address
+     * methods with ipv4 address.
      */
     @Test
     public void addressFromIpAddress_ipv4() {
@@ -392,7 +353,7 @@ public class LispAddressUtilTest {
     /**
      * Tests {@link LispAddressUtil#addressFromIpAddress(IpAddress)} and {@link
      * LispAddressUtil#addressTypeFromIpAddress(IpAddress)}
-     * methods with ipv6 address
+     * methods with ipv6 address.
      */
     @Test
     public void addressFromIpAddress_ipv6() {
@@ -468,7 +429,7 @@ public class LispAddressUtilTest {
     /**
      * Tests {@link LispAddressUtil#addressFromIpPrefix(IpPrefix)} and {@link
      * LispAddressUtil#addressTypeFromIpPrefix(IpPrefix)}
-     * methods with ipv4 address
+     * methods with ipv4 address.
      */
     @Test
     public void addressFromIpPrefix_ipv4() {
@@ -477,16 +438,16 @@ public class LispAddressUtilTest {
         assertEquals(Ipv4PrefixAfi.class, addressClass);
 
         final Address address = LispAddressUtil.addressFromIpPrefix(ipv4Prefix);
-        assertTrue(address instanceof org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.
-                types.rev151105.lisp.address.address.Ipv4Prefix);
-        assertEquals(IPV4_ADDRESS_PREFIX_VALUE_TEST, ((org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.
-                lisp.address.types.rev151105.lisp.address.address.Ipv4Prefix) address).getIpv4Prefix().getValue());
+        assertTrue(address instanceof org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address
+                .types.rev151105.lisp.address.address.Ipv4Prefix);
+        assertEquals(IPV4_ADDRESS_PREFIX_VALUE_TEST, ((org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf
+                .lisp.address.types.rev151105.lisp.address.address.Ipv4Prefix) address).getIpv4Prefix().getValue());
     }
 
     /**
      * Tests {@link LispAddressUtil#addressFromIpPrefix(IpPrefix)} and {@link
      * LispAddressUtil#addressTypeFromIpPrefix(IpPrefix)}
-     * methods with ipv6 address
+     * methods with ipv6 address.
      */
     @Test
     public void addressFromIpPrefix_ipv6() {
@@ -537,7 +498,7 @@ public class LispAddressUtilTest {
 
 
     /**
-     * Test {@link LispAddressUtil#addressFromServicePath(ServicePath)} method with concrete servicePath
+     * Test {@link LispAddressUtil#addressFromServicePath(ServicePath)} method with concrete servicePath.
      */
     @Test
     public void addressFromServicePathTest_withServicePath() {
@@ -557,7 +518,7 @@ public class LispAddressUtilTest {
     }
 
     /**
-     * Test {@link LispAddressUtil#addressFromServicePath(ServicePath)} method with null value
+     * Test {@link LispAddressUtil#addressFromServicePath(ServicePath)} method with null value.
      */
     @Test
     public void addressFromServicePathTest_withNull() {
@@ -566,7 +527,7 @@ public class LispAddressUtilTest {
     }
 
     /**
-     * Test {@link LispAddressUtil#addressFromDistinguishedName(DistinguishedNameType)} method with distinguished name }
+     * Test {@link LispAddressUtil#addressFromDistinguishedName(DistinguishedNameType)} method with distinguished name.
      */
     @Test
     public void addressFromDistinguishedNameTest_withDistinguishedName() {
@@ -579,7 +540,7 @@ public class LispAddressUtilTest {
     }
 
     /**
-     * Test {@link LispAddressUtil#addressFromDistinguishedName(DistinguishedNameType)} method with null value }
+     * Test {@link LispAddressUtil#addressFromDistinguishedName(DistinguishedNameType)} method with null value.
      */
     @Test
     public void addressFromDistinguishedNameTest_withNull() {
@@ -588,7 +549,7 @@ public class LispAddressUtilTest {
     }
 
     /**
-     * Test {@link LispAddressUtil#addressFromAsNumber(AsNumber)} method with as number value }
+     * Test {@link LispAddressUtil#addressFromAsNumber(AsNumber)} method with as number value.
      */
     @Test
     public void addressFromAsNumberTest_withAdNumber() {
@@ -601,7 +562,7 @@ public class LispAddressUtilTest {
     }
 
     /**
-     * Test {@link LispAddressUtil#addressFromAsNumber(AsNumber)} method with null instead of value }
+     * Test {@link LispAddressUtil#addressFromAsNumber(AsNumber)} method with null instead of value.
      */
     @Test
     public void addressFromAsNumberTest_withNull() {
@@ -847,8 +808,8 @@ public class LispAddressUtilTest {
         eidFromDistinguishedName = LispAddressUtil.asDistinguishedNameEid(DISTINGUISHED_NAME_TYPE_VALUE_TEST);
         verifyToEidWithDistinguishedName(eidFromDistinguishedName, false);
 
-        eidFromDistinguishedName = LispAddressUtil.asDistinguishedNameEid
-                (DISTINGUISHED_NAME_TYPE_VALUE_WITH_MAC_TEST, INSTANCE_ID_TYPE_VALUE_TEST);
+        eidFromDistinguishedName = LispAddressUtil.asDistinguishedNameEid(
+                DISTINGUISHED_NAME_TYPE_VALUE_WITH_MAC_TEST, INSTANCE_ID_TYPE_VALUE_TEST);
         verifyToEidWithMacAddress(eidFromDistinguishedName, true);
     }
 
@@ -972,7 +933,7 @@ public class LispAddressUtilTest {
     }
 
     /**
-     * Tests {@link LispAddressUtil#asIpPrefix(String, int)} with ipv4 address and correct mask
+     * Tests {@link LispAddressUtil#asIpPrefix(String, int)} with ipv4 address and correct mask.
      */
     @Test
     public void asIpPrefix_ipv4() {
@@ -984,7 +945,7 @@ public class LispAddressUtilTest {
     }
 
     /**
-     * Tests {@link LispAddressUtil#asIpPrefix(String, int)} with ipv6 address and correct mask
+     * Tests {@link LispAddressUtil#asIpPrefix(String, int)} with ipv6 address and correct mask.
      */
     @Test
     public void asIpPrefix_ipv6() {
@@ -996,7 +957,7 @@ public class LispAddressUtilTest {
     }
 
     /**
-     * Tests {@link LispAddressUtil#asIpPrefix(String, int)} with incorrect ip address and correct mask
+     * Tests {@link LispAddressUtil#asIpPrefix(String, int)} with incorrect ip address and correct mask.
      */
     @Test
     public void asIpPrefix_other() {
@@ -1050,7 +1011,7 @@ public class LispAddressUtilTest {
     }
 
     /**
-     * Tests {@link LispAddressUtil#ipVersionFromString(String)} with ipv4
+     * Tests {@link LispAddressUtil#ipVersionFromString(String)} with ipv4.
      */
     @Test
     public void ipVersionFromString_ipv4() {
@@ -1059,7 +1020,7 @@ public class LispAddressUtilTest {
     }
 
     /**
-     * Tests {@link LispAddressUtil#ipVersionFromString(String)} with ipv6
+     * Tests {@link LispAddressUtil#ipVersionFromString(String)} with ipv6.
      */
     @Test
     public void ipVersionFromString_ipv6() {
@@ -1068,7 +1029,7 @@ public class LispAddressUtilTest {
     }
 
     /**
-     * Tests {@link LispAddressUtil#ipVersionFromString(String)} with incorrect ip address format
+     * Tests {@link LispAddressUtil#ipVersionFromString(String)} with incorrect ip address format.
      */
     @Test
     public void ipVersionFromString_other() {
@@ -1150,8 +1111,8 @@ public class LispAddressUtilTest {
      */
     @Test
     public void asSrcDstEid_addressesAsSrcDstKey() {
-        final SourceDestKey expectedSourceDestKey = new SourceDestKeyBuilder().setSource
-                (SIMPLE_ADDRESS_IPV4_PREFIX_TEST).setDest(SIMPLE_ADDRESS_IPV6_PREFIX_TEST).build();
+        final SourceDestKey expectedSourceDestKey = new SourceDestKeyBuilder().setSource(
+                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());
@@ -1176,11 +1137,11 @@ public class LispAddressUtilTest {
         final List<Hop> hops = ((ExplicitLocatorPath) rloc.getAddress()).getExplicitLocatorPath().getHop();
         assertEquals(hops.size(), ipAddresses.size());
 
-        for(IpAddress ipAddress : ipAddresses) {
-            assertTrue("Ip address "+ipAddress+"should be part of hops list.",isIpAddressInHops(ipAddress, hops));
+        for (IpAddress ipAddress : ipAddresses) {
+            assertTrue("Ip address " + ipAddress + "should be part of hops list.", isIpAddressInHops(ipAddress, hops));
         }
 
-        for(Hop hop : hops) {
+        for (Hop hop : hops) {
             final Hop.LrsBits lrsBits = hop.getLrsBits();
             assertFalse(lrsBits.isLookup());
             assertFalse(lrsBits.isRlocProbe());
@@ -1205,15 +1166,15 @@ public class LispAddressUtilTest {
      */
     @Test
     public void asLocatorRecords() {
-        final List<Rloc> expectedRlocs = Arrays.asList(LispAddressUtil.toRloc(IPV4_ADDRESS_TEST), LispAddressUtil.toRloc
-                (IPV6_ADDRESS_TEST));
+        final List<Rloc> expectedRlocs = Arrays.asList(LispAddressUtil.toRloc(IPV4_ADDRESS_TEST),
+                LispAddressUtil.toRloc(IPV6_ADDRESS_TEST));
         final List<LocatorRecord> locatorRecords = LispAddressUtil.asLocatorRecords(expectedRlocs);
 
         assertEquals(expectedRlocs.size(), locatorRecords.size());
 
         for (Rloc rloc : expectedRlocs) {
-            assertTrue("Rloc " + rloc + " should be part of " +
-                    "locator records list list", isRlocInLocatorRecords(locatorRecords, rloc));
+            assertTrue("Rloc " + rloc + " should be part of "
+                    "locator records list list", isRlocInLocatorRecords(locatorRecords, rloc));
         }
 
         for (LocatorRecord locatorRecord : locatorRecords) {
@@ -1438,8 +1399,8 @@ public class LispAddressUtilTest {
         assertNotNull(eid);
         assertEquals(ServicePathLcaf.class, 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();
+        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();
         assertNotNull(servicePath);
         assertEquals(SERVICE_INDEX_TEST, servicePath.getServiceIndex());
         assertEquals(SERVICE_PATH_ID_TEST, servicePath.getServicePathId().getValue());
index fa7f27dc5a1387330000c7f3419859635b0020fb..e3e26f0ffa3ca276ee18cc3c5703c6d46ca9258e 100644 (file)
@@ -10,6 +10,7 @@ package org.opendaylight.lispflowmapping.lisp.util;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
+import org.mockito.Mockito;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix;
@@ -22,8 +23,6 @@ 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.lisp.address.address.DistinguishedName;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 
-import org.mockito.Mockito;
-
 public class LispSimpleAddressStringifierTest {
 
     private static final String IPV4_ADDRESS_STRING = "127.0.0.1";
index c911a4ebbc16043770debce11f6a814437c41b06..4717d9d5e312039767b37aadaca280a4313da256 100644 (file)
@@ -18,18 +18,13 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.Ipv4Builder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.Ipv4PrefixBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.Ipv6Builder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4Builder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4PrefixBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv6Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv4AddressBinary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv6AddressBinary;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv4BinaryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv6BinaryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4BinaryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv6BinaryBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapRequest;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.maprequest.ItrRlocBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.maprequestmessage.MapRequestBuilder;
index ccd4374975ef4cd267095d9e1c97b762abeab1af..d87912c6e62833de0cda75a8c748436cbaadab2c 100644 (file)
@@ -26,48 +26,34 @@ 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.ServicePathIdType;
 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.lisp.address.Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.InstanceId;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.InstanceIdBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.Ipv4Builder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.Ipv4PrefixBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.Ipv6Builder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.Ipv6PrefixBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.MacBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.ServicePath;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.ServicePathBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.SourceDestKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.SourceDestKeyBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.InstanceId;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.InstanceIdBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4Builder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4PrefixBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv6Builder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv6PrefixBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.MacBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ServicePath;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ServicePathBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.SourceDestKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.SourceDestKeyBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv4AddressBinary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv6AddressBinary;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv4BinaryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv4PrefixBinary;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv4PrefixBinaryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv6BinaryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv6PrefixBinary;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv6PrefixBinaryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4BinaryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4PrefixBinary;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4PrefixBinaryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv6BinaryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv6PrefixBinary;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv6PrefixBinaryBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.EidBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MaskUtilTest {
 
+    protected static final Logger LOG = LoggerFactory.getLogger(MaskUtilTest.class);
     private static final String IPV4_STRING = "255.255.255.255";
     private static final String IPV6_STRING = "1111:2222:3333:4444:5555:6666:7777:8888";
     private static byte[] ipv4ByteAddress;
@@ -82,7 +68,7 @@ public class MaskUtilTest {
             ipv6ByteAddress = Inet6Address.getByName(IPV6_STRING).getAddress();
             ipv6ExpectedByteAddress = Inet6Address.getByName("1111:2222:3333:4444:4000::").getAddress();
         } catch (UnknownHostException e) {
-            e.printStackTrace();
+            LOG.error("Unknow host", e);
         }
     }
 
index bbe47aa5036c2109ca93fb9c5ae767256709ca06..b1537482bb8de30c6029d82764645ce925f8eb3c 100644 (file)
@@ -16,18 +16,13 @@ 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.SimpleAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.Ipv4PrefixBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.SourceDestKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.SourceDestKeyBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4PrefixBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.SourceDestKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.SourceDestKeyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv4AddressBinary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv4PrefixBinaryAfi;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv4PrefixBinary;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv4PrefixBinaryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4PrefixBinary;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4PrefixBinaryBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.EidBuilder;
 
index c099885e9f4e5318bf9e40f246207ca399c333d9..1aeeb8999af0d0e68219a8ee574b7413f91a355c 100644 (file)
@@ -50,8 +50,8 @@ public class MapNotifySerializationTest extends BaseTestCase {
         mnBuilder.setNonce(6161616161L);
         mnBuilder.setKeyId((short) 0x0001);
         byte[] authenticationData = new byte[] { (byte) 0x16, (byte) 0x98, (byte) 0x96, (byte) 0xeb, (byte) 0x88,
-                (byte) 0x2d, (byte) 0x4d, (byte) 0x22, (byte) 0xe5, (byte) 0x8f, (byte) 0xe6, (byte) 0x89, (byte) 0x64,
-                (byte) 0xb9, (byte) 0x17, (byte) 0xa4, (byte) 0xba, (byte) 0x4e, (byte) 0x8c, (byte) 0x41 };
+            (byte) 0x2d, (byte) 0x4d, (byte) 0x22, (byte) 0xe5, (byte) 0x8f, (byte) 0xe6, (byte) 0x89, (byte) 0x64,
+            (byte) 0xb9, (byte) 0x17, (byte) 0xa4, (byte) 0xba, (byte) 0x4e, (byte) 0x8c, (byte) 0x41 };
         mnBuilder.setAuthenticationData(authenticationData);
 
         ByteBuffer bb = MapNotifySerializer.getInstance().serialize(mnBuilder.build());
@@ -91,8 +91,8 @@ public class MapNotifySerializationTest extends BaseTestCase {
         mnBuilder.setNonce(6161616161L);
         mnBuilder.setKeyId((short) 0x0001);
         byte[] authenticationData = new byte[] { (byte) 0x16, (byte) 0x98, (byte) 0x96, (byte) 0xeb, (byte) 0x88,
-                (byte) 0x2d, (byte) 0x4d, (byte) 0x22, (byte) 0xe5, (byte) 0x8f, (byte) 0xe6, (byte) 0x89, (byte) 0x64,
-                (byte) 0xb9, (byte) 0x17, (byte) 0xa4, (byte) 0xba, (byte) 0x4e, (byte) 0x8c, (byte) 0x41 };
+            (byte) 0x2d, (byte) 0x4d, (byte) 0x22, (byte) 0xe5, (byte) 0x8f, (byte) 0xe6, (byte) 0x89, (byte) 0x64,
+            (byte) 0xb9, (byte) 0x17, (byte) 0xa4, (byte) 0xba, (byte) 0x4e, (byte) 0x8c, (byte) 0x41 };
         mnBuilder.setAuthenticationData(authenticationData);
 
         MapNotify mn = mnBuilder.build();
@@ -168,8 +168,8 @@ public class MapNotifySerializationTest extends BaseTestCase {
         mnBuilder.setMappingRecordItem(new ArrayList<MappingRecordItem>());
         mnBuilder.getMappingRecordItem().add(new MappingRecordItemBuilder().setMappingRecord(
                 new MappingRecordBuilder().build()).build());
-        mnBuilder.getMappingRecordItem().add(new MappingRecordItemBuilder().setMappingRecord
-                (new MappingRecordBuilder().setEid(null).build()).build());
+        mnBuilder.getMappingRecordItem().add(new MappingRecordItemBuilder().setMappingRecord(
+                new MappingRecordBuilder().setEid(null).build()).build());
         mnBuilder.getMappingRecordItem().add(new MappingRecordItemBuilder().setMappingRecord(
                 new MappingRecordBuilder().setEid(LispAddressUtil.getNoAddressEid()).build()).build());
 
@@ -312,10 +312,10 @@ public class MapNotifySerializationTest extends BaseTestCase {
 
         assertEquals(4, mn.getMappingRecordItem().size());
 
-        MappingRecord record0 = mn.getMappingRecordItem().get(0).getMappingRecord();
-        MappingRecord record1 = mn.getMappingRecordItem().get(1).getMappingRecord();
-        MappingRecord record2 = mn.getMappingRecordItem().get(2).getMappingRecord();
-        MappingRecord record3 = mn.getMappingRecordItem().get(3).getMappingRecord();
+        final MappingRecord record0 = mn.getMappingRecordItem().get(0).getMappingRecord();
+        final MappingRecord record1 = mn.getMappingRecordItem().get(1).getMappingRecord();
+        final MappingRecord record2 = mn.getMappingRecordItem().get(2).getMappingRecord();
+        final MappingRecord record3 = mn.getMappingRecordItem().get(3).getMappingRecord();
 
         assertEquals(10, record0.getRecordTtl().intValue());
         assertEquals(13, record3.getRecordTtl().intValue());
@@ -396,8 +396,8 @@ public class MapNotifySerializationTest extends BaseTestCase {
         assertEquals(0xFFBB000000000000L, mn.getNonce().longValue());
         assertEquals(0x0001, mn.getKeyId().shortValue());
         byte[] expectedAuthenticationData = { (byte) 0x2c, (byte) 0x61, (byte) 0xb9, (byte) 0xc9, (byte) 0x9a,
-                (byte) 0x20, (byte) 0xba, (byte) 0xd8, (byte) 0xf5, (byte) 0x40, (byte) 0xd3, (byte) 0x55, (byte) 0x6f,
-                (byte) 0x5f, (byte) 0x6e, (byte) 0x5a, (byte) 0xb2, (byte) 0x0a, (byte) 0xbf, (byte) 0xb5 };
+            (byte) 0x20, (byte) 0xba, (byte) 0xd8, (byte) 0xf5, (byte) 0x40, (byte) 0xd3, (byte) 0x55, (byte) 0x6f,
+            (byte) 0x5f, (byte) 0x6e, (byte) 0x5a, (byte) 0xb2, (byte) 0x0a, (byte) 0xbf, (byte) 0xb5 };
         ArrayAssert.assertEquals(expectedAuthenticationData, mn.getAuthenticationData());
     }
 
@@ -427,10 +427,10 @@ public class MapNotifySerializationTest extends BaseTestCase {
         assertEquals(0xFFBB000000000000L, mn.getNonce().longValue());
         assertEquals(0x0002, mn.getKeyId().shortValue());
         byte[] expectedAuthenticationData = { (byte) 0x70, (byte) 0x30, (byte) 0xd4, (byte) 0xc6, (byte) 0x10,
-                (byte) 0x44, (byte) 0x0d, (byte) 0x83, (byte) 0xbe, (byte) 0x4d, (byte) 0xbf, (byte) 0xfd, (byte) 0xa9,
-                (byte) 0x8c, (byte) 0x57, (byte) 0x6d, (byte) 0x68, (byte) 0xa5, (byte) 0xbf, (byte) 0x32, (byte) 0x11,
-                (byte) 0xc9, (byte) 0x7b, (byte) 0x58, (byte) 0xc4, (byte) 0xb9, (byte) 0x9f, (byte) 0x06, (byte) 0x11,
-                (byte) 0x23, (byte) 0xb9, (byte) 0x38 };
+            (byte) 0x44, (byte) 0x0d, (byte) 0x83, (byte) 0xbe, (byte) 0x4d, (byte) 0xbf, (byte) 0xfd, (byte) 0xa9,
+            (byte) 0x8c, (byte) 0x57, (byte) 0x6d, (byte) 0x68, (byte) 0xa5, (byte) 0xbf, (byte) 0x32, (byte) 0x11,
+            (byte) 0xc9, (byte) 0x7b, (byte) 0x58, (byte) 0xc4, (byte) 0xb9, (byte) 0x9f, (byte) 0x06, (byte) 0x11,
+            (byte) 0x23, (byte) 0xb9, (byte) 0x38 };
         ArrayAssert.assertEquals(expectedAuthenticationData, mn.getAuthenticationData());
     }
 }
index 748be3150328fb0251d1f6a68a1099f0af63012f..ce0eec454c2f4f3225cbdfe01c478e50fb010f18 100644 (file)
@@ -57,15 +57,15 @@ public class MapRegisterSerializationTest extends BaseTestCase {
         mrBuilder.setProxyMapReply(true);
         mrBuilder.setXtrSiteIdPresent(true);
         byte[] authenticationData = new byte[] { (byte) 0x16, (byte) 0x98, (byte) 0x96, (byte) 0xeb, (byte) 0x88,
-                (byte) 0x2d, (byte) 0x4d, (byte) 0x22, (byte) 0xe5, (byte) 0x8f, (byte) 0xe6, (byte) 0x89, (byte) 0x64,
-                (byte) 0xb9, (byte) 0x17, (byte) 0xa4, (byte) 0xba, (byte) 0x4e, (byte) 0x8c, (byte) 0x41 };
+            (byte) 0x2d, (byte) 0x4d, (byte) 0x22, (byte) 0xe5, (byte) 0x8f, (byte) 0xe6, (byte) 0x89, (byte) 0x64,
+            (byte) 0xb9, (byte) 0x17, (byte) 0xa4, (byte) 0xba, (byte) 0x4e, (byte) 0x8c, (byte) 0x41 };
         mrBuilder.setAuthenticationData(authenticationData);
         XtrId xtrId  = new XtrId(new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-                (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-                (byte) 0x00, (byte) 0x00, (byte) 0x01 });
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x01 });
         mrBuilder.setXtrId(xtrId);
         SiteId siteId = new SiteId(new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
-                (byte) 0x00, (byte) 0x00, (byte) 0x01 });
+            (byte) 0x00, (byte) 0x00, (byte) 0x01 });
         mrBuilder.setSiteId(siteId);
 
         ByteBuffer bb = MapRegisterSerializer.getInstance().serialize(mrBuilder.build());
@@ -119,8 +119,8 @@ public class MapRegisterSerializationTest extends BaseTestCase {
         mrBuilder.setWantMapNotify(true);
         mrBuilder.setProxyMapReply(true);
         byte[] authenticationData = new byte[] { (byte) 0x16, (byte) 0x98, (byte) 0x96, (byte) 0xeb, (byte) 0x88,
-                (byte) 0x2d, (byte) 0x4d, (byte) 0x22, (byte) 0xe5, (byte) 0x8f, (byte) 0xe6, (byte) 0x89, (byte) 0x64,
-                (byte) 0xb9, (byte) 0x17, (byte) 0xa4, (byte) 0xba, (byte) 0x4e, (byte) 0x8c, (byte) 0x41 };
+            (byte) 0x2d, (byte) 0x4d, (byte) 0x22, (byte) 0xe5, (byte) 0x8f, (byte) 0xe6, (byte) 0x89, (byte) 0x64,
+            (byte) 0xb9, (byte) 0x17, (byte) 0xa4, (byte) 0xba, (byte) 0x4e, (byte) 0x8c, (byte) 0x41 };
         mrBuilder.setAuthenticationData(authenticationData);
 
         MapRegister mapRegister = mrBuilder.build();
@@ -357,10 +357,10 @@ public class MapRegisterSerializationTest extends BaseTestCase {
 
         assertEquals(4, mr.getMappingRecordItem().size());
 
-        MappingRecord record0 = mr.getMappingRecordItem().get(0).getMappingRecord();
-        MappingRecord record1 = mr.getMappingRecordItem().get(1).getMappingRecord();
-        MappingRecord record2 = mr.getMappingRecordItem().get(2).getMappingRecord();
-        MappingRecord record3 = mr.getMappingRecordItem().get(3).getMappingRecord();
+        final MappingRecord record0 = mr.getMappingRecordItem().get(0).getMappingRecord();
+        final MappingRecord record1 = mr.getMappingRecordItem().get(1).getMappingRecord();
+        final MappingRecord record2 = mr.getMappingRecordItem().get(2).getMappingRecord();
+        final MappingRecord record3 = mr.getMappingRecordItem().get(3).getMappingRecord();
 
         assertEquals(10, record0.getRecordTtl().intValue());
         assertEquals(13, record3.getRecordTtl().intValue());
@@ -445,8 +445,8 @@ public class MapRegisterSerializationTest extends BaseTestCase {
         assertEquals(0xFFBB000000000000L, mr.getNonce().longValue());
         assertEquals(0x0001, mr.getKeyId().shortValue());
         byte[] expectedAuthenticationData = { (byte) 0x2c, (byte) 0x61, (byte) 0xb9, (byte) 0xc9, (byte) 0x9a,
-                (byte) 0x20, (byte) 0xba, (byte) 0xd8, (byte) 0xf5, (byte) 0x40, (byte) 0xd3, (byte) 0x55, (byte) 0x6f,
-                (byte) 0x5f, (byte) 0x6e, (byte) 0x5a, (byte) 0xb2, (byte) 0x0a, (byte) 0xbf, (byte) 0xb5 };
+            (byte) 0x20, (byte) 0xba, (byte) 0xd8, (byte) 0xf5, (byte) 0x40, (byte) 0xd3, (byte) 0x55, (byte) 0x6f,
+            (byte) 0x5f, (byte) 0x6e, (byte) 0x5a, (byte) 0xb2, (byte) 0x0a, (byte) 0xbf, (byte) 0xb5 };
         ArrayAssert.assertEquals(expectedAuthenticationData, mr.getAuthenticationData());
     }
 
@@ -479,10 +479,10 @@ public class MapRegisterSerializationTest extends BaseTestCase {
         assertEquals(0xFFBB000000000000L, mr.getNonce().longValue());
         assertEquals(0x0002, mr.getKeyId().shortValue());
         byte[] expectedAuthenticationData = { (byte) 0x70, (byte) 0x30, (byte) 0xd4, (byte) 0xc6, (byte) 0x10,
-                (byte) 0x44, (byte) 0x0d, (byte) 0x83, (byte) 0xbe, (byte) 0x4d, (byte) 0xbf, (byte) 0xfd, (byte) 0xa9,
-                (byte) 0x8c, (byte) 0x57, (byte) 0x6d, (byte) 0x68, (byte) 0xa5, (byte) 0xbf, (byte) 0x32, (byte) 0x11,
-                (byte) 0xc9, (byte) 0x7b, (byte) 0x58, (byte) 0xc4, (byte) 0xb9, (byte) 0x9f, (byte) 0x06, (byte) 0x11,
-                (byte) 0x23, (byte) 0xb9, (byte) 0x38 };
+            (byte) 0x44, (byte) 0x0d, (byte) 0x83, (byte) 0xbe, (byte) 0x4d, (byte) 0xbf, (byte) 0xfd, (byte) 0xa9,
+            (byte) 0x8c, (byte) 0x57, (byte) 0x6d, (byte) 0x68, (byte) 0xa5, (byte) 0xbf, (byte) 0x32, (byte) 0x11,
+            (byte) 0xc9, (byte) 0x7b, (byte) 0x58, (byte) 0xc4, (byte) 0xb9, (byte) 0x9f, (byte) 0x06, (byte) 0x11,
+            (byte) 0x23, (byte) 0xb9, (byte) 0x38 };
         ArrayAssert.assertEquals(expectedAuthenticationData, mr.getAuthenticationData());
     }
 }
index 0e3945179a88aa923e80cfef0b080cbf8706e252..d9181131e6954d0edea0f540d5b2a9ecbaed49ea 100644 (file)
@@ -158,7 +158,7 @@ public class MapReplySerializationTest extends BaseTestCase {
 
         packet.position(24); // EID in first record
         byte[] expected = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x08 };
+            0x08 };
         byte[] actual = new byte[16];
         packet.get(actual);
         ArrayAssert.assertEquals(expected, actual);
index 48a8e7d10cad760fa7d05051c52e6871fa8372b4..606293acf381e71da4dbd01ed58deb029cc9b3fb 100644 (file)
@@ -321,15 +321,16 @@ public class MapRequestSerializationTest extends BaseTestCase {
         mapRequestBuilder.setEidItem(new ArrayList<EidItem>());
         mapRequestBuilder.getEidItem().add(new EidItemBuilder().setEid(LispAddressUtil.asIpv4PrefixEid("1.2.3.4/32"))
                 .build());
-        MapReplyBuilder mapreplyBuilder = new MapReplyBuilder();
-        MappingRecordBuilder recordBuilder = new MappingRecordBuilder();
 
+        MappingRecordBuilder recordBuilder = new MappingRecordBuilder();
         recordBuilder.setEid(LispAddressUtil.asIpv4PrefixEid("0.0.0.1/0"));
         recordBuilder.setLocatorRecord(new ArrayList<LocatorRecord>());
 
         LocatorRecordBuilder locatorBuilder = new LocatorRecordBuilder();
         locatorBuilder.setRloc(LispAddressUtil.asIpv4Rloc("0.0.0.2"));
         recordBuilder.getLocatorRecord().add(locatorBuilder.build());
+
+        MapReplyBuilder mapreplyBuilder = new MapReplyBuilder();
         mapreplyBuilder.setMappingRecord(recordBuilder.build());
         mapRequestBuilder.setMapReply(mapreplyBuilder.build());
 
index 9f26d4350155890bba28c94111cc68b8d52c56a3..98d10bae8eb18daf7c51c5a26c7dfdf323a01959 100644 (file)
@@ -122,21 +122,21 @@ public class AfiListSerializerTest extends BaseTestCase {
 
     @Test
     public void equals__Simple() throws Exception {
-        SimpleAddress ip1 = SimpleAddressBuilder.getDefaultInstance("0:0:0:0:0:0:0:1");
-        SimpleAddress ip2 = SimpleAddressBuilder.getDefaultInstance("0:0:0:0:0:0:0:2");
+        final SimpleAddress ip1 = SimpleAddressBuilder.getDefaultInstance("0:0:0:0:0:0:0:1");
+        final SimpleAddress ip2 = SimpleAddressBuilder.getDefaultInstance("0:0:0:0:0:0:0:2");
 
         AfiListBuilder listBuilder = new AfiListBuilder().setAddressList(new ArrayList<SimpleAddress>());
 
         listBuilder.getAddressList().add(ip1);
-        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
+        final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
                 .lisp.address.address.afi.list.AfiList address1 = listBuilder.build();
         listBuilder.setAddressList(new ArrayList<SimpleAddress>());
         listBuilder.getAddressList().add(ip1);
-        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
+        final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
                 .lisp.address.address.afi.list.AfiList address2 = listBuilder.build();
         listBuilder.setAddressList(new ArrayList<SimpleAddress>());
         listBuilder.getAddressList().add(ip2);
-        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
+        final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
                 .lisp.address.address.afi.list.AfiList address3 = listBuilder.build();
 
         assertEquals(address1, address2);
index fac4cb9c00ce08a9bd16c269a4c700c6d1d27fcb..36e2c6d85b80b7562b01ae569e014da57a017202 100644 (file)
@@ -24,6 +24,8 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.addres
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
 
 /**
+ * Test class for Service Path Serializer.
+ *
  * @author Lorand Jakab
  *
  */
@@ -31,9 +33,9 @@ public class ServicePathTest extends BaseTestCase {
 
     @Test
     public void deserialize__Simple() throws Exception {
-        Eid address = LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("40 03 00 00 " +
-                "11 00 00 04 " +
-                "AA BB CC FF"),
+        Eid address = LispAddressSerializer.getInstance().deserializeEid(hexToByteBuffer("40 03 00 00 "
+                + "11 00 00 04 "
+                "AA BB CC FF"),
                 new LispAddressSerializerContext(null));
         assertEquals(ServicePathLcaf.class, address.getAddressType());
         ServicePath sp = (ServicePath) address.getAddress();
@@ -49,9 +51,9 @@ public class ServicePathTest extends BaseTestCase {
 
         ByteBuffer buf = ByteBuffer.allocate(LispAddressSerializer.getInstance().getAddressSize(eid));
         LispAddressSerializer.getInstance().serialize(buf, eid);
-        ByteBuffer expectedBuf = hexToByteBuffer("40 03 00 00 " +
-                "11 00 00 04 " +
-                "00 00 01 FF");
+        ByteBuffer expectedBuf = hexToByteBuffer("40 03 00 00 "
+                + "11 00 00 04 "
+                "00 00 01 FF");
         ArrayAssert.assertEquals(expectedBuf.array(), buf.array());
     }
 }