Adding tests for meter service.
Change-Id: Ic220fdaa89b421661019f1a6ef23c7b02eef127c
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java b/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java
index b48a25b..575a715 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java
@@ -32,6 +32,7 @@
import org.onosproject.net.meter.MeterProvider;
import org.onosproject.net.meter.MeterProviderRegistry;
import org.onosproject.net.meter.MeterProviderService;
+import org.onosproject.net.meter.MeterRequest;
import org.onosproject.net.meter.MeterService;
import org.onosproject.net.meter.MeterState;
import org.onosproject.net.meter.MeterStore;
@@ -72,7 +73,7 @@
private AtomicCounter meterIdCounter;
- private TriConsumer<MeterOperation, MeterStoreResult, Throwable> onComplete;
+ private TriConsumer<MeterRequest, MeterStoreResult, Throwable> onComplete;
@Activate
public void activate() {
@@ -82,16 +83,16 @@
store.setDelegate(delegate);
- onComplete = (op, result, error) ->
+ onComplete = (request, result, error) ->
{
- op.context().ifPresent(c -> {
+ request.context().ifPresent(c -> {
if (error != null) {
- c.onError(op.meter(), MeterFailReason.UNKNOWN);
+ c.onError(request, MeterFailReason.UNKNOWN);
} else {
if (result.reason().isPresent()) {
- c.onError(op.meter(), result.reason().get());
+ c.onError(request, result.reason().get());
} else {
- c.onSuccess(op.meter());
+ c.onSuccess(request);
}
}
});
@@ -112,27 +113,42 @@
}
@Override
- public void addMeter(MeterOperation op) {
- DefaultMeter m = (DefaultMeter) op.meter();
+ public Meter submit(MeterRequest request) {
+
+ Meter.Builder mBuilder = DefaultMeter.builder()
+ .forDevice(request.deviceId())
+ .fromApp(request.appId())
+ .withBands(request.bands())
+ .withId(allocateMeterId())
+ .withUnit(request.unit());
+
+ if (request.isBurst()) {
+ mBuilder.burst();
+ }
+ DefaultMeter m = (DefaultMeter) mBuilder.build();
m.setState(MeterState.PENDING_ADD);
store.storeMeter(m).whenComplete((result, error) ->
- onComplete.accept(op, result, error));
+ onComplete.accept(request, result, error));
+ return m;
}
@Override
- public void updateMeter(MeterOperation op) {
- DefaultMeter m = (DefaultMeter) op.meter();
- m.setState(MeterState.PENDING_ADD);
- store.updateMeter(m).whenComplete((result, error) ->
- onComplete.accept(op, result, error));
- }
+ public void withdraw(MeterRequest request, MeterId meterId) {
+ Meter.Builder mBuilder = DefaultMeter.builder()
+ .forDevice(request.deviceId())
+ .fromApp(request.appId())
+ .withBands(request.bands())
+ .withId(meterId)
+ .withUnit(request.unit());
- @Override
- public void removeMeter(MeterOperation op) {
- DefaultMeter m = (DefaultMeter) op.meter();
+ if (request.isBurst()) {
+ mBuilder.burst();
+ }
+
+ DefaultMeter m = (DefaultMeter) mBuilder.build();
m.setState(MeterState.PENDING_REMOVE);
store.deleteMeter(m).whenComplete((result, error) ->
- onComplete.accept(op, result, error));
+ onComplete.accept(request, result, error));
}
@Override
@@ -145,10 +161,9 @@
return store.getAllMeters();
}
- @Override
- public MeterId allocateMeterId() {
+ private MeterId allocateMeterId() {
// FIXME: This will break one day.
- return MeterId.meterId((int) meterIdCounter.getAndIncrement());
+ return MeterId.meterId((int) meterIdCounter.incrementAndGet());
}
private class InternalMeterProviderService
@@ -185,8 +200,7 @@
if (m.state() == MeterState.PENDING_ADD) {
provider().performMeterOperation(m.deviceId(),
new MeterOperation(m,
- MeterOperation.Type.ADD,
- null));
+ MeterOperation.Type.ADD));
} else {
store.deleteMeterNow(m);
}
@@ -203,13 +217,11 @@
switch (event.type()) {
case METER_ADD_REQ:
p.performMeterOperation(deviceId, new MeterOperation(event.subject(),
- MeterOperation.Type.ADD,
- null));
+ MeterOperation.Type.ADD));
break;
case METER_REM_REQ:
p.performMeterOperation(deviceId, new MeterOperation(event.subject(),
- MeterOperation.Type.REMOVE,
- null));
+ MeterOperation.Type.REMOVE));
break;
default:
log.warn("Unknown meter event {}", event.type());
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/meter/impl/MeterManagerTest.java b/incubator/net/src/test/java/org/onosproject/incubator/net/meter/impl/MeterManagerTest.java
new file mode 100644
index 0000000..e0c0c86
--- /dev/null
+++ b/incubator/net/src/test/java/org/onosproject/incubator/net/meter/impl/MeterManagerTest.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.incubator.net.meter.impl;
+
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.onlab.junit.TestUtils;
+import org.onlab.packet.IpAddress;
+import org.onosproject.cluster.ClusterServiceAdapter;
+import org.onosproject.cluster.ControllerNode;
+import org.onosproject.cluster.DefaultControllerNode;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.common.event.impl.TestEventDispatcher;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.DefaultApplicationId;
+import org.onosproject.incubator.store.meter.impl.DistributedMeterStore;
+import org.onosproject.mastership.MastershipServiceAdapter;
+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.MeterOperations;
+import org.onosproject.net.meter.MeterProvider;
+import org.onosproject.net.meter.MeterProviderRegistry;
+import org.onosproject.net.meter.MeterProviderService;
+import org.onosproject.net.meter.MeterRequest;
+import org.onosproject.net.meter.MeterService;
+import org.onosproject.net.meter.MeterState;
+import org.onosproject.net.provider.AbstractProvider;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.store.service.TestStorageService;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.onosproject.net.NetTestTools.APP_ID;
+import static org.onosproject.net.NetTestTools.did;
+import static org.onosproject.net.NetTestTools.injectEventDispatcher;
+
+/**
+ * Meter manager tests.
+ */
+public class MeterManagerTest {
+
+ private static final ProviderId PID = new ProviderId("of", "foo");
+ private static final NodeId NID_LOCAL = new NodeId("local");
+ private static final IpAddress LOCALHOST = IpAddress.valueOf("127.0.0.1");
+
+ private MeterService service;
+ private MeterManager manager;
+ private DistributedMeterStore meterStore;
+ private MeterProviderRegistry registry;
+ private MeterProviderService providerService;
+
+ private TestProvider provider;
+
+ private ApplicationId appId;
+
+
+ private Meter m1;
+ private Meter m2;
+ private MeterRequest.Builder m1Request;
+ private MeterRequest.Builder m2Request;
+
+ private Map<MeterId, Meter> meters = Maps.newHashMap();
+
+ @Before
+ public void setup() throws Exception {
+ meterStore = new DistributedMeterStore();
+ TestUtils.setField(meterStore, "storageService", new TestStorageService());
+ TestUtils.setField(meterStore, "clusterService", new TestClusterService());
+ TestUtils.setField(meterStore, "mastershipService", new TestMastershipService());
+ meterStore.activate();
+
+ manager = new MeterManager();
+ manager.store = meterStore;
+ TestUtils.setField(manager, "storageService", new TestStorageService());
+ injectEventDispatcher(manager, new TestEventDispatcher());
+ service = manager;
+ registry = manager;
+
+ manager.activate();
+
+ provider = new TestProvider(PID);
+ providerService = registry.register(provider);
+
+ appId = new TestApplicationId(0, "MeterManagerTest");
+
+ assertTrue("provider should be registered",
+ registry.getProviders().contains(provider.id()));
+
+ Band band = DefaultBand.builder()
+ .ofType(Band.Type.DROP)
+ .withRate(500)
+ .build();
+
+ m1 = DefaultMeter.builder()
+ .forDevice(did("1"))
+ .fromApp(APP_ID)
+ .withId(MeterId.meterId(1))
+ .withUnit(Meter.Unit.KB_PER_SEC)
+ .withBands(Collections.singletonList(band))
+ .build();
+
+ m2 = DefaultMeter.builder()
+ .forDevice(did("2"))
+ .fromApp(APP_ID)
+ .withId(MeterId.meterId(2))
+ .withUnit(Meter.Unit.KB_PER_SEC)
+ .withBands(Collections.singletonList(band))
+ .build();
+
+ m1Request = DefaultMeterRequest.builder()
+ .forDevice(did("1"))
+ .fromApp(APP_ID)
+ .withUnit(Meter.Unit.KB_PER_SEC)
+ .withBands(Collections.singletonList(band));
+
+ m2Request = DefaultMeterRequest.builder()
+ .forDevice(did("2"))
+ .fromApp(APP_ID)
+ .withUnit(Meter.Unit.KB_PER_SEC)
+ .withBands(Collections.singletonList(band));
+
+
+ }
+
+ @After
+ public void tearDown() {
+ registry.unregister(provider);
+ assertFalse("provider should not be registered",
+ registry.getProviders().contains(provider.id()));
+
+ manager.deactivate();
+ injectEventDispatcher(manager, null);
+
+ }
+
+ @Test
+ public void testAddition() {
+ manager.submit(m1Request.add());
+
+ assertTrue("The meter was not added", manager.getAllMeters().size() == 1);
+
+ assertThat(manager.getMeter(MeterId.meterId(1)), is(m1));
+ }
+
+ @Test
+ public void testRemove() {
+ manager.submit(m1Request.add());
+ manager.withdraw(m1Request.remove(), m1.id());
+
+ assertThat(manager.getMeter(MeterId.meterId(1)).state(),
+ is(MeterState.PENDING_REMOVE));
+
+ providerService.pushMeterMetrics(m1.deviceId(), Collections.emptyList());
+
+ assertTrue("The meter was not removed", manager.getAllMeters().size() == 0);
+
+ }
+
+
+
+ public class TestApplicationId extends DefaultApplicationId {
+ public TestApplicationId(int id, String name) {
+ super(id, name);
+ }
+ }
+
+ private class TestProvider extends AbstractProvider implements MeterProvider {
+
+ protected TestProvider(ProviderId id) {
+ super(PID);
+ }
+
+ @Override
+ public void performMeterOperation(DeviceId deviceId, MeterOperations meterOps) {
+ //Currently unused.
+ }
+
+ @Override
+ public void performMeterOperation(DeviceId deviceId, MeterOperation meterOp) {
+ meters.put(meterOp.meter().id(), meterOp.meter());
+ }
+ }
+
+ private final class TestClusterService extends ClusterServiceAdapter {
+
+ ControllerNode local = new DefaultControllerNode(NID_LOCAL, LOCALHOST);
+
+ @Override
+ public ControllerNode getLocalNode() {
+ return local;
+ }
+
+ @Override
+ public Set<ControllerNode> getNodes() {
+ return Sets.newHashSet();
+ }
+
+ }
+
+ private class TestMastershipService extends MastershipServiceAdapter {
+ @Override
+ public NodeId getMasterFor(DeviceId deviceId) {
+ return NID_LOCAL;
+ }
+ }
+}
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 f343d83..32890cb 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
@@ -143,7 +143,9 @@
// update the state of the meter. It will be pruned by observing
// that it has been removed from the dataplane.
try {
- meters.put(meter.id(), data);
+ if (meters.computeIfPresent(meter.id(), (k, v) -> data) == null) {
+ future.complete(MeterStoreResult.success());
+ }
} catch (StorageException e) {
future.completeExceptionally(e);
}
@@ -159,7 +161,9 @@
MeterData data = new MeterData(meter, null, local);
try {
- meters.put(meter.id(), data);
+ if (meters.computeIfPresent(meter.id(), (k, v) -> data) == null) {
+ future.complete(MeterStoreResult.fail(MeterFailReason.INVALID_METER));
+ }
} catch (StorageException e) {
future.completeExceptionally(e);
}
@@ -227,6 +231,10 @@
}
break;
case ADDED:
+ if (local.equals(data.origin()) && data.meter().state() == MeterState.PENDING_ADD) {
+ futures.remove(data.meter().id()).complete(MeterStoreResult.success());
+ }
+ break;
case REMOVED:
if (local.equals(data.origin()) && data.meter().state() == MeterState.PENDING_REMOVE) {
futures.remove(data.meter().id()).complete(MeterStoreResult.success());