Merge "Fix for BUG 3623"

[vpnservice.git] / interfacemgr / interfacemgr-impl / src / main / java / org / opendaylight / vpnservice / interfacemgr / InterfaceManager.java

diff --git a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/InterfaceManager.java b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/InterfaceManager.java
index 0f75bb6b1705398f5de1d312e7570a9cb8e44bbf..d03fd5f6d313260f53d802a53be9289c96d85425 100644 (file)
--- a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/InterfaceManager.java
+++ b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/InterfaceManager.java
@@ -432,12 +432,34 @@ public class InterfaceManager extends AbstractDataChangeListener<Interface> impl
         return getPortNumForInterface(iface);
     }
 
+    Long getPortForInterface(Interface intrf) {
+        try {
+            NodeConnector port = getNodeConnectorFromDataStore(intrf);
+            NodeConnectorId id = null;
+            if(port == null) {
+                id = getNodeConnectorIdFromInterface(intrf);
+            } else {
+                id = port.getId();
+            }
+            String portNo = IfmUtil.getPortNoFromNodeConnectorId(id);
+            return Long.parseLong(portNo);
+        } catch (NullPointerException e) {
+            LOG.error("Port for Interface {} not found", intrf.getName(), e);
+        }
+        return 0L;
+    }
 
     public BigInteger getDpnForInterface(Interface intrf) {
         try {
             NodeConnector port = getNodeConnectorFromDataStore(intrf);
+            NodeConnectorId id = null;
+            if(port == null) {
+                id = getNodeConnectorIdFromInterface(intrf);
+            } else {
+                id = port.getId();
+            }
             //TODO: This should be an MDSAL Util method
-            return new BigInteger(IfmUtil.getDpnFromNodeConnectorId(port.getId()));
+            return new BigInteger(IfmUtil.getDpnFromNodeConnectorId(id));
         } catch (NullPointerException e) {
             LOG.error("dpn for Interface {} not found", intrf.getName(), e);
         }