Remove deprecated notifications in sal-meter.yang

Deprecated notifications in sal-meter.yang are only used by
test-provider. Remove the notifications from the data model
and the implementation in test-provider.

JIRA: OPNFLWPLUG-1119
Change-Id: I0093cc5fda57cc67237f350837f412e7377191df
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>

diff --git a/model/model-flow-service/src/main/yang/sal-meter.yang b/model/model-flow-service/src/main/yang/sal-meter.yang
index ac02f331ea5c7b1b15a0987694dce9e23f3162f2..bc7101b5e960a4160a2a76c44f1f5f29fb0d0b19 100644 (file)
--- a/model/model-flow-service/src/main/yang/sal-meter.yang
+++ b/model/model-flow-service/src/main/yang/sal-meter.yang
@@ -10,16 +10,16 @@ module sal-meter {
 
     revision "2013-09-18" {
         description "Initial revision of meter service";
-    }        
-    
+    }
+
     grouping node-meter {
         description "Basic openflow meter structure suitable for rpc input (contains node-context-ref)";
-        
+
         uses "inv:node-context-ref";
         uses meter-type:meter;
     }
 
-    /** Base configuration structure **/
+    // Base configuration structure
     grouping meter-update {
         description "DataStore aware update openflow meter structure suitable for rpc input (contains node-context-ref)";
         uses "inv:node-context-ref";
@@ -35,11 +35,11 @@ module sal-meter {
     rpc add-meter {
         description "Adding meter to openflow device.";
         input {
-            uses tr:transaction-metadata;            
+            uses tr:transaction-metadata;
             leaf meter-ref {
                 type meter-type:meter-ref;
             }
-            uses node-meter;            
+            uses node-meter;
         }
         output {
             uses tr:transaction-aware;
@@ -49,12 +49,12 @@ module sal-meter {
     rpc remove-meter {
         description "Removing metere from openflow device.";
         input {
-            uses tr:transaction-metadata;            
+            uses tr:transaction-metadata;
             leaf meter-ref {
                 type meter-type:meter-ref;
             }
-            
-            uses node-meter;                       
+
+            uses node-meter;
         }
         output {
             uses tr:transaction-aware;
@@ -64,48 +64,15 @@ module sal-meter {
     rpc update-meter {
         description "Updating meter on openflow device.";
         input {
-            uses tr:transaction-metadata;            
+            uses tr:transaction-metadata;
             leaf meter-ref {
                 type meter-type:meter-ref;
             }
-            
-            uses meter-update;                       
+
+            uses meter-update;
         }
         output {
             uses tr:transaction-aware;
         }
     }
-        
-    notification meter-added {
-        status deprecated;
-
-        uses tr:transaction-metadata;
-        leaf meter-ref {
-            type meter-type:meter-ref;
-        }
-        uses node-meter;
-        uses tr:transaction-aware;
-    }
-
-    notification meter-updated {
-        status deprecated;
-
-        uses tr:transaction-metadata;
-        leaf meter-ref {
-            type meter-type:meter-ref;
-        }
-        uses node-meter;
-        uses tr:transaction-aware;
-    }
-
-    notification meter-removed {
-        status deprecated;
-
-        uses tr:transaction-metadata;
-        leaf meter-ref {
-            type meter-type:meter-ref;
-        }
-        uses node-meter;
-        uses tr:transaction-aware;
-    }
 }

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java
index 9045b3468ddcaa1054e8957212819b6b14d2c8f3..c04e4084bb5135fc76a947715508fddf16b710c5 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java
@@ -13,7 +13,6 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.osgi.framework.console.CommandInterpreter;
 import org.eclipse.osgi.framework.console.CommandProvider;
 import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.binding.api.NotificationService;
 import org.opendaylight.mdsal.binding.api.ReadWriteTransaction;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
@@ -25,10 +24,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 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.inventory.rev130819.nodes.NodeBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.MeterAdded;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.MeterRemoved;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.MeterUpdated;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.SalMeterListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.BandId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterBandType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterFlags;
@@ -37,7 +32,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.band.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.MeterBandHeadersBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.meter.band.headers.MeterBandHeaderBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.meter.band.headers.meter.band.header.MeterBandTypesBuilder;
-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.Uint32;
@@ -57,22 +51,14 @@ public class OpenflowpluginMeterTestCommandProvider implements CommandProvider {
     private Node testNode;
     private final String originalMeterName = "Foo";
     private final String updatedMeterName = "Bar";
-    private final MeterEventListener meterEventListener = new MeterEventListener();
-    private final NotificationService notificationService;
-    private Registration listener1Reg;
 
-    public OpenflowpluginMeterTestCommandProvider(final DataBroker dataBroker,
-            final NotificationService notificationService, final BundleContext ctx) {
+    public OpenflowpluginMeterTestCommandProvider(final DataBroker dataBroker, final BundleContext ctx) {
         this.dataBroker = dataBroker;
-        this.notificationService = notificationService;
         this.ctx = ctx;
     }
 
     public void init() {
         ctx.registerService(CommandProvider.class.getName(), this, null);
-        // For switch events
-        listener1Reg = notificationService.registerNotificationListener(meterEventListener);
-
         createTestNode();
         createTestMeter();
     }
@@ -89,29 +75,6 @@ public class OpenflowpluginMeterTestCommandProvider implements CommandProvider {
         return InstanceIdentifier.create(Nodes.class).child(Node.class, node.key());
     }
 
-    private static final class MeterEventListener implements SalMeterListener {
-        @Override
-        @Deprecated
-        public void onMeterAdded(final MeterAdded notification) {
-            LOG.info("Meter to be added {}", notification.toString());
-            LOG.info("Meter  Xid {}", notification.getTransactionId().getValue());
-        }
-
-        @Override
-        @Deprecated
-        public void onMeterRemoved(final MeterRemoved notification) {
-            LOG.info("Meter to be removed {}", notification.toString());
-            LOG.info("Meter  Xid {}", notification.getTransactionId().getValue());
-        }
-
-        @Override
-        @Deprecated
-        public void onMeterUpdated(final MeterUpdated notification) {
-            LOG.info("Meter to be updated {}", notification.toString());
-            LOG.info("Meter  Xid {}", notification.getTransactionId().getValue());
-        }
-    }
-
     private MeterBuilder createTestMeter() {
         // Sample data , committing to DataStore
         final MeterBuilder meter = new MeterBuilder()

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestActivator.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestActivator.java
index 404a1bd21bad1fd7023cdf0fd62b353a2d5212f7..7865b0817eba5a47a6d3948521fbe5bb1aa11a6c 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestActivator.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestActivator.java
@@ -62,7 +62,7 @@ public class OpenflowpluginTestActivator implements AutoCloseable {
                 new OpenflowpluginGroupTestCommandProvider(dataBroker, ctx);
         this.cmdGroupProvider = openflowpluginGroupTestCommandProvider;
         OpenflowpluginMeterTestCommandProvider openflowpluginMeterTestCommandProvider =
-                new OpenflowpluginMeterTestCommandProvider(dataBroker, notificationService, ctx);
+                new OpenflowpluginMeterTestCommandProvider(dataBroker, ctx);
         this.cmdMeterProvider = openflowpluginMeterTestCommandProvider;
         OpenflowpluginTableFeaturesTestCommandProvider openflowpluginTableFeaturesTestCommandProvider =
                 new OpenflowpluginTableFeaturesTestCommandProvider(dataBroker, ctx);