commit 6e960ef79b3507bb5f627f22c6713c9d9a463112
author Jian Li <pyguni@gmail.com> Wed May 03 16:38:19 2017 +0900
committer Jian Li <pyguni@gmail.com> Sat May 06 16:45:00 2017 +0000
tree 38d22b6c977d5243627f32384dd3c4a874da4346
parent 60445dd22142791c7e223914ed3cb363a678b2a0

Fix: Make the mapping storage type identical in CLI and REST API

Change-Id: If9cd9bea747c165204428775473e75f05ac27917

apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/api/MappingsWebResource.java

diff --git a/apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/api/MappingsWebResource.java b/apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/api/MappingsWebResource.java
index 6a9acd1..9235f9a 100644
--- a/apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/api/MappingsWebResource.java
+++ b/apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/api/MappingsWebResource.java
@@ -44,7 +44,7 @@
     private static final String TYPE_ILLEGAL = "Mapping store type is not correct";
     private static final String MAPPINGS = "mappings";
 
-    private static final String DB = "db";
+    private static final String DB = "database";
     private static final String CACHE = "cache";
 
     private final MappingService mappingService = get(MappingService.class);
@@ -83,8 +83,9 @@
      * specified device.
      *
      * @param deviceId device identifier
-     * @param type mapping store type
+     * @param type     mapping store type
      * @return 200 OK with a collection of mappings of given device
+     *
      * @onos.rsModel MappingEntries
      */
     @GET

apps/mappingmanagement/web/src/test/java/org/onosproject/mapping/web/MappingsWebResourceTest.java

diff --git a/apps/mappingmanagement/web/src/test/java/org/onosproject/mapping/web/MappingsWebResourceTest.java b/apps/mappingmanagement/web/src/test/java/org/onosproject/mapping/web/MappingsWebResourceTest.java
index ffbd434..7d8c898 100644
--- a/apps/mappingmanagement/web/src/test/java/org/onosproject/mapping/web/MappingsWebResourceTest.java
+++ b/apps/mappingmanagement/web/src/test/java/org/onosproject/mapping/web/MappingsWebResourceTest.java
@@ -101,6 +101,7 @@
     private static final int DIFF_VALUE = 99;
 
     private static final String ID = "id";
+    private static final String DATABASE = "database";
 
     private static final String PREFIX = "mappings";
 
@@ -412,7 +413,7 @@
                 .andReturn(null).anyTimes();
         replay(mockMappingService);
         final WebTarget wt = target();
-        final String response = wt.path(PREFIX + "/db").request().get(String.class);
+        final String response = wt.path(PREFIX + "/" + DATABASE).request().get(String.class);
         assertThat(response, is("{\"mappings\":[]}"));
     }
 
@@ -426,7 +427,7 @@
                 .andReturn(mappingEntries).once();
         replay(mockMappingService);
         final WebTarget wt = target();
-        final String response = wt.path(PREFIX + "/db").request().get(String.class);
+        final String response = wt.path(PREFIX + "/" + DATABASE).request().get(String.class);
         final JsonObject result = Json.parse(response).asObject();
         assertThat(result, notNullValue());
 
@@ -453,7 +454,7 @@
         replay(mockMappingService);
 
         final WebTarget wt = target();
-        final String response = wt.path(PREFIX + "/" + deviceId1 + "/db")
+        final String response = wt.path(PREFIX + "/" + deviceId1 + "/" + DATABASE)
                 .request().get(String.class);
         assertThat(response, is("{\"mappings\":[]}"));
     }
@@ -472,7 +473,7 @@
         replay(mockMappingService);
 
         final WebTarget wt = target();
-        final String response = wt.path(PREFIX + "/" + deviceId2 + "/db")
+        final String response = wt.path(PREFIX + "/" + deviceId2 + "/" + DATABASE)
                 .request().get(String.class);
 
         final JsonObject result = Json.parse(response).asObject();