commit 10c810b1997dd1b1637647ed65765fc86cc01475
author alshabib <alshabibi.ali@gmail.com> Tue Aug 18 16:59:04 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed Aug 19 18:28:09 2015 +0000
tree f7e0f78556bb222a930379adf6468e51ded73ce9
parent a4122367b065685b0801e530784153de521fbfff

added treatment support and conversion to an instruction

moved to meter api to onos-api

Change-Id: I0504f06fdc503953fa7696224d97edda43596d6e

incubator/store/src/main/java/org/onosproject/incubator/store/meter/impl/DistributedMeterStore.java

diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/meter/impl/DistributedMeterStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/meter/impl/DistributedMeterStore.java
index 6477e68..ed7c9bf 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/meter/impl/DistributedMeterStore.java
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/meter/impl/DistributedMeterStore.java
@@ -23,16 +23,16 @@
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.onosproject.cluster.ClusterService;
 import org.onosproject.cluster.NodeId;
-import org.onosproject.incubator.net.meter.DefaultMeter;
-import org.onosproject.incubator.net.meter.Meter;
-import org.onosproject.incubator.net.meter.MeterEvent;
-import org.onosproject.incubator.net.meter.MeterFailReason;
-import org.onosproject.incubator.net.meter.MeterId;
-import org.onosproject.incubator.net.meter.MeterOperation;
-import org.onosproject.incubator.net.meter.MeterState;
-import org.onosproject.incubator.net.meter.MeterStore;
-import org.onosproject.incubator.net.meter.MeterStoreDelegate;
-import org.onosproject.incubator.net.meter.MeterStoreResult;
+import org.onosproject.net.meter.DefaultMeter;
+import org.onosproject.net.meter.Meter;
+import org.onosproject.net.meter.MeterEvent;
+import org.onosproject.net.meter.MeterFailReason;
+import org.onosproject.net.meter.MeterId;
+import org.onosproject.net.meter.MeterOperation;
+import org.onosproject.net.meter.MeterState;
+import org.onosproject.net.meter.MeterStore;
+import org.onosproject.net.meter.MeterStoreDelegate;
+import org.onosproject.net.meter.MeterStoreResult;
 import org.onosproject.mastership.MastershipService;
 import org.onosproject.store.AbstractStore;
 import org.onosproject.store.serializers.KryoNamespaces;

incubator/store/src/main/java/org/onosproject/incubator/store/meter/impl/MeterData.java

diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/meter/impl/MeterData.java b/incubator/store/src/main/java/org/onosproject/incubator/store/meter/impl/MeterData.java
index cfc1402..c72bc2e 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/meter/impl/MeterData.java
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/meter/impl/MeterData.java
@@ -16,8 +16,8 @@
 package org.onosproject.incubator.store.meter.impl;
 
 import org.onosproject.cluster.NodeId;
-import org.onosproject.incubator.net.meter.Meter;
-import org.onosproject.incubator.net.meter.MeterFailReason;
+import org.onosproject.net.meter.Meter;
+import org.onosproject.net.meter.MeterFailReason;
 
 import java.util.Optional;