Code Review / openflowplugin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Remove unused routedRpcRegistration
[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / services / sal / SalMeterServiceImpl.java
diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalMeterServiceImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalMeterServiceImpl.java
old mode 100644 (file)
new mode 100755 (executable)
index 51a9c55..9bf7f3d
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalMeterServiceImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalMeterServiceImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -10,17 +10,13 @@ package org.opendaylight.openflowplugin.impl.services.sal;
 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 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.impl.services.multilayer.MultiLayerMeterService;
 import org.opendaylight.openflowplugin.impl.services.singlelayer.SingleLayerMeterService;
 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.flow.inventory.rev130819.meters.MeterKey;
-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.yang.gen.v1.urn.opendaylight.meter.service.rev130918.AddMeterInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.AddMeterOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.RemoveMeterInput;
@@ -29,8 +25,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.Sal
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.UpdateMeterInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.UpdateMeterOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.Meter;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterId;
-import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,19 +45,19 @@ public class SalMeterServiceImpl implements SalMeterService {
                                final ConvertorExecutor convertorExecutor) {
         this.deviceContext = deviceContext;
         addMeter = new MultiLayerMeterService<>(requestContextStack,
-                                                deviceContext,
-                                                AddMeterOutput.class,
-                                                convertorExecutor);
+                deviceContext,
+                AddMeterOutput.class,
+                convertorExecutor);
 
         updateMeter = new MultiLayerMeterService<>(requestContextStack,
-                                                   deviceContext,
-                                                   UpdateMeterOutput.class,
-                                                   convertorExecutor);
+                deviceContext,
+                UpdateMeterOutput.class,
+                convertorExecutor);
 
         removeMeter = new MultiLayerMeterService<>(requestContextStack,
-                                                   deviceContext,
-                                                   RemoveMeterOutput.class,
-                                                   convertorExecutor);
+                deviceContext,
+                RemoveMeterOutput.class,
+                convertorExecutor);
 
         addMeterMessage = new SingleLayerMeterService<>(requestContextStack, deviceContext, AddMeterOutput.class);
         updateMeterMessage = new SingleLayerMeterService<>(requestContextStack, deviceContext, UpdateMeterOutput.class);
@@ -71,11 +65,11 @@ public class SalMeterServiceImpl implements SalMeterService {
     }
 
     @Override
-    public Future<RpcResult<AddMeterOutput>> addMeter(final AddMeterInput input) {
+    public ListenableFuture<RpcResult<AddMeterOutput>> addMeter(final AddMeterInput input) {
         final ListenableFuture<RpcResult<AddMeterOutput>> resultFuture =
-            addMeterMessage.canUseSingleLayerSerialization()
-            ? addMeterMessage.handleServiceCall(input)
-            : addMeter.handleServiceCall(input);
+                addMeterMessage.canUseSingleLayerSerialization()
+                        ? addMeterMessage.handleServiceCall(input)
+                        : addMeter.handleServiceCall(input);
 
         Futures.addCallback(resultFuture, new FutureCallback<RpcResult<AddMeterOutput>>() {
             @Override
@@ -84,61 +78,59 @@ public class SalMeterServiceImpl implements SalMeterService {
                     if (LOG.isDebugEnabled()) {
                         LOG.debug("Meter add with id={} finished without error", input.getMeterId());
                     }
-                    deviceContext.getDeviceMeterRegistry().store(input.getMeterId());
                 } else {
                     if (LOG.isDebugEnabled()) {
                         LOG.debug("Meter add with id={} failed, errors={}", input.getMeterId(),
-                            ErrorUtil.errorsToString(result.getErrors()));
+                                ErrorUtil.errorsToString(result.getErrors()));
                     }
                 }
             }
 
             @Override
             public void onFailure(Throwable throwable) {
-                LOG.warn("Service call for adding meter={} failed, reason: {}", input.getMeterId(), throwable);
+                LOG.warn("Service call for adding meter={} failed", input.getMeterId(), throwable);
             }
-        });
+        }, MoreExecutors.directExecutor());
         return resultFuture;
     }
 
     @Override
-    public Future<RpcResult<UpdateMeterOutput>> updateMeter(final UpdateMeterInput input) {
+    public ListenableFuture<RpcResult<UpdateMeterOutput>> updateMeter(final UpdateMeterInput input) {
         final ListenableFuture<RpcResult<UpdateMeterOutput>> resultFuture =
-            updateMeterMessage.canUseSingleLayerSerialization()
-            ? updateMeterMessage.handleServiceCall(input.getUpdatedMeter())
-            : updateMeter.handleServiceCall(input.getUpdatedMeter());
+                updateMeterMessage.canUseSingleLayerSerialization()
+                        ? updateMeterMessage.handleServiceCall(input.getUpdatedMeter())
+                        : updateMeter.handleServiceCall(input.getUpdatedMeter());
 
         Futures.addCallback(resultFuture, new FutureCallback<RpcResult<UpdateMeterOutput>>() {
-
             @Override
             public void onSuccess(RpcResult<UpdateMeterOutput> result) {
                 if (result.isSuccessful()) {
                     if (LOG.isDebugEnabled()) {
                         LOG.debug("Meter update with id={} finished without error",
-                                  input.getOriginalMeter().getMeterId());
+                                input.getOriginalMeter().getMeterId());
                     }
                 } else {
-                        LOG.warn("Meter update with id={} failed, errors={}", input.getOriginalMeter().getMeterId(),
-                                ErrorUtil.errorsToString(result.getErrors()));
-                        LOG.debug("Meter input={}", input.getUpdatedMeter());
+                    LOG.warn("Meter update with id={} failed, errors={}", input.getOriginalMeter().getMeterId(),
+                            ErrorUtil.errorsToString(result.getErrors()));
+                    LOG.debug("Meter input={}", input.getUpdatedMeter());
                 }
             }
 
             @Override
             public void onFailure(Throwable throwable) {
-                LOG.warn("Service call for updating meter={} failed, reason: {}",
-                        input.getOriginalMeter().getMeterId(),throwable);
+                LOG.warn("Service call for updating meter={} failed",
+                        input.getOriginalMeter().getMeterId(), throwable);
             }
-        });
+        }, MoreExecutors.directExecutor());
         return resultFuture;
     }
 
     @Override
-    public Future<RpcResult<RemoveMeterOutput>> removeMeter(final RemoveMeterInput input) {
+    public ListenableFuture<RpcResult<RemoveMeterOutput>> removeMeter(final RemoveMeterInput input) {
         final ListenableFuture<RpcResult<RemoveMeterOutput>> resultFuture =
-            removeMeterMessage.canUseSingleLayerSerialization()
-            ? removeMeterMessage.handleServiceCall(input)
-            : removeMeter.handleServiceCall(input);
+                removeMeterMessage.canUseSingleLayerSerialization()
+                        ? removeMeterMessage.handleServiceCall(input)
+                        : removeMeter.handleServiceCall(input);
 
         Futures.addCallback(resultFuture, new FutureCallback<RpcResult<RemoveMeterOutput>>() {
             @Override
@@ -147,28 +139,18 @@ public class SalMeterServiceImpl implements SalMeterService {
                     if (LOG.isDebugEnabled()) {
                         LOG.debug("Meter remove with id={} finished without error", input.getMeterId());
                     }
-                    removeMeter.getDeviceRegistry().getDeviceMeterRegistry().addMark(input.getMeterId());
                 } else {
                     LOG.warn("Meter remove with id={} failed, errors={}", input.getMeterId(),
-                        ErrorUtil.errorsToString(result.getErrors()));
+                            ErrorUtil.errorsToString(result.getErrors()));
                     LOG.debug("Meter input={}", input);
                 }
             }
 
             @Override
             public void onFailure(Throwable throwable) {
-                LOG.warn("Service call for removing meter={} failed, reason: {}",input.getMeterId(),throwable);
+                LOG.warn("Service call for removing meter={} failed", input.getMeterId(), throwable);
             }
-        });
+        }, MoreExecutors.directExecutor());
         return resultFuture;
     }
-
-    private static KeyedInstanceIdentifier<org.opendaylight.yang.gen.v1.urn
-            .opendaylight.flow.inventory.rev130819.meters.Meter, MeterKey> createMeterPath(
-                                                            final MeterId meterId,
-                                                            final KeyedInstanceIdentifier<Node, NodeKey> nodePath) {
-        return nodePath.augmentation(FlowCapableNode.class)
-                .child(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.Meter.class,
-                       new MeterKey(meterId));
-    }
 }
OpenFlow Plugin