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=2dab924e7709dc74fcb3047272d068f9e459c2d5;hp=ce541bae203727f0cdf208bd79f4a0c9e295a2d2;hb=7f84a4ff3b4480ca4b8d056bd18ee98ed155aa65;hpb=dc43a61816ddd75e3ad3a3a30bf64c60ad8275a2 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 ce541bae20..2dab924e77 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 @@ -1,14 +1,24 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * 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.controller.sample.toaster.provider; import java.util.Collections; - import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; 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.sal.binding.api.NotificationProviderService; -import org.opendaylight.controller.sal.common.util.Futures; +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.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; @@ -19,42 +29,45 @@ import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120 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.ToasterData; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToasterService; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OpendaylightToaster implements ToasterData, ToasterService { +import com.google.common.util.concurrent.Futures; + +public class OpendaylightToaster implements ToasterData, ToasterService, ToasterProviderRuntimeMXBean, AutoCloseable { private static final Logger log = LoggerFactory.getLogger(OpendaylightToaster.class); + private static final InstanceIdentifier toasterIID = InstanceIdentifier.builder(Toaster.class).build(); private static final DisplayString toasterManufacturer = new DisplayString("Opendaylight"); private static final DisplayString toasterModelNumber = new DisplayString("Model 1 - Binding Aware"); - private ToasterStatus toasterStatus; private NotificationProviderService notificationProvider; + private DataBrokerService dataProvider; private final ExecutorService executor; private Future> currentTask; public OpendaylightToaster() { - toasterStatus = ToasterStatus.Down; executor = Executors.newFixedThreadPool(1); } @Override - public Toaster getToaster() { + public synchronized Toaster getToaster() { ToasterBuilder tb = new ToasterBuilder(); tb // .setToasterManufacturer(toasterManufacturer) // - .setToasterModelNumber(toasterModelNumber) // - .setToasterStatus(toasterStatus); + .setToasterModelNumber(toasterModelNumber) // + .setToasterStatus(currentTask == null ? ToasterStatus.Up : ToasterStatus.Down); return tb.build(); } @Override - public Future> cancelToast() { + public synchronized Future> cancelToast() { if (currentTask != null) { cancelToastImpl(); } @@ -62,14 +75,14 @@ public class OpendaylightToaster implements ToasterData, ToasterService { } @Override - public Future> makeToast(MakeToastInput input) { - // TODO Auto-generated method stub - log.trace("makeToast - Received input for toast"); + public synchronized Future> makeToast(MakeToastInput input) { + log.debug("makeToast - Received input for toast"); logToastInput(input); if (currentTask != null) { return inProgressError(); } currentTask = executor.submit(new MakeToastTask(input)); + updateStatus(); return currentTask; } @@ -82,19 +95,56 @@ public class OpendaylightToaster implements ToasterData, ToasterService { currentTask.cancel(true); ToastDoneBuilder toastDone = new ToastDoneBuilder(); toastDone.setToastStatus(ToastStatus.Cancelled); - notificationProvider.notify(toastDone.build()); + notificationProvider.publish(toastDone.build()); } public void setNotificationProvider(NotificationProviderService salService) { this.notificationProvider = salService; } + public void setDataProvider(DataBrokerService salDataProvider) { + this.dataProvider = salDataProvider; + updateStatus(); + } + private void logToastInput(MakeToastInput input) { String toastType = input.getToasterToastType().getName(); String toastDoneness = input.getToasterDoneness().toString(); log.trace("Toast: {} doneness: {}", toastType, toastDoneness); } + private final AtomicLong toastsMade = new AtomicLong(0); + + @Override + public Long getToastsMade() { + return toastsMade.get(); + } + + private void updateStatus() { + if (dataProvider != null) { + final DataModificationTransaction t = dataProvider.beginTransaction(); + t.removeOperationalData(toasterIID); + t.putOperationalData(toasterIID, getToaster()); + + try { + t.commit().get(); + } catch (InterruptedException | ExecutionException e) { + log.warn("Failed to update toaster status, operational otherwise", e); + } + } else { + log.trace("No data provider configured, not updating status"); + } + } + + @Override + public void close() throws ExecutionException, InterruptedException { + if (dataProvider != null) { + final DataModificationTransaction t = dataProvider.beginTransaction(); + t.removeOperationalData(toasterIID); + t.commit().get(); + } + } + private class MakeToastTask implements Callable> { final MakeToastInput toastRequest; @@ -104,15 +154,19 @@ public class OpendaylightToaster implements ToasterData, ToasterService { } @Override - public RpcResult call() throws Exception { - Thread.sleep(1000); + public RpcResult call() throws InterruptedException { + Thread.sleep(1000 * toastRequest.getToasterDoneness()); ToastDoneBuilder notifyBuilder = new ToastDoneBuilder(); notifyBuilder.setToastStatus(ToastStatus.Done); - notificationProvider.notify(notifyBuilder.build()); - log.trace("Toast Done"); + notificationProvider.publish(notifyBuilder.build()); + log.debug("Toast Done"); logToastInput(toastRequest); + currentTask = null; + toastsMade.incrementAndGet(); + updateStatus(); + return Rpcs. getRpcResult(true, null, Collections. emptySet()); } }