commit e1248b613f232eecf5f61b014d07c137688a9531
author alshabib <alshabibi.ali@gmail.com> Thu Aug 20 17:21:55 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Aug 21 15:35:18 2015 +0000
tree 605fa591db6604a5a0f4283307f51b226bb3877d
parent e18063042bac5725b323ff1b09034a1b097ffe88

Adding tests for meter service.

Change-Id: Ic220fdaa89b421661019f1a6ef23c7b02eef127c

cli/src/main/java/org/onosproject/cli/net/AddMeter.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/AddMeter.java b/cli/src/main/java/org/onosproject/cli/net/AddMeter.java
index 25a7726..5a431cd 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AddMeter.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AddMeter.java
@@ -22,10 +22,9 @@
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.meter.Band;
 import org.onosproject.net.meter.DefaultBand;
-import org.onosproject.net.meter.DefaultMeter;
+import org.onosproject.net.meter.DefaultMeterRequest;
 import org.onosproject.net.meter.Meter;
-import org.onosproject.net.meter.MeterId;
-import org.onosproject.net.meter.MeterOperation;
+import org.onosproject.net.meter.MeterRequest;
 import org.onosproject.net.meter.MeterService;
 
 import java.util.Collections;
@@ -41,7 +40,7 @@
             required = true, multiValued = false)
     String uri = null;
 
-    private final String appId = "org.onosproject.cli.addMeter";
+    private final String appId = "org.onosproject.cli.meterCmd";
 
     @Override
     protected void execute() {
@@ -50,25 +49,20 @@
 
         DeviceId deviceId = DeviceId.deviceId(uri);
 
-        MeterId meterId = service.allocateMeterId();
-
         Band band = DefaultBand.builder()
                         .ofType(Band.Type.DROP)
                         .withRate(500)
                         .build();
 
 
-        Meter meter = DefaultMeter.builder()
+        MeterRequest request = DefaultMeterRequest.builder()
                 .forDevice(deviceId)
                 .fromApp(coreService.registerApplication(appId))
-                .withId(meterId)
                 .withUnit(Meter.Unit.KB_PER_SEC)
                 .withBands(Collections.singleton(band))
-                .build();
+                .add();
 
-        MeterOperation op = new MeterOperation(meter, MeterOperation.Type.ADD, null);
-
-        service.addMeter(op);
+        service.submit(request);
 
     }
 }