Bug 1905 : Fix for Traffic Engineering LCAF L/P/S flags not being set from NB API.

Update address convertor to read the correct flags.

Change-Id: I44625674de4c3a1470a45455c21b3eeed36c6adb
Signed-off-by: Vina Ermagan <vermagan@cisco.com>

diff --git a/mappingservice/northbound/src/main/java/org/opendaylight/lispflowmapping/northbound/LispAddressConvertorNB.java b/mappingservice/northbound/src/main/java/org/opendaylight/lispflowmapping/northbound/LispAddressConvertorNB.java
index 1139ba96d38385264a353bef3e2cc19877a808ec..9dfb567a778487b8691bbc51ac1aba953446501c 100644 (file)
--- a/mappingservice/northbound/src/main/java/org/opendaylight/lispflowmapping/northbound/LispAddressConvertorNB.java
+++ b/mappingservice/northbound/src/main/java/org/opendaylight/lispflowmapping/northbound/LispAddressConvertorNB.java
@@ -33,24 +33,24 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class LispAddressConvertorNB {
-       
+
        protected static final Logger logger = LoggerFactory.getLogger(LispAddressConvertorNB.class);
 
-       
+
 public static LispAddress convertToLispAddress(LispAddressGeneric generic){
-       
+
        if (generic == null){
                logger.warn("Couldn't convert address, generic address is null");
                return null;
        }
-       
+
        LispAddress lispAddress = null;
-       
+
        AddressFamilyNumberEnum afiEnum  = AddressFamilyNumberEnum.valueOf((short) generic.getAfi());
-       
+
        switch (afiEnum) {
-       
-       case IP: 
+
+       case IP:
                lispAddress = new LispIpv4Address(generic.getIpAddress());
                if (((LispIpv4Address)lispAddress).getAddress() == null){
                        throw new IllegalArgumentException("Convertor was unable to convert address");
@@ -72,7 +72,7 @@ public static LispAddress convertToLispAddress(LispAddressGeneric generic){
                        lispAddress = new LispDistinguishedNameAddress(generic.getDistinguishedName());
                        break;
                case LCAF:
-                       LispCanonicalAddressFormatEnum lcafEnum = 
+                       LispCanonicalAddressFormatEnum lcafEnum =
                                LispCanonicalAddressFormatEnum.valueOf(generic.getLcafType());
                        switch (lcafEnum){
                        case APPLICATION_DATA:
@@ -91,17 +91,17 @@ public static LispAddress convertToLispAddress(LispAddressGeneric generic){
                                lispAddress = convertToTE(generic);
                                break;
                        default:
-                               throw new IllegalArgumentException("LCAF type " + lcafEnum + 
+                               throw new IllegalArgumentException("LCAF type " + lcafEnum +
                                                " not supported by this convertor: convertToLispAddress(LispAddressGeneric generic)");
                        }
                        break;
                default:
-                       throw new IllegalArgumentException("AFI " + afiEnum + 
+                       throw new IllegalArgumentException("AFI " + afiEnum +
                                        " not supported by this convertor: convertToLispAddress(LispAddressGeneric generic)");
        }
-       
 
-       
+
+
        return lispAddress;
     }
 
@@ -113,23 +113,23 @@ private static LispApplicationDataLCAFAddress convertToApplicationData(LispAddre
 
 private static LispListLCAFAddress convertToList(LispAddressGeneric generic){
        List<LispAddress> list = new ArrayList<LispAddress>();
-       
+
        for (int i=0;i<generic.getAddresses().size();i++){
                list.add(convertToLispAddress(generic.getAddresses().get(i)));
        }
-       
+
        return new LispListLCAFAddress((byte) 0, list);
 }
 
 private static LispSegmentLCAFAddress convertToSegment(LispAddressGeneric generic){
        byte idMaskLen = 0; //Not used here
-       return new LispSegmentLCAFAddress(idMaskLen, generic.getInstanceId(), 
+       return new LispSegmentLCAFAddress(idMaskLen, generic.getInstanceId(),
                        convertToLispAddress(generic.getAddress()));
 }
 
 private static LispSourceDestLCAFAddress convertToSrcDst(LispAddressGeneric generic){
-       return new LispSourceDestLCAFAddress((byte)0, (short)0, generic.getSrcMaskLength(), 
-                       generic.getDstMaskLength(),     convertToLispAddress(generic.getSrcAddress()), 
+       return new LispSourceDestLCAFAddress((byte)0, (short)0, generic.getSrcMaskLength(),
+                       generic.getDstMaskLength(),     convertToLispAddress(generic.getSrcAddress()),
                        convertToLispAddress(generic.getDstAddress()));
 }
 
@@ -141,8 +141,8 @@ private static LispTrafficEngineeringLCAFAddress convertToTE(LispAddressGeneric
 
        for (int i=0;i<generic.getHops().size();i++){
                hop = new ReencapHop(
-                               convertToLispAddress(generic.getHops().get(i).getAddress()), (short) 0, 
-                               generic.isLookup(), generic.isRLOCProbe(), generic.isStrict());
+                               convertToLispAddress(generic.getHops().get(i).getAddress()), (short) 0,
+                               generic.getHops().get(i).isLookup(), generic.getHops().get(i).isRLOCProbe(), generic.getHops().get(i).isStrict());
                listHops.add(hop);
        }
        return new LispTrafficEngineeringLCAFAddress((byte)0, listHops);
@@ -155,60 +155,60 @@ private static LispTrafficEngineeringLCAFAddress convertToTE(LispAddressGeneric
 public static void convertGenericToLispAddresses(MapRegister mapRegister){
        LispAddress EID;
        LispAddressGeneric EIDGeneric;
-       
+
        List<LocatorRecord> locRecordList;
        LispAddress RLOC;
        LispAddressGeneric RLOCGeneric;
-       
+
        if (mapRegister == null){
                logger.warn("Couldn't convert addresses, mapRegister is null");
                return;
        }
-       
+
        int EIDtoLocatorRecordCount = mapRegister.getEidToLocatorRecords().size();
-       
+
        for (int i=0;i<EIDtoLocatorRecordCount;i++){
        EIDGeneric = mapRegister.getEidToLocatorRecords().get(i).getPrefixGeneric();
-       
+
        EID = convertToLispAddress(EIDGeneric);
-       
+
        mapRegister.getEidToLocatorRecords().get(i).setPrefix(EID);
        locRecordList = mapRegister.getEidToLocatorRecords().get(i).getLocators();
-       
+
        for(int j=0;j<locRecordList.size();j++){
-               
+
                RLOCGeneric = locRecordList.get(j).getLocatorGeneric();
-               
+
                RLOC = convertToLispAddress(RLOCGeneric);
                locRecordList.get(j).setLocator(RLOC);
        }
-       
+
        }
 }
 
 
 public static void convertRecordToGenericAddress(EidToLocatorRecord record){
 
-       LispAddress EID;        
+       LispAddress EID;
        List<LocatorRecord> locRecordList;
        LispAddress RLOC;
-       
+
        if (record == null){
                logger.warn("Couldn't convert addresses, record is null");
                return;
        }
-       
+
        EID = record.getPrefix();
     record.setPrefixGeneric(new LispAddressGeneric(EID));
-       
+
     locRecordList = record.getLocators();
     for(int j=0;j<locRecordList.size();j++){
-       
+
        RLOC = locRecordList.get(j).getLocator();
        locRecordList.get(j).setLocatorGeneric(new LispAddressGeneric(RLOC));
     }
-}      
+}
+
 
 
-       
 }