fixed lisp notification handler and added logs

Change-Id: I540b394e4d67cc19894fd37f928c2478149b5344
Signed-off-by: David Goldberg <david.goldberg@contextream.com>

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 7978417c5ed7f2390cee1416dd616433f0806083..0d1d7ec2d5d4d2d6fa8e87aefded3d5c2273abfe 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
@@ -12,14 +12,15 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 
 import org.opendaylight.lispflowmapping.implementation.serializer.LispMessage;
-import org.opendaylight.lispflowmapping.type.AddressFamilyNumberEnum;
 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.Ipv4Builder;
+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;
@@ -79,12 +80,21 @@ 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) {

diff --git a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPlugin.java b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPlugin.java
index 4bf06d1ae6a6af47df575a4389c9e92634fd8fb7..1594044ffcd986fd57b42be11c82a7e921a27da9 100644 (file)
--- a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPlugin.java
+++ b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPlugin.java
@@ -313,13 +313,17 @@ public class LispSouthboundPlugin extends AbstractBindingAwareProvider implement
 
     @Override
     public Future<RpcResult<Void>> shouldListenOnXtrPort(ShouldListenOnXtrPortInput input) {
+       logger.debug("got a call to shouldListenOnXtrPort");
         if (listenOnXtrPort == input.isShouldListenOnXtrPort()) {
+           logger.debug("no action done, ond and new value are identical, " + listenOnXtrPort); 
             return null;
         }
         listenOnXtrPort = input.isShouldListenOnXtrPort();
         if (listenOnXtrPort) {
+           logger.debug("restarting xtr thread");
             restartXtrThread();
         } else {
+           logger.debug("terminating thread");
             stopXtrThread();
         }
         return null;