Bump to yangtools-2.0.0 and odlparent-3.0.2

[unimgr.git] / impl / src / main / java / org / opendaylight / unimgr / mef / nrp / impl / ext / UnimgrExtServiceImpl.java

diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ext/UnimgrExtServiceImpl.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ext/UnimgrExtServiceImpl.java
index 3468226fe8c6276c30424a9b4dc456d4ad983ae6..7e99d77d3a6a4a5a2270cd11fcb264105222df4d 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ext/UnimgrExtServiceImpl.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ext/UnimgrExtServiceImpl.java
@@ -17,23 +17,23 @@ import java.util.concurrent.Future;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.unimgr.mef.nrp.api.TapiConstants;
 import org.opendaylight.unimgr.mef.nrp.common.NrpDao;
+import org.opendaylight.unimgr.mef.nrp.common.TapiUtils;
 import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp._interface.rev171221.ServiceInterfacePoint1;
 import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp._interface.rev171221.ServiceInterfacePoint1Builder;
 import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp._interface.rev171221.nrp.sip.attrs.NrpCarrierEthEnniNResourceBuilder;
 import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp._interface.rev171221.nrp.sip.attrs.NrpCarrierEthInniNResourceBuilder;
 import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp._interface.rev171221.nrp.sip.attrs.NrpCarrierEthUniNResourceBuilder;
-import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.AddSipInput;
-import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.UnimgrExtService;
-import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.add.sip.input.SipType;
-import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.add.sip.input.sip.type.EnniSpec;
-import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.add.sip.input.sip.type.InniSpec;
-import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.add.sip.input.sip.type.UniSpec;
+import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev170531.AddSipInput;
+import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev170531.UnimgrExtService;
+import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev170531.add.sip.input.SipType;
+import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev170531.add.sip.input.sip.type.EnniSpec;
+import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev170531.add.sip.input.sip.type.InniSpec;
+import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev170531.add.sip.input.sip.type.UniSpec;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.common.rev171113.ETH;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.common.rev171113.Uuid;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.common.rev171113.context.attrs.ServiceInterfacePointBuilder;
@@ -54,7 +54,7 @@ import com.google.common.base.Optional;
  */
 public class UnimgrExtServiceImpl implements UnimgrExtService {
 
-    private ExecutorService executor = new ThreadPoolExecutor(1, 4,
+    private final ExecutorService executor = new ThreadPoolExecutor(1, 4,
             10, TimeUnit.MINUTES,
             new LinkedBlockingQueue<>());
 
@@ -90,15 +90,12 @@ public class UnimgrExtServiceImpl implements UnimgrExtService {
             }
 
             NrpDao nrpDao = new NrpDao(tx);
-            LayerProtocolBuilder lpBuilder = new LayerProtocolBuilder()
-                    .setLocalId("eth")
-                    .setLayerProtocolName(ETH.class);
 
             ServiceInterfacePoint1 sip1 = getServiceInterfacePoint(sipType);
             ServiceInterfacePointBuilder sipBuilder = new ServiceInterfacePointBuilder()
                     .setUuid(sipId)
                     .addAugmentation(ServiceInterfacePoint1.class, sip1)
-                    .setLayerProtocol(Collections.singletonList(lpBuilder.build()));
+                    .setLayerProtocol(Collections.singletonList(TapiUtils.toSipPN(ETH.class)));
 
             nrpDao.addSip(
                 sipBuilder
@@ -120,21 +117,21 @@ public class UnimgrExtServiceImpl implements UnimgrExtService {
         ServiceInterfacePoint1 sip = null;
 
         if (sipType instanceof InniSpec) {
-            org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.add.sip.input.sip.type.inni.spec.InniSpec spec = ((InniSpec) sipType).getInniSpec();
+            org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev170531.add.sip.input.sip.type.inni.spec.InniSpec spec = ((InniSpec) sipType).getInniSpec();
             if (spec != null) {
                 sip = new ServiceInterfacePoint1Builder()
                     .setNrpCarrierEthInniNResource(new NrpCarrierEthInniNResourceBuilder(spec).build()).build();
             }
 
         } else if (sipType instanceof EnniSpec) {
-            org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.add.sip.input.sip.type.enni.spec.EnniSpec spec = ((EnniSpec) sipType).getEnniSpec();
+            org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev170531.add.sip.input.sip.type.enni.spec.EnniSpec spec = ((EnniSpec) sipType).getEnniSpec();
             if (spec != null) {
                 sip = new ServiceInterfacePoint1Builder()
                     .setNrpCarrierEthEnniNResource(new NrpCarrierEthEnniNResourceBuilder(spec).build()).build();
             }
 
         } else if (sipType instanceof UniSpec) {
-            org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.add.sip.input.sip.type.uni.spec.UniSpec spec = ((UniSpec) sipType).getUniSpec();
+            org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev170531.add.sip.input.sip.type.uni.spec.UniSpec spec = ((UniSpec) sipType).getUniSpec();
             if (spec != null) {
                 sip = new ServiceInterfacePoint1Builder()
                     .setNrpCarrierEthUniNResource(new NrpCarrierEthUniNResourceBuilder(spec).build()).build();