*/
package org.opendaylight.openflowplugin.samples.sample.bundles;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import org.opendaylight.mdsal.binding.api.ClusteredDataTreeChangeListener;
+import javax.annotation.PreDestroy;
+import javax.inject.Inject;
+import javax.inject.Singleton;
import org.opendaylight.mdsal.binding.api.DataBroker;
import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType;
+import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
import org.opendaylight.mdsal.binding.api.DataTreeModification;
+import org.opendaylight.mdsal.binding.api.RpcService;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.GroupActionCaseBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.ethernet.match.fields.EthernetTypeBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.EthernetMatchBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv4MatchBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.AddBundleMessagesInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.AddBundleMessages;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.AddBundleMessagesInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.AddBundleMessagesOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.ControlBundleInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.ControlBundle;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.ControlBundleInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.ControlBundleOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.SalBundleService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.add.bundle.messages.input.Messages;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.add.bundle.messages.input.MessagesBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.add.bundle.messages.input.messages.Message;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.add.bundle.messages.input.messages.MessageBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.rev170124.BundleControlType;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.rev170124.BundleFlags;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.rev170124.BundleId;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.concepts.Registration;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.binding.util.BindingMap;
-import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.Uint16;
import org.opendaylight.yangtools.yang.common.Uint32;
import org.opendaylight.yangtools.yang.common.Uint64;
import org.opendaylight.yangtools.yang.common.Uint8;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Sample DataTreeChangeListener.
*/
-public class SampleFlowCapableNodeListener implements ClusteredDataTreeChangeListener<FlowCapableNode>, AutoCloseable {
-
+@Singleton
+@Component(service = { })
+public final class SampleFlowCapableNodeListener implements DataTreeChangeListener<FlowCapableNode>, AutoCloseable {
private static final Logger LOG = LoggerFactory.getLogger(SampleFlowCapableNodeListener.class);
private static final BundleId BUNDLE_ID = new BundleId(Uint32.ONE);
private static final BundleFlags BUNDLE_FLAGS = new BundleFlags(true, true);
private static final ExecutorService EXECUTOR = Executors.newSingleThreadExecutor();
- private final DataBroker dataBroker;
- private final SalBundleService bundleService;
- private ListenerRegistration<?> listenerReg;
-
- public SampleFlowCapableNodeListener(final DataBroker dataBroker, final SalBundleService bundleService) {
- this.dataBroker = dataBroker;
- this.bundleService = bundleService;
- }
-
- @Override
- public void close() {
- LOG.debug("close() passing");
- if (listenerReg != null) {
- listenerReg.close();
- }
- }
+ private final ControlBundle controlBundle;
+ private final AddBundleMessages addBundleMessages;
+ private final Registration listenerReg;
- public void init() {
+ @Inject
+ @Activate
+ public SampleFlowCapableNodeListener(@Reference final DataBroker dataBroker,
+ @Reference final RpcService rpcService) {
+ controlBundle = rpcService.getRpc(ControlBundle.class);
+ addBundleMessages = rpcService.getRpc(AddBundleMessages.class);
LOG.debug("inSessionInitialized() passing");
final InstanceIdentifier<FlowCapableNode> path = InstanceIdentifier.create(Nodes.class).child(Node.class)
.augmentation(FlowCapableNode.class);
final DataTreeIdentifier<FlowCapableNode> identifier =
- DataTreeIdentifier.create(LogicalDatastoreType.OPERATIONAL, path);
+ DataTreeIdentifier.of(LogicalDatastoreType.OPERATIONAL, path);
- listenerReg = dataBroker.registerDataTreeChangeListener(identifier, SampleFlowCapableNodeListener.this);
+ listenerReg = dataBroker.registerTreeChangeListener(identifier, SampleFlowCapableNodeListener.this);
+ }
+
+ @PreDestroy
+ @Deactivate
+ @Override
+ public void close() {
+ LOG.debug("close() passing");
+ listenerReg.close();
}
@Override
- public void onDataTreeChanged(final Collection<DataTreeModification<FlowCapableNode>> modifications) {
- for (DataTreeModification<FlowCapableNode> modification : modifications) {
- if (modification.getRootNode().getModificationType() == ModificationType.WRITE) {
- LOG.info("Node connected: {}",
- modification.getRootPath().getRootIdentifier().firstIdentifierOf(Node.class));
+ public void onDataTreeChanged(final List<DataTreeModification<FlowCapableNode>> modifications) {
+ for (var modification : modifications) {
+ if (modification.getRootNode().modificationType() == ModificationType.WRITE) {
+ final var nodePath = modification.getRootPath().path().firstIdentifierOf(Node.class);
+ LOG.info("Node connected: {}", nodePath);
- final NodeRef nodeRef =
- new NodeRef(modification.getRootPath().getRootIdentifier().firstIdentifierOf(Node.class));
+ final var nodeRef = new NodeRef(nodePath);
- final ControlBundleInput openBundleInput = new ControlBundleInputBuilder()
+ final var openBundleInput = new ControlBundleInputBuilder()
.setNode(nodeRef)
.setBundleId(BUNDLE_ID)
.setFlags(BUNDLE_FLAGS)
.setType(BundleControlType.ONFBCTOPENREQUEST)
.build();
- final ControlBundleInput commitBundleInput = new ControlBundleInputBuilder()
+ final var commitBundleInput = new ControlBundleInputBuilder()
.setNode(nodeRef)
.setBundleId(BUNDLE_ID)
.setFlags(BUNDLE_FLAGS)
.setType(BundleControlType.ONFBCTCOMMITREQUEST)
.build();
- final List<Message> innerMessages = createMessages(nodeRef);
- final Messages messages = new MessagesBuilder().setMessage(innerMessages).build();
- final AddBundleMessagesInput addBundleMessagesInput = new AddBundleMessagesInputBuilder()
+ final var innerMessages = createMessages(nodeRef);
+ final var messages = new MessagesBuilder().setMessage(innerMessages).build();
+ final var addBundleMessagesInput = new AddBundleMessagesInputBuilder()
.setNode(nodeRef)
.setBundleId(BUNDLE_ID)
.setFlags(BUNDLE_FLAGS)
.setMessages(messages)
.build();
- makeCompletableFuture(bundleService.controlBundle(openBundleInput))
+ makeCompletableFuture(controlBundle.invoke(openBundleInput))
.thenComposeAsync(voidRpcResult -> {
LOG.debug("Open successful: {}, msg: {}", voidRpcResult.isSuccessful(),
voidRpcResult.getErrors());
-
- final CompletableFuture<RpcResult<AddBundleMessagesOutput>> addFuture =
- makeCompletableFuture(bundleService.addBundleMessages(addBundleMessagesInput));
-
- return addFuture;
+ return makeCompletableFuture(addBundleMessages.invoke(addBundleMessagesInput));
}).thenComposeAsync(voidRpcResult -> {
LOG.debug("AddBundleMessages successful: {}, msg: {}", voidRpcResult.isSuccessful(),
voidRpcResult.getErrors());
-
- final CompletableFuture<RpcResult<ControlBundleOutput>> controlCommitFuture =
- makeCompletableFuture(bundleService.controlBundle(commitBundleInput));
-
- return controlCommitFuture;
+ return makeCompletableFuture(controlBundle.invoke(commitBundleInput));
}).thenAccept(voidRpcResult -> LOG.debug("Commit successful: {}, msg: {}",
voidRpcResult.isSuccessful(), voidRpcResult.getErrors()));
}
try {
return future.get();
} catch (InterruptedException | ExecutionException e) {
- throw new RuntimeException(e);
+ throw new IllegalStateException(e);
}
}, EXECUTOR);
}
private static List<Message> createMessages(final NodeRef nodeRef) {
- List<Message> messages = new ArrayList<>();
-
-
- messages.add(new MessageBuilder()
- .setNode(nodeRef)
- .setBundleInnerMessage(new BundleAddGroupCaseBuilder()
- .setAddGroupCaseData(new AddGroupCaseDataBuilder(createGroup(Uint32.ONE)).build()).build())
- .build());
-
- messages.add(new MessageBuilder()
- .setNode(nodeRef)
- .setBundleInnerMessage(new BundleAddFlowCaseBuilder()
- .setAddFlowCaseData(new AddFlowCaseDataBuilder(createFlow("42", Uint32.ONE, Uint16.ONE, Uint8.ONE))
+ final var messages = List.of(
+ new MessageBuilder()
+ .setNode(nodeRef)
+ .setBundleInnerMessage(new BundleAddGroupCaseBuilder()
+ .setAddGroupCaseData(new AddGroupCaseDataBuilder(createGroup(Uint32.ONE)).build()).build())
+ .build(),
+ new MessageBuilder()
+ .setNode(nodeRef)
+ .setBundleInnerMessage(new BundleAddFlowCaseBuilder()
+ .setAddFlowCaseData(
+ new AddFlowCaseDataBuilder(createFlow("42", Uint32.ONE, Uint16.ONE, Uint8.ONE)).build())
.build())
- .build())
- .build());
-
- messages.add(new MessageBuilder()
- .setNode(nodeRef)
- .setBundleInnerMessage(new BundleAddFlowCaseBuilder()
- .setAddFlowCaseData(new AddFlowCaseDataBuilder(createFlow("43", Uint32.ONE, Uint16.TWO, Uint8.TWO))
+ .build(),
+ new MessageBuilder()
+ .setNode(nodeRef)
+ .setBundleInnerMessage(new BundleAddFlowCaseBuilder()
+ .setAddFlowCaseData(
+ new AddFlowCaseDataBuilder(createFlow("43", Uint32.ONE, Uint16.TWO, Uint8.TWO)).build())
.build())
- .build())
- .build());
+ .build());
LOG.debug("createMessages() passing {}", messages);
Code Review / openflowplugin.git / blobdiff