Remove redundant meter id when create a meter entry in REST API
Change-Id: Iec38ea9a612878a2a6f2766c154c8ed8a8b31ef2
diff --git a/web/api/src/main/java/org/onosproject/rest/resources/MetersWebResource.java b/web/api/src/main/java/org/onosproject/rest/resources/MetersWebResource.java
index 743fc25e..f42f9d4 100644
--- a/web/api/src/main/java/org/onosproject/rest/resources/MetersWebResource.java
+++ b/web/api/src/main/java/org/onosproject/rest/resources/MetersWebResource.java
@@ -141,8 +141,7 @@
throw new IllegalArgumentException(DEVICE_INVALID);
}
jsonTree.put("deviceId", deviceId);
- final Meter tmpMeter = codec(Meter.class).decode(jsonTree, this);
- final MeterRequest meterRequest = meterToMeterRequest(tmpMeter, "ADD");
+ final MeterRequest meterRequest = codec(MeterRequest.class).decode(jsonTree, this);
final Meter meter = meterService.submit(meterRequest);
location = new URI(Long.toString(meter.id().id()));
} catch (IOException | URISyntaxException ex) {
diff --git a/web/api/src/main/resources/definitions/MeterPost.json b/web/api/src/main/resources/definitions/MeterPost.json
index 58ae9db..d572ccb 100644
--- a/web/api/src/main/resources/definitions/MeterPost.json
+++ b/web/api/src/main/resources/definitions/MeterPost.json
@@ -2,17 +2,12 @@
"type": "object",
"title": "meter",
"required": [
- "id",
"deviceId",
"unit",
"burst",
"bands"
],
"properties": {
- "id": {
- "type": "string",
- "example": "1"
- },
"deviceId": {
"type": "string",
"example": "of:0000000000000001"