Remove sfc-translator MdsalUtils::read()

[netvirt.git] / vpnservice / sfc / translator / src / main / java / org / opendaylight / netvirt / sfc / translator / SfcMdsalHelper.java

diff --git a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java b/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java
index 3a4f166c95083870bdda1405b8d2873cfbb30141..3281a39e57ec27937fefc8564161529072fd458e 100644 (file)
--- a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java
+++ b/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java
@@ -11,6 +11,7 @@ package org.opendaylight.netvirt.sfc.translator;
 import java.util.List;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.ServiceFunctions;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.functions.ServiceFunction;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.functions.ServiceFunctionKey;
@@ -77,7 +78,8 @@ public class SfcMdsalHelper {
     public ServiceFunction readServiceFunction(ServiceFunctionKey sfKey) {
         InstanceIdentifier<ServiceFunction> sfIid = getSFPath(sfKey);
         LOG.info("Read Service Function {} from config data store at {}",sfKey, sfIid);
-        return mdsalUtils.read(LogicalDatastoreType.CONFIGURATION, sfIid);
+        return SingleTransactionDataBroker.syncReadOptionalAndTreatReadFailedExceptionAsAbsentOptional(dataBroker,
+                LogicalDatastoreType.CONFIGURATION, sfIid).orNull();
     }
 
     public void addServiceFunction(ServiceFunction sf) {
@@ -102,7 +104,8 @@ public class SfcMdsalHelper {
     public ServiceFunctionForwarder readServiceFunctionForwarder(ServiceFunctionForwarderKey sffKey) {
         InstanceIdentifier<ServiceFunctionForwarder> sffIid = getSFFPath(sffKey);
         LOG.info("Read Service Function Forwarder from config data store at {}", sffIid);
-        return mdsalUtils.read(LogicalDatastoreType.CONFIGURATION, sffIid);
+        return SingleTransactionDataBroker.syncReadOptionalAndTreatReadFailedExceptionAsAbsentOptional(dataBroker,
+                LogicalDatastoreType.CONFIGURATION, sffIid).orNull();
     }
 
     public void addServiceFunctionForwarder(ServiceFunctionForwarder sff) {
@@ -162,7 +165,9 @@ public class SfcMdsalHelper {
     }
 
     public ServiceFunctionForwarder getExistingSFF(String ipAddress) {
-        ServiceFunctionForwarders existingSffs = mdsalUtils.read(LogicalDatastoreType.CONFIGURATION, sffIid);
+        ServiceFunctionForwarders existingSffs =
+                SingleTransactionDataBroker.syncReadOptionalAndTreatReadFailedExceptionAsAbsentOptional(dataBroker,
+                        LogicalDatastoreType.CONFIGURATION, sffIid).orNull();
         if (existingSffs != null
                 && existingSffs.getServiceFunctionForwarder() != null
                 && !existingSffs.getServiceFunctionForwarder().isEmpty()) {