Mass remove trailing spaces 73/12173/2
authorLorand Jakab <lojakab@cisco.com>
Wed, 22 Oct 2014 17:50:53 +0000 (20:50 +0300)
committerLorand Jakab <lojakab@cisco.com>
Wed, 29 Oct 2014 06:12:48 +0000 (08:12 +0200)
Change-Id: I50f41f7d6f42f813fbe2a01d4e056bbc2480b83c
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
28 files changed:
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/dao/ILispDAO.java
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/dao/MappingEntry.java
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/dao/MappingValueKey.java
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/lisp/IGeneralMapServer.java
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/type/lisp/EidRecord.java
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/type/lisp/EidToLocatorRecord.java
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/type/lisp/LocatorRecord.java
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/type/lisp/MapNotify.java
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/type/lisp/MapRegister.java
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/type/lisp/MapReply.java
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/type/lisp/MapRequest.java
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/type/lisp/address/LispAddress.java
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/type/lisp/address/LispAddressGeneric.java
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/type/lisp/address/LispMACAddress.java
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/type/lisp/address/ReencapHop.java
mappingservice/clusterdao/src/main/java/org/opendaylight/lispflowmapping/clusterdao/Activator.java
mappingservice/config/src/main/yang/config-lisp.yang
mappingservice/integrationtest/pom.xml
mappingservice/netconf/src/main/yang/lfm-ncc-provider-impl.yang
mappingservice/netconf/src/main/yang/lfm-netconf-connector.yang
mappingservice/neutron/pom.xml
mappingservice/northbound/src/main/java/org/opendaylight/lispflowmapping/northbound/Activator.java
mappingservice/northbound/src/main/java/org/opendaylight/lispflowmapping/northbound/AuthKeyNB.java
mappingservice/northbound/src/main/java/org/opendaylight/lispflowmapping/northbound/ILispmappingNorthbound.java
mappingservice/northbound/src/main/java/org/opendaylight/lispflowmapping/northbound/MapRegisterNB.java
mappingservice/northbound/src/test/java/org/opendaylight/lispflowmapping/northbound/TransformerTest.java
mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/LispXtrSouthboundService.java
mappingservice/yangmodel/src/main/yang/mappingservice.yang

index 4d950ef137413f7393bb99fccbcb04f127664797..82a38da8338b7600750b0c94bdeceefdc141f414 100644 (file)
@@ -14,7 +14,7 @@ public interface ILispDAO {
 
     /**
      * Put a entry into the DAO.
-     * 
+     *
      * @param key
      *            The entry's key.
      * @param values
@@ -24,7 +24,7 @@ public interface ILispDAO {
 
     /**
      * Get a specific value from the DAO.
-     * 
+     *
      * @param key
      *            The key of the value to fetch
      * @param valueKey
@@ -35,7 +35,7 @@ public interface ILispDAO {
 
     /**
      * Get the entries from the DAO
-     * 
+     *
      * @param key
      *            The key.
      * @return The value from the DAO.
@@ -44,7 +44,7 @@ public interface ILispDAO {
 
     /**
      * Enumerate all the entries from the DAO
-     * 
+     *
      * @param visitor
      */
     public void getAll(IRowVisitor visitor);
@@ -56,7 +56,7 @@ public interface ILispDAO {
 
     /**
      * Remove an entry from the DAO
-     * 
+     *
      * @param key
      *            The key of the entry
      * @param valueKey
index 31d8d0d5b6c1f7f15e30605f12cf8187b8fbb2a2..f613b063e5fc366fa2da1ec581c16a25bd1e16e7 100644 (file)
@@ -9,7 +9,7 @@ package org.opendaylight.lispflowmapping.interfaces.dao;
 
 /**
  * A mapping service entry in the DAO
- * 
+ *
  * @param <V>
  *            The type of the mapping key.
  */
index cad6eb748adcc54d8db2b89d4410f5f5e1a1efac..76b436193f4e33f626700fa44797a0804ead150d 100644 (file)
@@ -10,7 +10,7 @@ package org.opendaylight.lispflowmapping.interfaces.dao;
 
 /**
  * A value in the mapping service DAO
- * 
+ *
  * @param <V>
  *            The value type.
  */
index e7ff8ec14962a00996ce2972e6890ce77fb53052..34e69f26ecaa86bc4b0f8989382015aafe59c79e 100644 (file)
@@ -31,7 +31,7 @@ public interface IGeneralMapServer {
 
     /**
      * This method returns the authentication key of the address.
-     * 
+     *
      * @param address
      * @param maskLen
      * @return The correct key.
@@ -46,7 +46,7 @@ public interface IGeneralMapServer {
 
     /**
      * This method removes the given authentication key from the map server.
-     * 
+     *
      * @param address
      * @param maskLen
      * @return
@@ -55,7 +55,7 @@ public interface IGeneralMapServer {
 
     /**
      * This method adds an authentication key to the address.
-     * 
+     *
      * @param address
      * @param maskLen
      * @param key
index b03625178d3ccbee77623e6f1db5906a2c4a4c5a..a5aba933cc7dc9811f6d13b6e4bb3c2d70e2e3a4 100644 (file)
@@ -19,7 +19,7 @@ public class EidRecord {
     /**
      * EID-Prefix-AFI: This is the address family of the EID-Prefix according to
      * [AFI].
-     * 
+     *
      * EID-Prefix: This prefix is 4 octets for an IPv4 address family and 16
      * octets for an IPv6 address family. When a Map-Request is sent by an ITR
      * because a data packet is received for a destination where there is no
index 05296a8bef62b46208657b8352e3b60348e8ac5c..a5863879bcd1066004e0d27e200f3e7c40b84fe3 100644 (file)
@@ -40,9 +40,9 @@ import org.opendaylight.lispflowmapping.type.lisp.address.LispNoAddress;
  *   |  \|                             Locator                           |
  *   +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  * </pre>
- * 
+ *
  * @author gmainzer
- * 
+ *
  */
 
 @XmlRootElement
@@ -98,7 +98,7 @@ public class EidToLocatorRecord {
 
     /**
      * EID-Prefix-AFI: Address family of the EID-Prefix according to [AFI].
-     * 
+     *
      * EID-Prefix: This prefix is 4 octets for an IPv4 address family and 16
      * octets for an IPv6 address family.
      */
@@ -124,7 +124,7 @@ public class EidToLocatorRecord {
      * Locator Count: This is the number of Locator entries. A Locator entry
      * comprises what is labeled above as 'Loc'. The Locator count can be 0,
      * indicating that there are no Locators for the EID-Prefix.
-     * 
+     *
      * private byte locatorCount;
      */
     @XmlElement
index 811180ce74ecc52b17e849c1e9218161fd71d9ef..66274bb35f8c9c77037de5d94e0d21799615c4ca 100644 (file)
@@ -41,9 +41,9 @@ import com.google.common.collect.Range;
  *   |  \|                             Locator                           |
  *   +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  * </pre>
- * 
+ *
  * @author gmainzer
- * 
+ *
  */
 
 @XmlRootElement
@@ -156,7 +156,7 @@ public class LocatorRecord {
     public LocatorRecord setPriority(short priority) {
         if (priority != 0) {
              boolean isValidRange = false;
-             List<Range<Short>> rangeConstraints = new ArrayList<>(); 
+             List<Range<Short>> rangeConstraints = new ArrayList<>();
              rangeConstraints.add(Range.closed(new Short("0"), new Short("255")));
              for (Range<Short> r : rangeConstraints) {
                  if (r.contains(priority)) {
@@ -166,7 +166,7 @@ public class LocatorRecord {
              if (!isValidRange) {
                  throw new IllegalArgumentException(String.format("Invalid range: %s, expected: %s.", priority, rangeConstraints));
              }
-         }    
+         }
          this.priority = priority;
          return this;
     }
@@ -187,7 +187,7 @@ public class LocatorRecord {
     public LocatorRecord setMulticastPriority(short value) {
        if (value != 0) {
             boolean isValidRange = false;
-            List<Range<Short>> rangeConstraints = new ArrayList<>(); 
+            List<Range<Short>> rangeConstraints = new ArrayList<>();
             rangeConstraints.add(Range.closed(new Short("0"), new Short("255")));
             for (Range<Short> r : rangeConstraints) {
                 if (r.contains(value)) {
@@ -197,7 +197,7 @@ public class LocatorRecord {
             if (!isValidRange) {
                 throw new IllegalArgumentException(String.format("Invalid range: %s, expected: %s.", value, rangeConstraints));
             }
-        }    
+        }
         this.multicastPriority = value;
         return this;
     }
index b72fd06913a44c217c509f40bf1b73e206350edd..b3a1e22c0fe892cf8611190701a7aac42a71bdd3 100644 (file)
@@ -42,9 +42,9 @@ import java.util.List;
  *    |  \|                             Locator                           |
  *    +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  * </pre>
- * 
+ *
  * @author gmainzer
- * 
+ *
  */
 public class MapNotify {
 
@@ -99,7 +99,7 @@ public class MapNotify {
      * Record Count: This is the number of records in this Map-Register message.
      * A record is comprised of that portion of the packet labeled 'Record'
      * above and occurs the number of times equal to Record Count.
-     * 
+     *
      * private byte recordCount;
      */
     private List<EidToLocatorRecord> eidToLocatorRecords;
@@ -162,7 +162,7 @@ public class MapNotify {
         eidToLocatorRecords.add(record);
     }
 
-    
+
 
     public void setFromMapRegister(MapRegister mapRegister) {
         setNonce(mapRegister.getNonce());
index f89814d100f1a8928e8f4c1a1f91f3cff42c841f..1c734ba3411ff6d043459d3bc49bf02d0b45ca14 100644 (file)
@@ -46,9 +46,9 @@ import javax.xml.bind.annotation.XmlRootElement;
  *    |  \|                             Locator                           |
  *    +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  * </pre>
- * 
+ *
  * @author gmainzer
- * 
+ *
  */
 
 @XmlRootElement
@@ -115,7 +115,7 @@ public class MapRegister {
      * Record Count: This is the number of records in this Map-Register message.
      * A record is comprised of that portion of the packet labeled 'Record'
      * above and occurs the number of times equal to Record Count.
-     * 
+     *
      * private byte recordCount;
      */
     @XmlElement
index a327367e76079687c50683a47d528d879a396706..bd2b8c78143ccbba0e6881e7bd898d1c7fcec343 100644 (file)
@@ -37,9 +37,9 @@ import java.util.List;
  *   |  \|                             Locator                           |
  *   +-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  * </pre>
- * 
+ *
  * @author gmainzer
- * 
+ *
  */
 public class MapReply {
     /**
@@ -59,7 +59,7 @@ public class MapReply {
      * S: This is the Security bit. When set to 1, the following authentication
      * information will be appended to the end of the Map-Reply. The detailed
      * format of the Authentication Data Content is for further study.
-     * 
+     *
      * <pre>
      *  0                   1                   2                   3
      *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ -82,7 +82,7 @@ public class MapReply {
      * Record Count: This is the number of records in this reply message. A
      * record is comprised of that portion of the packet labeled 'Record' above
      * and occurs the number of times equal to Record Count.
-     * 
+     *
      * private byte recordCount;
      */
     private List<EidToLocatorRecord> eidToLocatorRecords;
@@ -139,5 +139,5 @@ public class MapReply {
         this.eidToLocatorRecords = eidToLocatorRecords;
     }
 
-    
+
 }
index b9365df2a80ec0eaf00707bebe06c715d58c18cb..a7000a7e6cc58cfb06d18a109288137f0ca88caf 100644 (file)
@@ -40,9 +40,9 @@ import org.opendaylight.lispflowmapping.type.lisp.address.LispNoAddress;
  *        |                   Map-Reply RecMapReplyord  ...                       |
  *        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  * </pre>
- * 
+ *
  * @author gmainzer
- * 
+ *
  */
 public class MapRequest {
     /**
@@ -99,7 +99,7 @@ public class MapRequest {
     /**
      * Source-EID-AFI: This is the address family of the 'Source EID Address'
      * field.
-     * 
+     *
      * Source EID Address: This is the EID of the source host that originated
      * the packet that caused the Map-Request. When Map-Requests are used for
      * refreshing a Map-Cache entry or for RLOC-Probing, an AFI value 0 is used
@@ -110,7 +110,7 @@ public class MapRequest {
     /**
      * ITR-RLOC-AFI: This is the address family of the 'ITR-RLOC Address' field
      * that follows this field.
-     * 
+     *
      * ITR-RLOC Address: This is used to give the ETR the option of selecting
      * the destination address from any address family for the Map-Reply
      * message. This address MUST be a routable RLOC address of the sender of
@@ -125,17 +125,17 @@ public class MapRequest {
      * value ranges from 0 to 31. For a value of 0, there is 1 ITR-RLOC address
      * encoded; for a value of 1, there are 2 ITR-RLOC addresses encoded, and so
      * on up to 31, which encodes a total of 32 ITR-RLOC addresses.
-     * 
+     *
      * private byte itrRlocCount;
      */
     private List<LispAddress> itrRlocs;
 
     /**
      * EID mask-len: This is the mask length for the EID-Prefix.
-     * 
+     *
      * EID-Prefix-AFI: This is the address family of the EID-Prefix according to
      * [AFI].
-     * 
+     *
      * EID-Prefix: This prefix is 4 octets for an IPv4 address family and 16
      * octets for an IPv6 address family. When a Map-Request is sent by an ITR
      * because a data packet is received for a destination where there is no
@@ -155,7 +155,7 @@ public class MapRequest {
      * Map-Requests containing one record. Support for requesting multiple EIDs
      * in a single Map-Request message will be specified in a future version of
      * the protocol.
-     * 
+     *
      * private byte recordCount;
      */
     private List<EidRecord> eids;
index a027f4fe7ebd07eb789797a78f502a93781fa3cf..9ca58ec0956e73e71fdcc74485bc7d22843ba49b 100644 (file)
@@ -20,7 +20,7 @@ public abstract class LispAddress {
     public AddressFamilyNumberEnum getAfi() {
         return afi;
     }
-    
+
     @Override
     public int hashCode() {
         final int prime = 31;
index 6378df7b46dda600b10b079ecd36ca1a160f3086..55bb48ec731b16c0aa6beac6cff63a963ae39068 100644 (file)
@@ -24,80 +24,80 @@ public class LispAddressGeneric{
 
        @XmlElement
        int afi;
-       
+
        @XmlElement
        String ipAddress;
-       
+
        @XmlElement
        byte[] mac;
-       
+
        @XmlElement
        int instanceId;
-       
+
        @XmlElement
        int asNum;
-       
+
        @XmlElement
        int lcafType;
-       
+
        @XmlElement
     byte protocol;
-       
+
        @XmlElement
     int ipTos;
-       
+
        @XmlElement
     short localPort;
-       
+
        @XmlElement
     short remotePort;
-       
+
        @XmlElement
     LispAddressGeneric address;
-       
+
        @XmlElement
     LispAddressGeneric srcAddress;
-       
+
        @XmlElement
     LispAddressGeneric dstAddress;
-       
+
        @XmlElement
     byte srcMaskLength;
-       
+
        @XmlElement
     byte dstMaskLength;
-       
+
        @XmlElement
     boolean lookup;
-       
+
        @XmlElement
     boolean RLOCProbe;
-       
+
        @XmlElement
     boolean strict;
-       
+
        @XmlElement
        List<LispAddressGeneric> hops;
-       
+
        @XmlElement
        List<LispAddressGeneric> addresses;
-       
+
        @XmlElement
        String distinguishedName;
-       
-       
+
+
        public LispAddressGeneric(){}
-       
-       
+
+
        public LispAddressGeneric(int afi) {
                this.afi = afi;
        }
-       
+
        public LispAddressGeneric(int afi, String address) {
                this.afi = afi;
-               
+
                AddressFamilyNumberEnum afiEnum = AddressFamilyNumberEnum.valueOf((short) afi);
-               
+
                switch (afiEnum) {
                case AS:
                        asNum = Integer.valueOf(address);
@@ -105,25 +105,25 @@ public class LispAddressGeneric{
                case IP:
                case IP6:
                        ipAddress = address;
-                       break;                  
+                       break;
                default:
-                       throw new IllegalArgumentException("AFI " + afi + 
+                       throw new IllegalArgumentException("AFI " + afi +
                                        " not supported by this constructor: LispAddressGeneric(int afi, String address)");
                }
        }
-       
+
        public LispAddressGeneric(int afi, LispAddressGeneric address) {
                this.afi = afi;
                this.address = address;
        }
-       
-       
 
-       
+
+
+
        public LispAddressGeneric(LispAddress lispAddress) {
-               
+
                afi = lispAddress.getAfi().getIanaCode();
-               
+
                switch (lispAddress.getAfi()){
                case IP:
                        LispIpv4Address ipv4Address = (LispIpv4Address) lispAddress;
@@ -148,7 +148,7 @@ public class LispAddressGeneric{
                case LCAF:
                        LispLCAFAddress lcafAddress = (LispLCAFAddress) lispAddress;
                        lcafType = lcafAddress.getType().getLispCode();
-                       
+
                        switch (lcafAddress.getType()){
                        case APPLICATION_DATA:
                                applicationDataGeneric(lcafAddress);
@@ -166,25 +166,25 @@ public class LispAddressGeneric{
                                trafficEngineeringGeneric(lcafAddress);
                                break;
                        default:
-                               throw new IllegalArgumentException("LCAF type " + lcafAddress.getType() + 
+                               throw new IllegalArgumentException("LCAF type " + lcafAddress.getType() +
                                                " not supported by this constructor: LispAddressGeneric(LispAddress lispAddress)");
                        }
                        break;
                default:
-                       throw new IllegalArgumentException("AFI " + afi + 
+                       throw new IllegalArgumentException("AFI " + afi +
                                        " not supported by this constructor: LispAddressGeneric(LispAddress lispAddress)");
                }
        }
-       
+
        private void applicationDataGeneric(LispLCAFAddress lcafAddress){
-               LispApplicationDataLCAFAddress appDataAddress = (LispApplicationDataLCAFAddress) lcafAddress; 
+               LispApplicationDataLCAFAddress appDataAddress = (LispApplicationDataLCAFAddress) lcafAddress;
            protocol = appDataAddress.getProtocol();
            ipTos = appDataAddress.getIPTos();
            localPort = appDataAddress.getLocalPort();
            remotePort = appDataAddress.getLocalPort();
            address = new LispAddressGeneric(appDataAddress.getAddress());
        }
-       
+
        private void listGeneric(LispLCAFAddress lcafAddress){
                LispListLCAFAddress listAddress = (LispListLCAFAddress) lcafAddress;
                addresses = new ArrayList<LispAddressGeneric>();
@@ -192,13 +192,13 @@ public class LispAddressGeneric{
                        addresses.add(new LispAddressGeneric(listAddress.getAddresses().get(i)));
                }
        }
-       
+
        private void segmentGeneric(LispLCAFAddress lcafAddress){
                LispSegmentLCAFAddress segmentAddress = (LispSegmentLCAFAddress) lcafAddress;
                instanceId = segmentAddress.getInstanceId();
                address = new LispAddressGeneric(segmentAddress.getAddress());
        }
-       
+
        private void srcDstGeneric(LispLCAFAddress lcafAddress){
                LispSourceDestLCAFAddress srcDstAddress = (LispSourceDestLCAFAddress) lcafAddress;
            srcAddress = new LispAddressGeneric(srcDstAddress.getSrcAddress());
@@ -206,10 +206,10 @@ public class LispAddressGeneric{
            srcMaskLength = srcDstAddress.getSrcMaskLength();
            dstMaskLength = srcDstAddress.getDstMaskLength();
        }
-       
+
        private void trafficEngineeringGeneric(LispLCAFAddress lcafAddress){
                LispTrafficEngineeringLCAFAddress teAddress = (LispTrafficEngineeringLCAFAddress) lcafAddress;
-               
+
                hops = new ArrayList<LispAddressGeneric>();
                for(int i=0;i<teAddress.getHops().size();i++){
                        LispAddressGeneric hop = new LispAddressGeneric(AddressFamilyNumberEnum.UNKNOWN.getIanaCode());
@@ -221,10 +221,10 @@ public class LispAddressGeneric{
                }
        }
 
-       
-       
-       
-       
+
+
+
+
        public String getIpAddress() {
                return ipAddress;
        }
@@ -240,7 +240,7 @@ public class LispAddressGeneric{
        public void setAfi(int afi) {
                this.afi = afi;
        }
-       
+
     public int getInstanceId() {
                return instanceId;
        }
@@ -360,7 +360,7 @@ public class LispAddressGeneric{
        public void setHops(List<LispAddressGeneric> hops) {
                this.hops = hops;
        }
-       
+
        public LispAddressGeneric getAddress() {
                return address;
        }
@@ -397,5 +397,5 @@ public class LispAddressGeneric{
                this.distinguishedName = distinguishedName;
        }
 
-    
+
 }
index a347f3ded73d9d293859425dee47bcda88695581..9a586ad93571126c72d996cd50118fdde84f9d8f 100644 (file)
@@ -15,7 +15,7 @@ import javax.xml.bind.DatatypeConverter;
 import org.opendaylight.lispflowmapping.type.AddressFamilyNumberEnum;
 
 public class LispMACAddress extends LispAddress {
-    
+
        private byte[] mac = new byte[6];
 
     public LispMACAddress(byte[] mac) {
index b3ea165ed7ecdccb60d9acb6238538c6e7d569db..175465089a39771b92d18f9c22541d5bc86561e1 100644 (file)
@@ -16,7 +16,7 @@ public class ReencapHop extends LispAddress{
     private boolean lookup;
     private boolean RLOCProbe;
     private boolean strict;
-    
+
     public ReencapHop(LispAddress hop, short resv3, boolean lookup, boolean RLOCProbe, boolean strict) {
         super(hop.getAfi());
         this.hop = hop;
@@ -65,13 +65,13 @@ public class ReencapHop extends LispAddress{
     public void setStrict(boolean strict) {
         this.strict = strict;
     }
-    
+
     @Override
     public String toString() {
         return "ReencapHop#[hop=" + hop + "]" + super.toString();
     }
 
-    
-    
+
+
 
 }
index ab564744a8f2a9fea815a6a14ec094e46dfcce72..0e2ddd3fb45e3dce53068a9f604ce98108a1ca36 100644 (file)
@@ -19,7 +19,7 @@ import org.opendaylight.lispflowmapping.interfaces.dao.ILispDAO;
 /**
  * Main application activator class for registering the dependencies and
  * initialising the Mapping Service application.
- * 
+ *
  */
 
 public class Activator extends ComponentActivatorAbstractBase {
@@ -27,7 +27,7 @@ public class Activator extends ComponentActivatorAbstractBase {
     /**
      * Function called when the activator starts just after some initializations
      * are done by the ComponentActivatorAbstractBase.
-     * 
+     *
      */
     @Override
     public void init() {
@@ -36,7 +36,7 @@ public class Activator extends ComponentActivatorAbstractBase {
     /**
      * Function called when the activator stops just before the cleanup done by
      * ComponentActivatorAbstractBase
-     * 
+     *
      */
     @Override
     public void destroy() {
@@ -45,8 +45,8 @@ public class Activator extends ComponentActivatorAbstractBase {
     /**
      * Function that is used to communicate to dependency manager the list of
      * known implementations for services inside a container
-     * 
-     * 
+     *
+     *
      * @return An array containing all the CLASS objects that will be
      *         instantiated in order to get an fully working implementation
      *         Object
@@ -60,7 +60,7 @@ public class Activator extends ComponentActivatorAbstractBase {
     /**
      * Function that is called when configuration of the dependencies is
      * required.
-     * 
+     *
      * @param c
      *            dependency manager Component object, used for configuring the
      *            dependencies exported and imported
@@ -91,8 +91,8 @@ public class Activator extends ComponentActivatorAbstractBase {
      * destroyed only at time of bundle destruction, this is the major
      * difference with the implementation retrieved via getImplementations where
      * all of them are assumed to be in a container !
-     * 
-     * 
+     *
+     *
      * @return The list of implementations the bundle will support, in Global
      *         version
      */
@@ -103,7 +103,7 @@ public class Activator extends ComponentActivatorAbstractBase {
 
     /**
      * Configure the dependency for a given instance Global
-     * 
+     *
      * @param c
      *            Component assigned for this instance, this will be what will
      *            be used for configuration
index 5c67059fe1b3328b937bd2ac6dfb9bf955f5f468..b01524d579fb961b33c1e33f56ebe7e3a0ed5fc3 100644 (file)
@@ -28,9 +28,9 @@ module config-lisp {
     augment "/config:modules/config:module/config:configuration" {
         case lispconfig {
             when "/config:modules/config:module/config:type = 'lispconfig'";
-            
+
             leaf bind-address {
-                               type string;    
+                               type string;
                mandatory true;
             }
         }
index c49985a84e569fc2ef166581e788ef6a7a90aece..6fc148d9335238e6e05112e5fdb5627cee491737 100644 (file)
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam</artifactId>
       <version>${exam.version}</version>
-      <!-- Compile scope here is intentional, it is used in TestHelper class 
+      <!-- Compile scope here is intentional, it is used in TestHelper class
                                which could be downloaded via nexus and reused in other integration tests. -->
       <scope>compile</scope>
     </dependency>
        <artifactId>jacoco-maven-plugin</artifactId>
        <configuration>
          <includes>
-           <include>org.opendaylight.org.opendaylight.lispflowmapping.*.*</include> 
+           <include>org.opendaylight.org.opendaylight.lispflowmapping.*.*</include>
          </includes>
        </configuration>
        <executions>
index 1642096c8e90262bf9198d22851e44cf6d05082c..e20972254c784ea5644ab1d61f984d3e0a446c04 100644 (file)
@@ -22,7 +22,7 @@ module lfm-ncc-provider-impl {
     augment "/config:modules/config:module/config:configuration" {
         case lfm-ncc-provider-impl {
             when "/config:modules/config:module/config:type = 'lfm-ncc-provider-impl'";
-            
+
             container rpc-registry {
                 uses config:service-ref {
                     refine type {
index 0a20f637210c0905a505fdfd8638ec3125daabb1..eca5c0fc4586e86bf529c7b03eea68558d139f78 100644 (file)
@@ -6,7 +6,7 @@ module lfm-netconf-connector {
 
     import config { prefix config; revision-date 2013-04-05; }
     import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
-    
+
     organization "Cisco Systems, Inc.";
 
     contact
@@ -16,15 +16,15 @@ module lfm-netconf-connector {
         description
           "Data model for lispflowmapping netconf connector";
     }
-    
+
     container nc-connector {
         presence
         "Indicates the netconf connector service is available";
-        
+
         description
         "Top-level container for all connector database objects.";
     }
-    
+
     rpc build-connector {
         description
            "Build netconf connector";
@@ -38,24 +38,24 @@ module lfm-netconf-connector {
                  type inet:host;
                  description "Device address";
             }
-            
+
             leaf port {
                 type inet:port-number;
                 description "Device port";
             }
-            
+
             leaf username {
                 type string;
                 description "Username for netconf connection";
             }
-            
+
             leaf password {
                 type string;
                 description "Password for netconf connection";
             }
         }
     }
-    
+
     rpc remove-connector {
         description
             "Removes a given netconf connector";
index adcefb02c4fac0567ef03d7118f104390b0466c7..6dd6b7fb34e94663f0426087382b301363bc73b0 100644 (file)
@@ -69,8 +69,8 @@
                                                        org.opendaylight.lispflowmapping.interfaces.lisp,
                                                        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031,
                                                        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress,
-                                                       org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.lispaddresscontainer, 
-                                                       org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.lispaddresscontainer.address, 
+                                                       org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.lispaddresscontainer,
+                                                       org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.lispaddresscontainer.address,
                                                        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924,
                                                        org.slf4j,
                                                        org.apache.catalina.filters,
index 3daa29680ffa0863edae9f6bde3bf6705e5b03bc..9b62ce446791ec27da57abf997601510dc5ada64 100644 (file)
@@ -18,7 +18,7 @@ import org.opendaylight.lispflowmapping.interfaces.lisp.IFlowMapping;
 /**
  * Main application activator class for registering the dependencies and
  * initialising the Mapping Service application.
- * 
+ *
  */
 
 public class Activator extends ComponentActivatorAbstractBase {
@@ -26,7 +26,7 @@ public class Activator extends ComponentActivatorAbstractBase {
     /**
      * Function called when the activator starts just after some initializations
      * are done by the ComponentActivatorAbstractBase.
-     * 
+     *
      */
     @Override
     public void init() {
@@ -35,7 +35,7 @@ public class Activator extends ComponentActivatorAbstractBase {
     /**
      * Function called when the activator stops just before the cleanup done by
      * ComponentActivatorAbstractBase
-     * 
+     *
      */
     @Override
     public void destroy() {
@@ -44,8 +44,8 @@ public class Activator extends ComponentActivatorAbstractBase {
     /**
      * Function that is used to communicate to dependency manager the list of
      * known implementations for services inside a container
-     * 
-     * 
+     *
+     *
      * @return An array containing all the CLASS objects that will be
      *         instantiated in order to get an fully working implementation
      *         Object
@@ -59,7 +59,7 @@ public class Activator extends ComponentActivatorAbstractBase {
     /**
      * Function that is called when configuration of the dependencies is
      * required.
-     * 
+     *
      * @param c
      *            dependency manager Component object, used for configuring the
      *            dependencies exported and imported
@@ -90,8 +90,8 @@ public class Activator extends ComponentActivatorAbstractBase {
      * destroyed only at time of bundle destruction, this is the major
      * difference with the implementation retrieved via getImplementations where
      * all of them are assumed to be in a container !
-     * 
-     * 
+     *
+     *
      * @return The list of implementations the bundle will support, in Global
      *         version
      */
@@ -102,7 +102,7 @@ public class Activator extends ComponentActivatorAbstractBase {
 
     /**
      * Configure the dependency for a given instance Global
-     * 
+     *
      * @param c
      *            Component assigned for this instance, this will be what will
      *            be used for configuration
index 07ffc05d02fbc215b9716b921a3b2c9ce7929333..4584b6494b8d139921841fd356dff34f600ec633 100644 (file)
@@ -18,14 +18,14 @@ import org.opendaylight.lispflowmapping.type.lisp.address.LispAddressGeneric;
 @XmlAccessorType(XmlAccessType.NONE)
 
 public class AuthKeyNB {
-       
+
+
        @XmlElement
        String key;
-       
+
        @XmlElement
        int maskLength;
-       
+
        @XmlElement
        LispAddressGeneric address;
 
@@ -36,7 +36,7 @@ public class AuthKeyNB {
        public void setKey(String key) {
                this.key = key;
        }
-       
+
        public int getMaskLength() {
                return maskLength;
        }
@@ -56,7 +56,7 @@ public class AuthKeyNB {
 
 
 
-       
-    
-    
+
+
+
 }
\ No newline at end of file
index bfc96b216dbde92becbecb52b07b8b8fa9591b61..539e72363bbec7abd9dc9758da2cc9186b2f637b 100644 (file)
@@ -11,7 +11,7 @@ package org.opendaylight.lispflowmapping.northbound;
 import org.opendaylight.lispflowmapping.interfaces.lisp.IFlowMapping;
 
 public interface ILispmappingNorthbound {
-       
+
        public IFlowMapping getMappingService();
 
 }
index ca717d86c79277869065619cd93d1fd555bd88f5..57b5ba54c6738ab0e8dbf3d2364dd7a643ebba0a 100644 (file)
@@ -18,11 +18,11 @@ import org.opendaylight.lispflowmapping.type.lisp.MapRegister;
 @XmlAccessorType(XmlAccessType.NONE)
 
 public class MapRegisterNB {
-       
+
+
        @XmlElement
        String key;
-       
+
        @XmlElement
        MapRegister mapregister;
 
@@ -33,7 +33,7 @@ public class MapRegisterNB {
        public MapRegister getMapRegister() {
                return mapregister;
        }
-       
-    
-    
+
+
+
 }
\ No newline at end of file
index e9a551ff2c2c7b11490778e92aad89e0d0e87d2b..16b07dc03de7c97b20867684fe444aa2da06e4f9 100644 (file)
@@ -38,128 +38,128 @@ public class TransformerTest extends BaseTestCase{
     public void before() throws Exception {
         super.before();
     }
-    
+
     @Test
     public void convertToLispAddress__ipv4() throws Exception {
-        
+
        LispAddress lispAddress = new LispIpv4Address("10.0.0.1");
-       
+
        LispAddressGeneric lispAddressGeneric = new LispAddressGeneric(lispAddress);
-       
+
        //assertEquals(lispAddress, new LispIpv4Address("10.0.0.1"));
-       
+
        assertEquals(lispAddress, LispAddressConvertorNB.convertToLispAddress(lispAddressGeneric));
-       
+
     }
 
     @Test
     public void transformLispAddressGeneric__ipv4() throws Exception {
-       
-       LispAddressGeneric lispAddressGenericIn 
+
+       LispAddressGeneric lispAddressGenericIn
                = new LispAddressGeneric(AddressFamilyNumberEnum.IP.getIanaCode(),"10.0.0.1");
-       
-       LispAddressContainer lispAddressContainer = 
+
+       LispAddressContainer lispAddressContainer =
                        YangTransformerNB.transformLispAddress(
                                        LispAddressConvertorNB.convertToLispAddress(lispAddressGenericIn));
-       
-       LispAddressGeneric lispAddressGenericOut 
+
+       LispAddressGeneric lispAddressGenericOut
                = new LispAddressGeneric(YangTransformerNB.transformToLispAddress(lispAddressContainer));
 
-               
+
        assertEquals(lispAddressGenericIn.getIpAddress(),lispAddressGenericOut.getIpAddress());
-       
-    }    
+
+    }
 
     @Test
     public void transformLispAddressGeneric__srcdst() throws Exception {
-       
+
        LispAddressGeneric lispAddressGenericIn = new LispAddressGeneric();
-       
-       LispAddressGeneric lispAddressGenericSrc 
+
+       LispAddressGeneric lispAddressGenericSrc
                        = new LispAddressGeneric(AddressFamilyNumberEnum.IP.getIanaCode(),"10.0.0.1");
-       
-       LispAddressGeneric lispAddressGenericDst 
+
+       LispAddressGeneric lispAddressGenericDst
                        = new LispAddressGeneric(AddressFamilyNumberEnum.IP.getIanaCode(),"20.0.0.2");
-       
+
        lispAddressGenericIn.setAfi(AddressFamilyNumberEnum.LCAF.getIanaCode());
        lispAddressGenericIn.setLcafType(LispCanonicalAddressFormatEnum.SOURCE_DEST.getLispCode());
-       
+
        lispAddressGenericIn.setSrcAddress(lispAddressGenericSrc);
        lispAddressGenericIn.setDstAddress(lispAddressGenericDst);
-       
+
        lispAddressGenericIn.setSrcMaskLength((byte) 32);
        lispAddressGenericIn.setDstMaskLength((byte) 32);
-       
-       
-       LispAddressContainer lispAddressContainer = 
+
+
+       LispAddressContainer lispAddressContainer =
                        YangTransformerNB.transformLispAddress(
                                        LispAddressConvertorNB.convertToLispAddress(lispAddressGenericIn));
-       
-       LispAddressGeneric lispAddressGenericOut 
+
+       LispAddressGeneric lispAddressGenericOut
                = new LispAddressGeneric(YangTransformerNB.transformToLispAddress(lispAddressContainer));
 
-               
+
        assertEquals(lispAddressGenericIn.getSrcAddress().getIpAddress(),
                                 lispAddressGenericOut.getSrcAddress().getIpAddress());
-       
+
        assertEquals(lispAddressGenericIn.getDstAddress().getIpAddress(),
                                     lispAddressGenericOut.getDstAddress().getIpAddress());
-       
-    }    
-    
-    
+
+    }
+
+
     @Test
     public void transformLispAddressContainer__ipv4() throws Exception {
-       
+
        Ipv4Address ipv4AddressIn = new Ipv4Address("10.0.0.1");
        LispAFIAddress lispAFIAddressIn = new Ipv4Builder()
                .setIpv4Address(ipv4AddressIn)
                .setAfi(AddressFamilyNumberEnum.IP.getIanaCode())
                .build();
-       
+
        LispAddressContainer lispAddressContainerIn = YangTransformerNB.toContainer(lispAFIAddressIn);
-       
-       LispAddressGeneric lispAddressGeneric 
+
+       LispAddressGeneric lispAddressGeneric
                = new LispAddressGeneric(YangTransformerNB.transformToLispAddress(lispAddressContainerIn));
-       
-       LispAddressContainer lispAddressContainerOut 
+
+       LispAddressContainer lispAddressContainerOut
                = YangTransformerNB.transformLispAddress(LispAddressConvertorNB.convertToLispAddress(lispAddressGeneric));
-       
+
        LispAFIAddress lispAFIAddressOut = (LispAFIAddress) lispAddressContainerOut.getAddress();
-        
+
         org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.LispIpv4Address lispIpv4AddressOut;
         lispIpv4AddressOut = (org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.LispIpv4Address) lispAFIAddressOut;
-       
-       
+
+
        assertEquals(ipv4AddressIn.getValue(),
                                 lispIpv4AddressOut.getIpv4Address().getValue());
-       
+
     }
-    
-    
+
+
     @Test
     public void transformLispAddressContainer__srcdst() throws Exception {
-       
+
        Ipv4Address ipv4AddressSrcIn = new Ipv4Address("10.0.0.1");
        LispAFIAddress lispAFIAddressSrc = new Ipv4Builder()
                .setIpv4Address(ipv4AddressSrcIn)
                .setAfi(AddressFamilyNumberEnum.IP.getIanaCode())
                .build();
-       
+
        Ipv4Address ipv4AddressDstIn = new Ipv4Address("20.0.0.2");
        LispAFIAddress lispAFIAddressDst = new Ipv4Builder()
                .setIpv4Address(ipv4AddressDstIn)
                .setAfi(AddressFamilyNumberEnum.IP.getIanaCode())
                .build();
-       
+
        SrcAddress srcAddress = new SrcAddressBuilder()
                        .setPrimitiveAddress(YangTransformerNB.toPrimitive(lispAFIAddressSrc))
                        .build();
-       
+
        DstAddress dstAddress = new DstAddressBuilder()
                        .setPrimitiveAddress(YangTransformerNB.toPrimitive(lispAFIAddressDst))
                        .build();
-       
+
        LispAFIAddress lispAFIAddressIn = new LcafSourceDestBuilder()
                        .setAfi(AddressFamilyNumberEnum.LCAF.getIanaCode())
                        .setLcafType((short) LispCanonicalAddressFormatEnum.SOURCE_DEST.getLispCode())
@@ -168,37 +168,37 @@ public class TransformerTest extends BaseTestCase{
                        .setSrcAddress(srcAddress)
                        .setDstAddress(dstAddress)
                        .build();
-       
+
        LispAddressContainer lispAddressContainerIn = YangTransformerNB.toContainer(lispAFIAddressIn);
-       
-       LispAddressGeneric lispAddressGeneric 
+
+       LispAddressGeneric lispAddressGeneric
                = new LispAddressGeneric(YangTransformerNB.transformToLispAddress(lispAddressContainerIn));
-       
-       LispAddressContainer lispAddressContainerOut 
+
+       LispAddressContainer lispAddressContainerOut
                = YangTransformerNB.transformLispAddress(LispAddressConvertorNB.convertToLispAddress(lispAddressGeneric));
-       
+
        LispAFIAddress lispAFIAddressOut = (LispAFIAddress) lispAddressContainerOut.getAddress();
 
-       
+
        org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.LcafSourceDestAddress lcafSourceDestAddressOut;
                lcafSourceDestAddressOut = (org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.LcafSourceDestAddress) lispAFIAddressOut;
-               
-               Ipv4Address ipv4AddressSrcOut 
-                       = ((org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispsimpleaddress.primitiveaddress.Ipv4) 
+
+               Ipv4Address ipv4AddressSrcOut
+                       = ((org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispsimpleaddress.primitiveaddress.Ipv4)
                                        lcafSourceDestAddressOut.getSrcAddress().getPrimitiveAddress())
                                        .getIpv4Address();
-       
-               Ipv4Address ipv4AddressDstOut 
-               = ((org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispsimpleaddress.primitiveaddress.Ipv4) 
+
+               Ipv4Address ipv4AddressDstOut
+               = ((org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispsimpleaddress.primitiveaddress.Ipv4)
                                lcafSourceDestAddressOut.getDstAddress().getPrimitiveAddress())
                                .getIpv4Address();
-               
-               
+
+
        assertEquals(ipv4AddressSrcIn.getValue(),ipv4AddressSrcOut.getValue());
-       
+
        assertEquals(ipv4AddressDstIn.getValue(),ipv4AddressDstOut.getValue());
-       
+
     }
-    
-    
+
+
 }
index 7e7b99021693243bbdfea71974c17b7141f79647..9e80bdbd27051fd1ca2508cdc10fb2f1bc1422cd 100644 (file)
@@ -83,7 +83,7 @@ public class LispXtrSouthboundService implements ILispSouthboundService {
 
             XtrReplyMappingBuilder replyMappingBuilder = new XtrReplyMappingBuilder();
             replyMappingBuilder.setMapReply(LispNotificationHelper.convertMapReply(reply));
-            
+
             if (notificationProvider != null) {
                 notificationProvider.publish(replyMappingBuilder.build());
                 logger.trace("MapReply was published!");
index 0cebd9cff1a8225ed4cd2b9684a1a2fae0eb4cf5..8bec8a8ff359a1dea4a86b42ee29800f388d5031 100755 (executable)
@@ -1,17 +1,17 @@
   module lispflowmapping {
 
-    
+
 
     namespace
       "lispflowmapping";
 
     prefix lispflowmapping;
-    
+
     import ietf-inet-types {
                prefix inet;
                revision-date 2010-09-24;
        }
-       
+
        import ietf-yang-types {
                prefix yang;
                revision-date 2010-09-24;
       description
         "mapping service";
     }
-    
+
     grouping TransportAddress{
-       container TransportAddress {            
-           leaf ipAddress {    
-               type inet:ip-address;   
-               reference "http://www.iana.org/assignments/safi-namespace/safi-namespace.xhtml";                
-           }   
-            leaf port {        
-                       type inet:port-number;  
-               }       
+       container TransportAddress {
+           leaf ipAddress {
+               type inet:ip-address;
+               reference "http://www.iana.org/assignments/safi-namespace/safi-namespace.xhtml";
+           }
+            leaf port {
+                       type inet:port-number;
+               }
        }
     }
 
@@ -49,7 +49,7 @@
                reference "http://www.iana.org/assignments/safi-namespace/safi-namespace.xhtml";
        }
     }
-    
+
     grouping LispNoAddress {
        uses LispAFIAddress {
                refine afi {
@@ -57,7 +57,7 @@
                }
        }
     }
-    
+
     grouping LispIpv4Address {
        uses LispAFIAddress {
                refine afi {
@@ -69,7 +69,7 @@
                reference "https://tools.ietf.org/html/rfc3209#section-4.6.2.1";
                }
     }
-    
+
     grouping LispIpv6Address {
        uses LispAFIAddress{
                refine afi {
@@ -80,7 +80,7 @@
                type inet:ipv6-address;
                }
     }
-    
+
     grouping LispMacAddress {
        uses LispAFIAddress{
                refine afi {
@@ -91,7 +91,7 @@
                type yang:mac-address;
                }
     }
-    
+
     grouping LispDistinguishedNameAddress {
        uses LispAFIAddress{
                refine afi {
               type string;
        }
     }
-    
-    
+
+
     grouping LispASAddress {
        uses LispAFIAddress{
                refine afi {
               type int32;
        }
     }
-    
+
     grouping LispSimpleAddress {
        choice primitiveAddress {
                        case No {
                        }
        }
     }
-    
+
     grouping ReencapHop {
        container hop {
                uses LispSimpleAddress;
              type boolean;
        }
     }
-    
-    
-    
-    
+
+
+
+
     grouping LispLcafAddress {
        uses LispAFIAddress{
                refine afi {
                reference "http://tools.ietf.org/html/draft-ietf-lisp-lcaf-03";
        }
     }
-    
+
     grouping LcafSegmentAddress {
        reference http://tools.ietf.org/html/draft-ietf-lisp-lcaf-03#section-4.1;
                uses LispLcafAddress{
                uses ReencapHop;
        }
     }
-    
+
     grouping LcafListAddress {
        reference http://tools.ietf.org/html/draft-ietf-lisp-lcaf-03#section-4.1;
                uses LispLcafAddress{
                uses LispSimpleAddress;
        }
     }
-    
+
        grouping LcafSourceDestAddress {
                        reference "http://tools.ietf.org/html/draft-ietf-lisp-lcaf-03#section-4.11";
                        uses LispLcafAddress{
                  type uint8;
               }
         }
-        
+
         grouping LcafKeyValueAddress {
                        reference "http://tools.ietf.org/html/draft-ietf-lisp-lcaf-04#section-4.14";
                        uses LispLcafAddress{
                 uses LispSimpleAddress;
              }
         }
-        
+
         grouping LcafApplicationDataAddress {
                        reference "http://tools.ietf.org/html/draft-ietf-lisp-lcaf-03#section-4.11";
                        uses LispLcafAddress{
              leaf ipTos {
                  type int32;
               }
-              leaf localPort { 
-                               type inet:port-number;  
-                       }       
-                       leaf remotePort {       
-                               type inet:port-number;  
-                       }       
+              leaf localPort {
+                               type inet:port-number;
+                       }
+                       leaf remotePort {
+                               type inet:port-number;
+                       }
         }
 
-       
+
        grouping LispAddress {
        container LispAddressContainer{
                choice Address {
                        case LcafTrafficEngineering {
                                uses LcafTrafficEngineeringAddress;
                        }
-               } 
+               }
        }
        }
-    
-    
+
+
     grouping EidRecords {
     list EidRecord {
-       
+
                // EID
-               uses LispAddress; 
-               
+               uses LispAddress;
+
                leaf mask {
                        type uint8;
                }
        }
     }
-    
+
     grouping LocatorRecords {
     list LocatorRecord {
        leaf priority {
        leaf routed {
                type boolean;
        }
-       
+
        //locator address
-       uses LispAddress; 
-    }  
+       uses LispAddress;
+    }
     }
-    
-    grouping EidToLocatorRecord {      
+
+    grouping EidToLocatorRecord {
        leaf recordTtl {
                type int32;
        }
                type boolean;
        }
        // EID prefix
-       uses LispAddress; 
-       
+       uses LispAddress;
+
         // locator record list
         uses LocatorRecords;
     }
-    
+
     grouping EidToLocatorRecords {
        list eidToLocatorRecord {
                uses EidToLocatorRecord;
        }
     }
-    
+
     grouping xtrSiteId {
         leaf xtrId {
             type binary;
        uses EidToLocatorRecords;
         uses xtrSiteId;
     }
-    
+
     grouping MapNotify {
        reference "http://tools.ietf.org/html/rfc6830#section-6.1.7";
         reference "http://tools.ietf.org/html/draft-ermagan-lisp-nat-traversal-05#section-4.3";
        uses EidToLocatorRecords;
         uses xtrSiteId;
     }
-    
+
     grouping MapRequest {
        reference "http://tools.ietf.org/html/rfc6830#section-6.1.2";
        leaf authoritative {
                type int64;
        }
        container SourceEid {
-               uses LispAddress; 
+               uses LispAddress;
        }
        list itrRloc {
-               uses LispAddress; 
+               uses LispAddress;
        }
        uses EidRecords;
-       container MapReply{ 
+       container MapReply{
                uses EidToLocatorRecord;
        }
     }
-    
+
     grouping MapReply {
        reference "http://tools.ietf.org/html/rfc6830#section-6.1.4";
        leaf probe {
        }
        uses EidToLocatorRecords;
     }
-    
+
     grouping MapRegisterNotification {
        container MapRegister {
                uses MapRegister;
        }
        uses TransportAddress;
-       
+
     }
-    
+
     grouping MapNotifyMessage {
        container MapNotify {
                uses MapNotify;
        }
        uses TransportAddress;
-       
+
     }
-    
+
     grouping MapRequestMessage {
        container MapRequest {
                uses MapRequest;
        }
        uses TransportAddress;
-       
+
     }
-    
+
     grouping MapRequestNotification {
        container MapRequest {
                uses MapRequest;
        }
        uses TransportAddress;
-    
+
     }
-    
-    
+
+
     grouping MapReplyMessage {
        container MapReply {
                uses MapReply;
        }
        uses TransportAddress;
-       
+
     }
-    
+
     grouping MapReplyNotification {
        container MapReply {
                uses MapReply;
        }
-    
+
     }
-    
-    
+
+
     rpc sendMapNotify {
        input {
                uses MapNotifyMessage;
        }
     }
-    
+
     rpc sendMapRequest {
        input {
                uses MapRequestMessage;
        }
     }
-    
+
     rpc sendMapReply {
        input {
                uses MapReplyMessage;
        }
     }
-    
+
     notification addMapping {
        uses MapRegisterNotification;
     }
-    
+
     notification requestMapping {
        uses MapRequestNotification;
     }
-    
+
     notification xtrRequestMapping {
        uses MapRequestNotification;
     }
-    
+
     notification xtrReplyMapping {
        uses MapReplyNotification;
     }
 }
-        
-        
+
+