-/**
- * 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,
*/
package org.opendaylight.openflowplugin.applications.frm.impl;
-import com.google.common.base.Preconditions;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
+import org.opendaylight.infrautils.utils.concurrent.LoggingFutures;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.CommitInfo;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.openflowplugin.applications.frm.ForwardingRulesManager;
-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.flow.inventory.rev130819.meters.Meter;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.StaleMeter;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.StaleMeterBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.StaleMeterKey;
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.meter.service.rev130918.AddMeterInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.AddMeterOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.RemoveMeterInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.RemoveMeterOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.UpdateMeterInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.meter.update.OriginalMeterBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.meter.update.UpdatedMeterBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterRef;
-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;
/**
- * MeterForwarder
- * It implements {@link org.opendaylight.controller.md.sal.binding.api.DataChangeListener}}
- * for WildCardedPath to {@link Meter} and ForwardingRulesCommiter interface for methods:
- * add, update and remove {@link Meter} processing for
- * {@link org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent}.
- *
- * @author <a href="mailto:vdemcak@cisco.com">Vaclav Demcak</a>
+ * MeterForwarder It implements
+ * {@link org.opendaylight.mdsal.binding.api.DataTreeChangeListener}
+ * for WildCardedPath to {@link Meter} and ForwardingRulesCommiter interface for
+ * methods: add, update and remove {@link Meter} processing for
+ * {@link org.opendaylight.mdsal.binding.api.DataTreeModification}.
*
*/
public class MeterForwarder extends AbstractListeningCommiter<Meter> {
-
private static final Logger LOG = LoggerFactory.getLogger(MeterForwarder.class);
- private ListenerRegistration<MeterForwarder> listenerRegistration;
-
- public MeterForwarder (final ForwardingRulesManager manager, final DataBroker db) {
- super(manager, Meter.class);
- Preconditions.checkNotNull(db, "DataBroker can not be null!");
- final DataTreeIdentifier<Meter> treeId = new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION, getWildCardPath());
-
- this.listenerRegistration = db.registerDataTreeChangeListener(treeId, MeterForwarder.this);
- }
-
- @Override
- public void close() {
- if (listenerRegistration != null) {
- try {
- listenerRegistration.close();
- } catch (Exception e) {
- LOG.error("Error by stop FRM MeterChangeListener.", e);
- }
- listenerRegistration = null;
- }
+ public MeterForwarder(final ForwardingRulesManager manager, final DataBroker db,
+ final ListenerRegistrationHelper listenerRegistrationHelper) {
+ super(manager, db, listenerRegistrationHelper);
}
@Override
protected InstanceIdentifier<Meter> getWildCardPath() {
- return InstanceIdentifier.create(Nodes.class).child(Node.class)
- .augmentation(FlowCapableNode.class).child(Meter.class);
+ return InstanceIdentifier.create(Nodes.class).child(Node.class).augmentation(FlowCapableNode.class)
+ .child(Meter.class);
}
@Override
public void remove(final InstanceIdentifier<Meter> identifier, final Meter removeDataObj,
- final InstanceIdentifier<FlowCapableNode> nodeIdent) {
-
- final RemoveMeterInputBuilder builder = new RemoveMeterInputBuilder(removeDataObj);
-
- builder.setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class)));
- builder.setMeterRef(new MeterRef(identifier));
- builder.setTransactionUri(new Uri(provider.getNewTransactionId()));
- this.provider.getSalMeterService().removeMeter(builder.build());
+ final InstanceIdentifier<FlowCapableNode> nodeIdent) {
+ LoggingFutures.addErrorLogging(provider.getSalMeterService()
+ .removeMeter(new RemoveMeterInputBuilder(removeDataObj)
+ .setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class)))
+ .setMeterRef(new MeterRef(identifier))
+ .setTransactionUri(new Uri(provider.getNewTransactionId()))
+ .build()),
+ LOG, "removeMeter");
}
@Override
- public void update(final InstanceIdentifier<Meter> identifier,
- final Meter original, final Meter update,
- final InstanceIdentifier<FlowCapableNode> nodeIdent) {
-
- final UpdateMeterInputBuilder builder = new UpdateMeterInputBuilder();
-
- builder.setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class)));
- builder.setMeterRef(new MeterRef(identifier));
- builder.setTransactionUri(new Uri(provider.getNewTransactionId()));
- builder.setUpdatedMeter((new UpdatedMeterBuilder(update)).build());
- builder.setOriginalMeter((new OriginalMeterBuilder(original)).build());
+ public ListenableFuture<RpcResult<RemoveMeterOutput>> removeWithResult(final InstanceIdentifier<Meter> identifier,
+ final Meter removeDataObj, final InstanceIdentifier<FlowCapableNode> nodeIdent) {
+ return provider.getSalMeterService().removeMeter(new RemoveMeterInputBuilder(removeDataObj)
+ .setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class)))
+ .setMeterRef(new MeterRef(identifier))
+ .setTransactionUri(new Uri(provider.getNewTransactionId()))
+ .build());
+ }
- this.provider.getSalMeterService().updateMeter(builder.build());
+ @Override
+ public void update(final InstanceIdentifier<Meter> identifier, final Meter original, final Meter update,
+ final InstanceIdentifier<FlowCapableNode> nodeIdent) {
+ LoggingFutures.addErrorLogging(provider.getSalMeterService().updateMeter(new UpdateMeterInputBuilder()
+ .setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class)))
+ .setMeterRef(new MeterRef(identifier))
+ .setTransactionUri(new Uri(provider.getNewTransactionId()))
+ .setUpdatedMeter(new UpdatedMeterBuilder(update).build())
+ .setOriginalMeter(new OriginalMeterBuilder(original).build())
+ .build()), LOG, "updateMeter");
}
@Override
- public void add(final InstanceIdentifier<Meter> identifier, final Meter addDataObj,
- final InstanceIdentifier<FlowCapableNode> nodeIdent) {
+ public ListenableFuture<RpcResult<AddMeterOutput>> add(final InstanceIdentifier<Meter> identifier,
+ final Meter addDataObj, final InstanceIdentifier<FlowCapableNode> nodeIdent) {
+ return provider.getSalMeterService().addMeter(new AddMeterInputBuilder(addDataObj)
+ .setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class)))
+ .setMeterRef(new MeterRef(identifier))
+ .setTransactionUri(new Uri(provider.getNewTransactionId()))
+ .build());
+ }
- final AddMeterInputBuilder builder = new AddMeterInputBuilder(addDataObj);
+ @Override
+ public void createStaleMarkEntity(final InstanceIdentifier<Meter> identifier, final Meter del,
+ final InstanceIdentifier<FlowCapableNode> nodeIdent) {
+ LOG.debug("Creating Stale-Mark entry for the switch {} for meter {} ", nodeIdent, del);
+
+ final var staleMeter = new StaleMeterBuilder(del).setMeterId(del.getMeterId()).build();
+ final var writeTransaction = dataBroker.newWriteOnlyTransaction();
+ writeTransaction.put(LogicalDatastoreType.CONFIGURATION,
+ nodeIdent.child(StaleMeter.class, new StaleMeterKey(new MeterId(staleMeter.getMeterId()))), staleMeter);
+ writeTransaction.commit().addCallback(new FutureCallback<CommitInfo>() {
+ @Override
+ public void onSuccess(final CommitInfo result) {
+ LOG.debug("Stale Meter creation success");
+ }
- builder.setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class)));
- builder.setMeterRef(new MeterRef(identifier));
- builder.setTransactionUri(new Uri(provider.getNewTransactionId()));
- this.provider.getSalMeterService().addMeter(builder.build());
+ @Override
+ public void onFailure(final Throwable throwable) {
+ LOG.error("Stale Meter creation failed", throwable);
+ }
+ }, MoreExecutors.directExecutor());
}
}
-
Code Review / openflowplugin.git / blobdiff