Merge "Expand implementation of Neutron Service APIs in Lisp ." into develop

[lispflowmapping.git] / mappingservice / implementation / src / main / java / org / opendaylight / lispflowmapping / implementation / util / LispNotificationHelper.java

diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelper.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelper.java
index 6ee9e72d026ef84a2e2191da860e1ee244a54147..33759f2dabc1ebb676d97bfc6becae69d71fba12 100644 (file)
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelper.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelper.java
@@ -14,10 +14,13 @@ import java.net.UnknownHostException;
 import org.opendaylight.lispflowmapping.implementation.serializer.LispMessage;
 import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.LcafApplicationDataAddress;
 import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.LispAFIAddress;
+import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.LispDistinguishedNameAddress;
 import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.LispIpv4Address;
 import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.LispAddressContainer;
+import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.lispaddresscontainer.address.DistinguishedName;
 import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.lispaddresscontainer.address.Ipv4;
-import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.lispaddresscontainer.address.LcafApplicationData;
+import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.lispaddresscontainer.address.LcafKeyValue;
+import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispsimpleaddress.PrimitiveAddress;
 import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.mapregisternotification.MapRegister;
 import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.mapregisternotification.MapRegisterBuilder;
 import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.maprequestnotification.MapRequest;
@@ -35,7 +38,8 @@ public class LispNotificationHelper {
     public static MapRegister convertMapRegister(org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.MapRegister mapRegister) {
         return new MapRegisterBuilder().setAuthenticationData(mapRegister.getAuthenticationData())
                 .setEidToLocatorRecord(mapRegister.getEidToLocatorRecord()).setKeyId(mapRegister.getKeyId()).setNonce(mapRegister.getNonce())
-                .setProxyMapReply(mapRegister.isProxyMapReply()).setWantMapNotify(mapRegister.isWantMapNotify()).build();
+                .setProxyMapReply(mapRegister.isProxyMapReply()).setWantMapNotify(mapRegister.isWantMapNotify())
+                .setXtrSiteIdPresent(mapRegister.isXtrSiteIdPresent()).setXtrId(mapRegister.getXtrId()).setSiteId(mapRegister.getSiteId()).build();
     }
 
     public static MapRequest convertMapRequest(org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.MapRequest mapRequest) {
@@ -77,6 +81,23 @@ public class LispNotificationHelper {
         if (address instanceof Ipv4) {
             tab.setIpAddress(IpAddressBuilder.getDefaultInstance(((Ipv4) address).getIpv4Address().getValue()));
             tab.setPort(new PortNumber(LispMessage.PORT_NUM));
+        } else if (address instanceof LcafKeyValue) {
+            PrimitiveAddress primitiveAddress = ((LcafKeyValue) address).getValue().getPrimitiveAddress();
+            if (primitiveAddress instanceof LispDistinguishedNameAddress) {
+                String value = ((LispDistinguishedNameAddress) primitiveAddress).getDistinguishedName();
+                String ip = value.split(":")[0];
+                int port = Integer.valueOf(value.split(":")[1]);
+                tab.setIpAddress(IpAddressBuilder.getDefaultInstance(ip));
+                tab.setPort(new PortNumber(port));
+            }
+        } else if (address instanceof DistinguishedName) {
+            DistinguishedName dname = (DistinguishedName) address;
+            String value = dname.getDistinguishedName();
+            String ip = value.split(":")[0];
+            int port = Integer.valueOf(value.split(":")[1]);
+
+            tab.setIpAddress(IpAddressBuilder.getDefaultInstance(ip));
+            tab.setPort(new PortNumber(port));
         } else if (address instanceof LcafApplicationDataAddress) {
             LcafApplicationDataAddress appData = (LcafApplicationDataAddress) address;
             tab.setIpAddress(IpAddressBuilder.getDefaultInstance(((LispIpv4Address) appData.getAddress().getPrimitiveAddress()).getIpv4Address()