X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=applications%2Fforwardingrules-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fapplications%2Ffrm%2Fimpl%2FGroupForwarder.java;h=e2ec86f67badea0399505d99ee6d994fe6f07b82;hb=cfe3a97837951ebbedb337dc988027f10c49f714;hp=0441d84da6b8452ffcdf8d5c7ca7c6e7b45142cd;hpb=d91dabeb009582eb8a84bcc6287d626b4ae79999;p=openflowplugin.git diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/GroupForwarder.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/GroupForwarder.java index 0441d84da6..e2ec86f67b 100644 --- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/GroupForwarder.java +++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/GroupForwarder.java @@ -1,5 +1,5 @@ -/** - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. +/* + * Copyright (c) 2014, 2017 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, @@ -7,23 +7,31 @@ */ package org.opendaylight.openflowplugin.applications.frm.impl; -import com.google.common.base.Preconditions; -import com.google.common.util.concurrent.CheckedFuture; +import static org.opendaylight.openflowplugin.applications.frm.util.FrmUtil.getActiveBundle; +import static org.opendaylight.openflowplugin.applications.frm.util.FrmUtil.getNodeIdFromNodeIdentifier; + +import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; +import java.util.concurrent.Future; +import org.opendaylight.infrautils.utils.concurrent.JdkFutures; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; +import org.opendaylight.mdsal.binding.api.WriteTransaction; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.openflowplugin.applications.frm.ForwardingRulesManager; -import org.opendaylight.openflowplugin.common.wait.SimpleTaskRetryLooper; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; +import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.AddGroupInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.AddGroupInputBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.AddGroupOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.RemoveGroupInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.RemoveGroupOutput; +import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.UpdateGroupInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.UpdateGroupInputBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.UpdateGroupOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.group.update.OriginalGroupBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.group.update.UpdatedGroupBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupId; @@ -32,95 +40,99 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.StaleGroup; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.StaleGroupBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.StaleGroupKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.rev170124.BundleId; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.concurrent.Callable; -import java.util.concurrent.Future; - /** - * GroupForwarder - * It implements {@link org.opendaylight.controller.md.sal.binding.api.DataChangeListener}} - * for WildCardedPath to {@link Group} and ForwardingRulesCommiter interface for methods: - * add, update and remove {@link Group} processing for - * {@link org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent}. - * - * @author Vaclav Demcak - * + * GroupForwarder It implements + * {@link org.opendaylight.mdsal.binding.api.DataTreeChangeListener} + * for WildCardedPath to {@link Group} and ForwardingRulesCommiter interface for + * methods: add, update and remove {@link Group} processing for + * {@link org.opendaylight.mdsal.binding.api.DataTreeModification}. */ public class GroupForwarder extends AbstractListeningCommiter { private static final Logger LOG = LoggerFactory.getLogger(GroupForwarder.class); - - private final DataBroker dataBroker; - private ListenerRegistration listenerRegistration; + private final BundleGroupForwarder bundleGroupForwarder; - public GroupForwarder (final ForwardingRulesManager manager, final DataBroker db) { - super(manager, Group.class); - dataBroker = Preconditions.checkNotNull(db, "DataBroker can not be null!"); - final DataTreeIdentifier treeId = new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION, getWildCardPath()); + public GroupForwarder(final ForwardingRulesManager manager, final DataBroker db) { + super(manager, db); + this.bundleGroupForwarder = new BundleGroupForwarder(manager); + } + + @SuppressWarnings("IllegalCatch") + @Override + public void registerListener() { + final DataTreeIdentifier treeId = DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION, + getWildCardPath()); try { - SimpleTaskRetryLooper looper = new SimpleTaskRetryLooper(ForwardingRulesManagerImpl.STARTUP_LOOP_TICK, - ForwardingRulesManagerImpl.STARTUP_LOOP_MAX_RETRIES); - listenerRegistration = looper.loopUntilNoException(new Callable>() { - @Override - public ListenerRegistration call() throws Exception { - return db.registerDataTreeChangeListener(treeId, GroupForwarder.this); - } - }); + listenerRegistration = dataBroker.registerDataTreeChangeListener(treeId, GroupForwarder.this); } catch (final Exception e) { - LOG.warn("FRM Group DataChange listener registration fail!"); - LOG.debug("FRM Group DataChange listener registration fail ..", e); - throw new IllegalStateException("FlowForwarder startup fail! System needs restart.", e); + LOG.warn("FRM Group DataTreeChange listener registration fail!"); + LOG.debug("FRM Group DataTreeChange listener registration fail ..", e); + throw new IllegalStateException("GroupForwarder startup fail! System needs restart.", e); } } + @Override + public void deregisterListener() { + close(); + } + @Override public void close() { if (listenerRegistration != null) { - try { - listenerRegistration.close(); - } catch (Exception e) { - LOG.warn("Error by stop FRM GroupChangeListener: {}", e.getMessage()); - LOG.debug("Error by stop FRM GroupChangeListener..", e); - } + listenerRegistration.close(); listenerRegistration = null; } } @Override protected InstanceIdentifier getWildCardPath() { - return InstanceIdentifier.create(Nodes.class).child(Node.class) - .augmentation(FlowCapableNode.class).child(Group.class); + return InstanceIdentifier.create(Nodes.class).child(Node.class).augmentation(FlowCapableNode.class) + .child(Group.class); } @Override public void remove(final InstanceIdentifier identifier, final Group removeDataObj, - final InstanceIdentifier nodeIdent) { - - final Group group = (removeDataObj); - final RemoveGroupInputBuilder builder = new RemoveGroupInputBuilder(group); - - builder.setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class))); - builder.setGroupRef(new GroupRef(identifier)); - builder.setTransactionUri(new Uri(provider.getNewTransactionId())); - this.provider.getSalGroupService().removeGroup(builder.build()); + final InstanceIdentifier nodeIdent) { + BundleId bundleId = getActiveBundle(nodeIdent, provider); + if (bundleId != null) { + bundleGroupForwarder.remove(identifier, removeDataObj, nodeIdent, bundleId); + } else { + final Group group = removeDataObj; + final RemoveGroupInputBuilder builder = new RemoveGroupInputBuilder(group); + final NodeId nodeId = getNodeIdFromNodeIdentifier(nodeIdent); + + builder.setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class))); + builder.setGroupRef(new GroupRef(identifier)); + builder.setTransactionUri(new Uri(provider.getNewTransactionId())); + + final ListenableFuture> resultFuture = + this.provider.getSalGroupService().removeGroup(builder.build()); + Futures.addCallback(resultFuture, + new RemoveGroupCallBack(removeDataObj.getGroupId().getValue(), nodeId), + MoreExecutors.directExecutor()); + JdkFutures.addErrorLogging(resultFuture, LOG, "removeGroup"); + } } - //TODO: Pull this into ForwardingRulesCommiter and override it here + // TODO: Pull this into ForwardingRulesCommiter and override it here @Override - public Future> removeWithResult(final InstanceIdentifier identifier, final Group removeDataObj, - final InstanceIdentifier nodeIdent) { + public Future> removeWithResult(final InstanceIdentifier identifier, + final Group removeDataObj, final InstanceIdentifier nodeIdent) { - final Group group = (removeDataObj); + final Group group = removeDataObj; final RemoveGroupInputBuilder builder = new RemoveGroupInputBuilder(group); builder.setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class))); @@ -130,77 +142,181 @@ public class GroupForwarder extends AbstractListeningCommiter { } @Override - public void update(final InstanceIdentifier identifier, - final Group original, final Group update, - final InstanceIdentifier nodeIdent) { - - final Group originalGroup = (original); - final Group updatedGroup = (update); - final UpdateGroupInputBuilder builder = new UpdateGroupInputBuilder(); - - builder.setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class))); - builder.setGroupRef(new GroupRef(identifier)); - builder.setTransactionUri(new Uri(provider.getNewTransactionId())); - builder.setUpdatedGroup((new UpdatedGroupBuilder(updatedGroup)).build()); - builder.setOriginalGroup((new OriginalGroupBuilder(originalGroup)).build()); - - this.provider.getSalGroupService().updateGroup(builder.build()); + public void update(final InstanceIdentifier identifier, final Group original, final Group update, + final InstanceIdentifier nodeIdent) { + BundleId bundleId = getActiveBundle(nodeIdent, provider); + if (bundleId != null) { + bundleGroupForwarder.update(identifier, original, update, nodeIdent, bundleId); + } else { + final NodeId nodeId = getNodeIdFromNodeIdentifier(nodeIdent); + nodeConfigurator.enqueueJob(nodeId.getValue(), () -> { + final Group originalGroup = original; + final Group updatedGroup = update; + final UpdateGroupInputBuilder builder = new UpdateGroupInputBuilder(); + builder.setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class))); + builder.setGroupRef(new GroupRef(identifier)); + builder.setTransactionUri(new Uri(provider.getNewTransactionId())); + builder.setUpdatedGroup(new UpdatedGroupBuilder(updatedGroup).build()); + builder.setOriginalGroup(new OriginalGroupBuilder(originalGroup).build()); + UpdateGroupInput updateGroupInput = builder.build(); + final ListenableFuture> resultFuture; + resultFuture = this.provider.getSalGroupService().updateGroup(updateGroupInput); + JdkFutures.addErrorLogging(resultFuture, LOG, "updateGroup"); + Futures.addCallback(resultFuture, + new UpdateGroupCallBack(updateGroupInput.getOriginalGroup().getGroupId().getValue(), nodeId), + MoreExecutors.directExecutor()); + return resultFuture; + }); + } } @Override - public void add(final InstanceIdentifier identifier, final Group addDataObj, - final InstanceIdentifier nodeIdent) { - - final Group group = (addDataObj); - final AddGroupInputBuilder builder = new AddGroupInputBuilder(group); - - builder.setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class))); - builder.setGroupRef(new GroupRef(identifier)); - builder.setTransactionUri(new Uri(provider.getNewTransactionId())); - this.provider.getSalGroupService().addGroup(builder.build()); + public Future> add(final InstanceIdentifier identifier, final Group addDataObj, + final InstanceIdentifier nodeIdent) { + BundleId bundleId = getActiveBundle(nodeIdent, provider); + if (bundleId != null) { + return bundleGroupForwarder.add(identifier, addDataObj, nodeIdent, bundleId); + } else { + final NodeId nodeId = getNodeIdFromNodeIdentifier(nodeIdent); + return nodeConfigurator + .enqueueJob(nodeId.getValue(), () -> { + final Group group = addDataObj; + final AddGroupInputBuilder builder = new AddGroupInputBuilder(group); + builder.setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class))); + builder.setGroupRef(new GroupRef(identifier)); + builder.setTransactionUri(new Uri(provider.getNewTransactionId())); + AddGroupInput addGroupInput = builder.build(); + final ListenableFuture> resultFuture; + resultFuture = this.provider.getSalGroupService().addGroup(addGroupInput); + Futures.addCallback(resultFuture, + new AddGroupCallBack(addGroupInput.getGroupId().getValue(), nodeId), + MoreExecutors.directExecutor()); + return resultFuture; + }); + } } @Override - public void createStaleMarkEntity(InstanceIdentifier identifier, Group del, InstanceIdentifier nodeIdent) { + public void createStaleMarkEntity(InstanceIdentifier identifier, Group del, + InstanceIdentifier nodeIdent) { LOG.debug("Creating Stale-Mark entry for the switch {} for Group {} ", nodeIdent.toString(), del.toString()); StaleGroup staleGroup = makeStaleGroup(identifier, del, nodeIdent); persistStaleGroup(staleGroup, nodeIdent); } - - private StaleGroup makeStaleGroup(InstanceIdentifier identifier, Group del, InstanceIdentifier nodeIdent){ + private StaleGroup makeStaleGroup(InstanceIdentifier identifier, Group del, + InstanceIdentifier nodeIdent) { StaleGroupBuilder staleGroupBuilder = new StaleGroupBuilder(del); return staleGroupBuilder.setGroupId(del.getGroupId()).build(); } - private void persistStaleGroup(StaleGroup staleGroup, InstanceIdentifier nodeIdent){ + private void persistStaleGroup(StaleGroup staleGroup, InstanceIdentifier nodeIdent) { WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction(); - writeTransaction.put(LogicalDatastoreType.CONFIGURATION, getStaleGroupInstanceIdentifier(staleGroup, nodeIdent), staleGroup, false); + writeTransaction.put(LogicalDatastoreType.CONFIGURATION, getStaleGroupInstanceIdentifier(staleGroup, nodeIdent), + staleGroup, false); - CheckedFuture submitFuture = writeTransaction.submit(); + FluentFuture submitFuture = writeTransaction.commit(); handleStaleGroupResultFuture(submitFuture); } - private void handleStaleGroupResultFuture(CheckedFuture submitFuture) { - Futures.addCallback(submitFuture, new FutureCallback() { + private void handleStaleGroupResultFuture(FluentFuture submitFuture) { + submitFuture.addCallback(new FutureCallback() { @Override - public void onSuccess(Void result) { + public void onSuccess(Object result) { LOG.debug("Stale Group creation success"); } @Override - public void onFailure(Throwable t) { - LOG.error("Stale Group creation failed {}", t); + public void onFailure(Throwable throwable) { + LOG.error("Stale Group creation failed {}", throwable); } - }); + }, MoreExecutors.directExecutor()); } - private InstanceIdentifier getStaleGroupInstanceIdentifier(StaleGroup staleGroup, InstanceIdentifier nodeIdent) { - return nodeIdent - .child(StaleGroup.class, new StaleGroupKey(new GroupId(staleGroup.getGroupId()))); + private InstanceIdentifier getStaleGroupInstanceIdentifier( + StaleGroup staleGroup, InstanceIdentifier nodeIdent) { + return nodeIdent.child(StaleGroup.class, new StaleGroupKey(new GroupId(staleGroup.getGroupId()))); } -} + private final class AddGroupCallBack implements FutureCallback> { + private final Long groupId; + private final NodeId nodeId; + + private AddGroupCallBack(final Long groupId, final NodeId nodeId) { + this.groupId = groupId; + this.nodeId = nodeId; + } + @Override + public void onSuccess(RpcResult result) { + if (result.isSuccessful()) { + provider.getDevicesGroupRegistry().storeGroup(nodeId, groupId); + LOG.debug("Group add with id {} finished without error for node {}", groupId, nodeId); + } else { + LOG.debug("Group add with id {} failed for node {} with error {}", groupId, nodeId, + result.getErrors()); + } + } + + @Override + public void onFailure(Throwable throwable) { + LOG.error("Service call for adding group {} failed for node with error {}", groupId, nodeId, throwable); + } + } + + private final class UpdateGroupCallBack implements FutureCallback> { + private final Long groupId; + private final NodeId nodeId; + + private UpdateGroupCallBack(final Long groupId, final NodeId nodeId) { + this.groupId = groupId; + this.nodeId = nodeId; + } + + @Override + public void onSuccess(RpcResult result) { + if (result.isSuccessful()) { + provider.getDevicesGroupRegistry().storeGroup(nodeId, groupId); + LOG.debug("Group update with id {} finished without error for node {}", groupId, nodeId); + } else { + LOG.debug("Group update with id {} failed for node {} with error {}", groupId, nodeId, + result.getErrors().toString()); + } + } + + @Override + public void onFailure(Throwable throwable) { + LOG.error("Service call for updating group {} failed for node {} with", groupId, nodeId, + throwable); + } + } + + private final class RemoveGroupCallBack implements FutureCallback> { + private final Long groupId; + private final NodeId nodeId; + + private RemoveGroupCallBack(final Long groupId, final NodeId nodeId) { + this.groupId = groupId; + this.nodeId = nodeId; + } + + @Override + public void onSuccess(RpcResult result) { + if (result.isSuccessful()) { + LOG.debug("Group remove with id {} finished without error for node {}", groupId, nodeId); + provider.getDevicesGroupRegistry().removeGroup(nodeId, groupId); + } else { + LOG.debug("Group remove with id {} failed for node {} with error {}", groupId, nodeId, + result.getErrors().toString()); + } + } + + @Override + public void onFailure(Throwable throwable) { + LOG.error("Service call for removing group {} failed for node with error {}", groupId, nodeId, throwable); + } + } +}