-/**
+/*
* Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
-import java.util.concurrent.Future;
-import javax.annotation.Nullable;
+import com.google.common.util.concurrent.MoreExecutors;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
import org.opendaylight.openflowplugin.api.openflow.device.RequestContextStack;
-import org.opendaylight.openflowplugin.api.openflow.rpc.ItemLifeCycleSource;
-import org.opendaylight.openflowplugin.api.openflow.rpc.listener.ItemLifecycleListener;
-import org.opendaylight.openflowplugin.impl.services.singlelayer.SingleLayerGroupService;
import org.opendaylight.openflowplugin.impl.services.multilayer.MultiLayerGroupService;
+import org.opendaylight.openflowplugin.impl.services.singlelayer.SingleLayerGroupService;
import org.opendaylight.openflowplugin.impl.util.ErrorUtil;
import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
-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.AddGroupOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.RemoveGroupInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.UpdateGroupInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.UpdateGroupOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.Group;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.GroupBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.GroupKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
-import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SalGroupServiceImpl implements SalGroupService, ItemLifeCycleSource {
+public class SalGroupServiceImpl implements SalGroupService {
private static final Logger LOG = LoggerFactory.getLogger(SalGroupServiceImpl.class);
private final MultiLayerGroupService<AddGroupInput, AddGroupOutput> addGroup;
private final MultiLayerGroupService<Group, UpdateGroupOutput> updateGroup;
private final SingleLayerGroupService<RemoveGroupOutput> removeGroupMessage;
private final DeviceContext deviceContext;
- private ItemLifecycleListener itemLifecycleListener;
- public SalGroupServiceImpl(final RequestContextStack requestContextStack, final DeviceContext deviceContext, final ConvertorExecutor convertorExecutor) {
+ public SalGroupServiceImpl(final RequestContextStack requestContextStack,
+ final DeviceContext deviceContext,
+ final ConvertorExecutor convertorExecutor) {
this.deviceContext = deviceContext;
- addGroup = new MultiLayerGroupService<>(requestContextStack, deviceContext, AddGroupOutput.class, convertorExecutor);
- updateGroup = new MultiLayerGroupService<>(requestContextStack, deviceContext, UpdateGroupOutput.class, convertorExecutor);
- removeGroup = new MultiLayerGroupService<>(requestContextStack, deviceContext, RemoveGroupOutput.class, convertorExecutor);
+ addGroup = new MultiLayerGroupService<>(requestContextStack,
+ deviceContext,
+ AddGroupOutput.class,
+ convertorExecutor);
+
+ updateGroup = new MultiLayerGroupService<>(requestContextStack,
+ deviceContext,
+ UpdateGroupOutput.class,
+ convertorExecutor);
+
+ removeGroup = new MultiLayerGroupService<>(requestContextStack,
+ deviceContext,
+ RemoveGroupOutput.class,
+ convertorExecutor);
addGroupMessage = new SingleLayerGroupService<>(requestContextStack, deviceContext, AddGroupOutput.class);
updateGroupMessage = new SingleLayerGroupService<>(requestContextStack, deviceContext, UpdateGroupOutput.class);
}
@Override
- public void setItemLifecycleListener(@Nullable ItemLifecycleListener itemLifecycleListener) {
- this.itemLifecycleListener = itemLifecycleListener;
- }
-
- @Override
- public Future<RpcResult<AddGroupOutput>> addGroup(final AddGroupInput input) {
- final ListenableFuture<RpcResult<AddGroupOutput>> resultFuture = addGroupMessage.canUseSingleLayerSerialization()
+ public ListenableFuture<RpcResult<AddGroupOutput>> addGroup(final AddGroupInput input) {
+ final ListenableFuture<RpcResult<AddGroupOutput>> resultFuture =
+ addGroupMessage.canUseSingleLayerSerialization()
? addGroupMessage.handleServiceCall(input)
: addGroup.handleServiceCall(input);
@Override
public void onSuccess(RpcResult<AddGroupOutput> result) {
if (result.isSuccessful()) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Group add with id={} finished without error", input.getGroupId().getValue());
- }
- deviceContext.getDeviceGroupRegistry().store(input.getGroupId());
- addIfNecessaryToDS(input.getGroupId(), input);
+ LOG.debug("adding group successful {}", input.getGroupId().getValue());
} else {
if (LOG.isDebugEnabled()) {
LOG.debug("Group add with id={} failed, errors={}", input.getGroupId().getValue(),
}
@Override
- public void onFailure(Throwable t) {
- LOG.warn("Service call for adding group={} failed, reason: {}", input.getGroupId().getValue(), t);
+ public void onFailure(Throwable throwable) {
+ LOG.warn("Service call for adding group={} failed",
+ input.getGroupId().getValue(),
+ throwable);
}
- });
+ }, MoreExecutors.directExecutor());
return resultFuture;
}
@Override
- public Future<RpcResult<UpdateGroupOutput>> updateGroup(final UpdateGroupInput input) {
- final ListenableFuture<RpcResult<UpdateGroupOutput>> resultFuture = updateGroupMessage.canUseSingleLayerSerialization()
+ public ListenableFuture<RpcResult<UpdateGroupOutput>> updateGroup(final UpdateGroupInput input) {
+ final ListenableFuture<RpcResult<UpdateGroupOutput>> resultFuture =
+ updateGroupMessage.canUseSingleLayerSerialization()
? updateGroupMessage.handleServiceCall(input.getUpdatedGroup())
: updateGroup.handleServiceCall(input.getUpdatedGroup());
LOG.debug("Group update with original id={} finished without error",
input.getOriginalGroup().getGroupId().getValue());
}
- removeIfNecessaryFromDS(input.getOriginalGroup().getGroupId());
- addIfNecessaryToDS(input.getUpdatedGroup().getGroupId(), input.getUpdatedGroup());
} else {
LOG.warn("Group update with original id={} failed, errors={}",
input.getOriginalGroup().getGroupId(), ErrorUtil.errorsToString(result.getErrors()));
}
@Override
- public void onFailure(Throwable t) {
- LOG.warn("Service call for updating group={} failed, reason: {}",
- input.getOriginalGroup().getGroupId(), t);
+ public void onFailure(Throwable throwable) {
+ LOG.warn("Service call for updating group={} failed",
+ input.getOriginalGroup().getGroupId(), throwable);
}
- });
+ }, MoreExecutors.directExecutor());
return resultFuture;
}
@Override
- public Future<RpcResult<RemoveGroupOutput>> removeGroup(final RemoveGroupInput input) {
- final ListenableFuture<RpcResult<RemoveGroupOutput>> resultFuture = removeGroupMessage.canUseSingleLayerSerialization()
+ public ListenableFuture<RpcResult<RemoveGroupOutput>> removeGroup(final RemoveGroupInput input) {
+ final ListenableFuture<RpcResult<RemoveGroupOutput>> resultFuture =
+ removeGroupMessage.canUseSingleLayerSerialization()
? removeGroupMessage.handleServiceCall(input)
: removeGroup.handleServiceCall(input);
if (LOG.isDebugEnabled()) {
LOG.debug("Group remove with id={} finished without error", input.getGroupId().getValue());
}
- removeGroup.getDeviceRegistry().getDeviceGroupRegistry().markToBeremoved(input.getGroupId());
- removeIfNecessaryFromDS(input.getGroupId());
} else {
LOG.warn("Group remove with id={} failed, errors={}", input.getGroupId().getValue(),
ErrorUtil.errorsToString(result.getErrors()));
}
@Override
- public void onFailure(Throwable t) {
- LOG.warn("Service call for removing group={} failed, reason: {}",
- input.getGroupId().getValue(), t);
+ public void onFailure(Throwable throwable) {
+ LOG.warn("Service call for removing group={} failed",
+ input.getGroupId().getValue(), throwable);
}
- });
+ }, MoreExecutors.directExecutor());
return resultFuture;
}
- private void removeIfNecessaryFromDS(final GroupId groupId) {
- if (itemLifecycleListener != null) {
- KeyedInstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.Group, GroupKey> groupPath
- = createGroupPath(groupId,
- deviceContext.getDeviceInfo().getNodeInstanceIdentifier());
- itemLifecycleListener.onRemoved(groupPath);
- }
- }
-
- private void addIfNecessaryToDS(final GroupId groupId, final Group data) {
- if (itemLifecycleListener != null) {
- KeyedInstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.Group, GroupKey> groupPath
- = createGroupPath(groupId,
- deviceContext.getDeviceInfo().getNodeInstanceIdentifier());
- itemLifecycleListener.onAdded(groupPath, new GroupBuilder(data).build());
- }
- }
-
- private static KeyedInstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.Group, GroupKey>
- createGroupPath(final GroupId groupId, final KeyedInstanceIdentifier<Node, NodeKey> nodePath) {
- return nodePath.augmentation(FlowCapableNode.class).
- child(org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.Group.class, new GroupKey(groupId));
- }
}
Code Review / openflowplugin.git / blobdiff