Merge dev/fluorine work across to master

[unimgr.git] / cisco-xr-driver / src / main / java / org / opendaylight / unimgr / mef / nrp / cisco / xr / common / util / SipHandler.java

diff --git a/impl/src/main/java/org/opendaylight/unimgr/utils/SipHandler.java b/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/common/util/SipHandler.java
similarity index 59%
rename from impl/src/main/java/org/opendaylight/unimgr/utils/SipHandler.java
rename to cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/common/util/SipHandler.java
index 6859741300b9abe19ab503c0acff7e00ec45eaa6..c5dafe7c26c6e9e8ab7b14c755bd30a5ef64a711 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/utils/SipHandler.java
+++ b/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/common/util/SipHandler.java
@@ -5,9 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.unimgr.utils;
+package org.opendaylight.unimgr.mef.nrp.cisco.xr.common.util;
 
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.common.rev171113.Uuid;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev180307.ServiceInterfacePointRef;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev180307.Uuid;
 
 /**
  * @author marek.ryznar@amartus.com
@@ -24,7 +25,7 @@ public class SipHandler {
         return sipTab[sipTab.length - 1];
     }
 
-    public static boolean isTheSameDevice(Uuid sip1, Uuid sip2) {
-        return getDeviceName(sip1).equals(getDeviceName(sip2));
+    public static boolean isTheSameDevice(ServiceInterfacePointRef sip1, ServiceInterfacePointRef sip2) {
+        return getDeviceName(sip1.getServiceInterfacePointId()).equals(getDeviceName(sip2.getServiceInterfacePointId()));
     }
 }