commit 2e02fabaa0cbaffd3d261b2312d9b4edf5e8009f
author Jian Li <pyguni@gmail.com> Thu Feb 25 15:45:59 2016 +0900
committer Gerrit Code Review <gerrit@onlab.us> Thu Feb 25 15:31:05 2016 +0000
tree 8ff32195b8cba17ea48090b4dbe87fee594f74dd
parent 0c45180740017ba45b00a5d7b8780bad540c5e02

Fix some typos in meter and group REST API

Change-Id: Id32535e154557cba8a4030d9e504c8bd15aa6e9a

web/api/src/main/resources/definitions/Meters.json

diff --git a/web/api/src/main/resources/definitions/Meters.json b/web/api/src/main/resources/definitions/Meters.json
index 0e7488b..46e8727 100644
--- a/web/api/src/main/resources/definitions/Meters.json
+++ b/web/api/src/main/resources/definitions/Meters.json
@@ -5,7 +5,7 @@
     "meters"
   ],
   "properties": {
-    "groups": {
+    "meters": {
       "type": "array",
       "xml": {
         "name": "meters",

web/api/src/test/java/org/onosproject/rest/GroupsResourceTest.java

diff --git a/web/api/src/test/java/org/onosproject/rest/GroupsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/GroupsResourceTest.java
index a6ef6fb..4d4c933 100644
--- a/web/api/src/test/java/org/onosproject/rest/GroupsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/GroupsResourceTest.java
@@ -444,10 +444,10 @@
 
         assertThat(result.names(), hasSize(1));
         assertThat(result.names().get(0), is("groups"));
-        final JsonArray jsonFlows = result.get("groups").asArray();
-        assertThat(jsonFlows, notNullValue());
-        assertThat(jsonFlows, hasGroup(group5));
-        assertThat(jsonFlows, hasGroup(group6));
+        final JsonArray jsonGroups = result.get("groups").asArray();
+        assertThat(jsonGroups, notNullValue());
+        assertThat(jsonGroups, hasGroup(group5));
+        assertThat(jsonGroups, hasGroup(group6));
     }
 
     /**

web/api/src/test/java/org/onosproject/rest/MetersResourceTest.java

diff --git a/web/api/src/test/java/org/onosproject/rest/MetersResourceTest.java b/web/api/src/test/java/org/onosproject/rest/MetersResourceTest.java
index c03f7cc..cb39b21 100644
--- a/web/api/src/test/java/org/onosproject/rest/MetersResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/MetersResourceTest.java
@@ -447,9 +447,9 @@
 
         assertThat(result.names(), hasSize(1));
         assertThat(result.names().get(0), is("meters"));
-        final JsonArray jsonFlows = result.get("meters").asArray();
-        assertThat(jsonFlows, notNullValue());
-        assertThat(jsonFlows, hasMeter(meter5));
+        final JsonArray jsonMeters = result.get("meters").asArray();
+        assertThat(jsonMeters, notNullValue());
+        assertThat(jsonMeters, hasMeter(meter5));
     }
 
     /**