Remove redundant meter id when create a meter entry in REST API
Change-Id: Iec38ea9a612878a2a6f2766c154c8ed8a8b31ef2
diff --git a/core/common/src/test/java/org/onosproject/codec/impl/MeterCodecTest.java b/core/common/src/test/java/org/onosproject/codec/impl/MeterCodecTest.java
index 476785d..0d1ac59 100644
--- a/core/common/src/test/java/org/onosproject/codec/impl/MeterCodecTest.java
+++ b/core/common/src/test/java/org/onosproject/codec/impl/MeterCodecTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015-2016 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.
@@ -15,7 +15,6 @@
*/
package org.onosproject.codec.impl;
-import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.collect.ImmutableList;
import org.junit.Before;
@@ -29,14 +28,10 @@
import org.onosproject.net.meter.Meter;
import org.onosproject.net.meter.MeterId;
-import java.io.IOException;
-import java.io.InputStream;
-
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.onosproject.codec.impl.MeterJsonMatcher.matchesMeter;
import static org.onosproject.net.NetTestTools.APP_ID;
@@ -91,48 +86,4 @@
ObjectNode meterJson = meterCodec.encode(meter, context);
assertThat(meterJson, matchesMeter(meter));
}
-
- /**
- * Test decoding of a Meter object.
- */
- @Test
- public void testMeterDecode() throws IOException {
- Meter meter = getMeter("simple-meter.json");
- checkCommonData(meter);
-
- assertThat(meter.bands().size(), is(1));
- Band band = meter.bands().iterator().next();
- assertThat(band.type().toString(), is("REMARK"));
- assertThat(band.rate(), is(10L));
- assertThat(band.dropPrecedence(), is((short) 20));
- assertThat(band.burst(), is(30L));
- }
-
- /**
- * Checks that the data shared by all the resource is correct for a given meter.
- *
- * @param meter meter to check
- */
- private void checkCommonData(Meter meter) {
- assertThat(meter.id().id(), is(1L));
- assertThat(meter.deviceId().toString(), is("of:0000000000000001"));
- assertThat(meter.appId(), is(APP_ID));
- assertThat(meter.unit().toString(), is("KB_PER_SEC"));
- }
-
- /**
- * Reads in a meter from the given resource and decodes it.
- *
- * @param resourceName resource to use to read the JSON for the rule
- * @return decoded meter
- * @throws IOException if processing the resource fails
- */
- private Meter getMeter(String resourceName) throws IOException {
- InputStream jsonStream = MeterCodecTest.class.getResourceAsStream(resourceName);
- JsonNode json = context.mapper().readTree(jsonStream);
- assertThat(json, notNullValue());
- Meter meter = meterCodec.decode((ObjectNode) json, context);
- assertThat(meter, notNullValue());
- return meter;
- }
}
diff --git a/core/common/src/test/java/org/onosproject/codec/impl/MeterRequestCodecTest.java b/core/common/src/test/java/org/onosproject/codec/impl/MeterRequestCodecTest.java
new file mode 100644
index 0000000..94e3b03
--- /dev/null
+++ b/core/common/src/test/java/org/onosproject/codec/impl/MeterRequestCodecTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2016 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.codec.impl;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.junit.Before;
+import org.junit.Test;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.core.CoreService;
+import org.onosproject.net.meter.Band;
+import org.onosproject.net.meter.MeterRequest;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.onosproject.net.NetTestTools.APP_ID;
+
+/**
+ * Unit tests for MeterRequest codec.
+ */
+public class MeterRequestCodecTest {
+ MockCodecContext context;
+ JsonCodec<MeterRequest> meterRequestCodec;
+ final CoreService mockCoreService = createMock(CoreService.class);
+
+ /**
+ * Sets up for each test. Creates a context and fetches the meterRequest
+ * codec.
+ */
+ @Before
+ public void setUp() {
+ context = new MockCodecContext();
+ meterRequestCodec = context.codec(MeterRequest.class);
+ assertThat(meterRequestCodec, notNullValue());
+
+ expect(mockCoreService.registerApplication(MeterCodec.REST_APP_ID))
+ .andReturn(APP_ID).anyTimes();
+ replay(mockCoreService);
+ context.registerService(CoreService.class, mockCoreService);
+ }
+
+ /**
+ * Test decoding of a MeterRequest object.
+ */
+ @Test
+ public void testMeterRequestDecode() throws IOException {
+ MeterRequest meterRequest = getMeterRequest("simple-meter-request.json");
+ checkCommonData(meterRequest);
+
+ assertThat(meterRequest.bands().size(), is(1));
+ Band band = meterRequest.bands().iterator().next();
+ assertThat(band.type().toString(), is("REMARK"));
+ assertThat(band.rate(), is(10L));
+ assertThat(band.dropPrecedence(), is((short) 20));
+ assertThat(band.burst(), is(30L));
+ }
+
+ /**
+ * Checks that the data shared by all the resource is correct for a given meterRequest.
+ *
+ * @param meterRequest meterRequest to check
+ */
+ private void checkCommonData(MeterRequest meterRequest) {
+ assertThat(meterRequest.deviceId().toString(), is("of:0000000000000001"));
+ assertThat(meterRequest.appId(), is(APP_ID));
+ assertThat(meterRequest.unit().toString(), is("KB_PER_SEC"));
+ }
+
+ /**
+ * Reads in a meter from the given resource and decodes it.
+ *
+ * @param resourceName resource to use to read the JSON for the rule
+ * @return decoded meterRequest
+ * @throws IOException if processing the resource fails
+ */
+ private MeterRequest getMeterRequest(String resourceName) throws IOException {
+ InputStream jsonStream = MeterRequestCodecTest.class.getResourceAsStream(resourceName);
+ JsonNode json = context.mapper().readTree(jsonStream);
+ assertThat(json, notNullValue());
+ MeterRequest meterRequest = meterRequestCodec.decode((ObjectNode) json, context);
+ assertThat(meterRequest, notNullValue());
+ return meterRequest;
+ }
+}