X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsamples%2Ftoaster-provider%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsample%2Ftoaster%2Fprovider%2FOpendaylightToaster.java;h=ec352e8f510dad03911be2ad2eeb0ec6a5c44542;hp=b4da5a3d226f05bfd02fe21890ea0307e7efb2ce;hb=a9533db1d57a2729772ee192a2f96d358c71bede;hpb=04a788d2df5303c60cdbcff02254291f411566bd diff --git a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java index b4da5a3d22..ec352e8f51 100644 --- a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java +++ b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java @@ -17,26 +17,29 @@ import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicLong; import org.opendaylight.controller.config.yang.config.toaster_provider.impl.ToasterProviderRuntimeMXBean; -import org.opendaylight.controller.md.sal.common.api.data.DataChangeEvent; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.controller.md.sal.binding.api.DataChangeListener; +import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; +import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; +import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; -import org.opendaylight.controller.sal.binding.api.data.DataBrokerService; -import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction; import org.opendaylight.controller.sal.common.util.RpcErrors; import org.opendaylight.controller.sal.common.util.Rpcs; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.DisplayString; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.MakeToastInput; +import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.RestockToasterInput; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.Toaster; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.Toaster.ToasterStatus; -import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.RestockToasterInput; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToasterBuilder; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToasterOutOfBreadBuilder; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToasterRestocked; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToasterRestockedBuilder; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToasterService; -import org.opendaylight.controller.sal.binding.api.data.DataChangeListener; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcError; +import org.opendaylight.yangtools.yang.common.RpcError.ErrorSeverity; +import org.opendaylight.yangtools.yang.common.RpcError.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,7 +57,7 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti private static final DisplayString TOASTER_MODEL_NUMBER = new DisplayString("Model 1 - Binding Aware"); private NotificationProviderService notificationProvider; - private DataBrokerService dataProvider; + private DataBroker dataProvider; private final ExecutorService executor; @@ -74,11 +77,11 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti executor = Executors.newFixedThreadPool(1); } - public void setNotificationProvider(NotificationProviderService salService) { + public void setNotificationProvider(final NotificationProviderService salService) { this.notificationProvider = salService; } - public void setDataProvider(DataBrokerService salDataProvider) { + public void setDataProvider(final DataBroker salDataProvider) { this.dataProvider = salDataProvider; updateStatus(); } @@ -92,9 +95,9 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti executor.shutdown(); if (dataProvider != null) { - final DataModificationTransaction t = dataProvider.beginTransaction(); - t.removeOperationalData(TOASTER_IID); - t.commit().get(); + WriteTransaction t = dataProvider.newWriteOnlyTransaction(); + t.delete(LogicalDatastoreType.OPERATIONAL,TOASTER_IID); + t.commit().get(); // FIXME: This call should not be blocking. } } @@ -116,8 +119,8 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti * Implemented from the DataChangeListener interface. */ @Override - public void onDataChanged( DataChangeEvent, DataObject> change ) { - DataObject dataObject = change.getUpdatedConfigurationData().get( TOASTER_IID ); + public void onDataChanged( final AsyncDataChangeEvent, DataObject> change ) { + DataObject dataObject = change.getUpdatedSubtree(); if( dataObject instanceof Toaster ) { Toaster toaster = (Toaster) dataObject; @@ -148,7 +151,7 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti * RestConf RPC call implemented from the ToasterService interface. */ @Override - public Future> makeToast(MakeToastInput input) { + public Future> makeToast(final MakeToastInput input) { LOG.info("makeToast: " + input); synchronized (taskLock) { @@ -157,14 +160,15 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti LOG.info( "Toaster is already making toast" ); RpcResult result = Rpcs. getRpcResult(false, null, Arrays.asList( - RpcErrors.getRpcError( null, null, null, null, - "Toaster is busy", null, null ) ) ); + RpcErrors.getRpcError( "", "in-use", null, ErrorSeverity.WARNING, + "Toaster is busy", ErrorType.APPLICATION, null ) ) ); return Futures.immediateFuture(result); } else if( outOfBread() ) { RpcResult result = Rpcs. getRpcResult(false, null, Arrays.asList( - RpcErrors.getRpcError( null, null, null, null, - "Toaster is out of bread", null, null ) ) ); + RpcErrors.getRpcError( "out-of-stock", "resource-denied", null, null, + "Toaster is out of bread", + ErrorType.APPLICATION, null ) ) ); return Futures.immediateFuture(result); } else { @@ -188,7 +192,7 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti * ToasterRestocked notification. */ @Override - public Future> restockToaster(RestockToasterInput input) { + public Future> restockToaster(final RestockToasterInput input) { LOG.info( "restockToaster: " + input ); synchronized( taskLock ) { @@ -223,12 +227,11 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti private void updateStatus() { if (dataProvider != null) { - final DataModificationTransaction t = dataProvider.beginTransaction(); - t.removeOperationalData(TOASTER_IID); - t.putOperationalData(TOASTER_IID, buildToaster()); + WriteTransaction tx = dataProvider.newWriteOnlyTransaction(); + tx.put(LogicalDatastoreType.OPERATIONAL,TOASTER_IID, buildToaster()); try { - t.commit().get(); + tx.commit().get(); } catch (InterruptedException | ExecutionException e) { LOG.warn("Failed to update toaster status, operational otherwise", e); } @@ -246,7 +249,7 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti final MakeToastInput toastRequest; - public MakeToastTask(MakeToastInput toast) { + public MakeToastTask(final MakeToastInput toast) { toastRequest = toast; }