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/cli/src/main/java/org/onosproject/mapping/cli/MappingStoreTypeCompleter.java

diff --git a/apps/mappingmanagement/cli/src/main/java/org/onosproject/mapping/cli/MappingStoreTypeCompleter.java b/apps/mappingmanagement/cli/src/main/java/org/onosproject/mapping/cli/MappingStoreTypeCompleter.java
index 2a7c04b..768029e 100755
--- a/apps/mappingmanagement/cli/src/main/java/org/onosproject/mapping/cli/MappingStoreTypeCompleter.java
+++ b/apps/mappingmanagement/cli/src/main/java/org/onosproject/mapping/cli/MappingStoreTypeCompleter.java
@@ -16,6 +16,7 @@
 package org.onosproject.mapping.cli;
 
 import com.google.common.collect.ImmutableList;
+import org.apache.commons.lang3.StringUtils;
 import org.onosproject.cli.AbstractChoicesCompleter;
 import org.onosproject.mapping.MappingStore.Type;
 
@@ -29,10 +30,16 @@
 
     private static final List<Type> STORE_TYPES =
             ImmutableList.of(Type.MAP_CACHE, Type.MAP_DATABASE);
+    private static final String MAP_PREFIX = "map_";
 
     @Override
     protected List<String> choices() {
         return STORE_TYPES.stream().map(type ->
-                type.toString().toLowerCase()).collect(Collectors.toList());
+                removeMapPrefix(type.toString().toLowerCase()))
+                .collect(Collectors.toList());
+    }
+
+    private String removeMapPrefix(String type) {
+        return StringUtils.replaceAll(type, MAP_PREFIX, "");
     }
 }
\ No newline at end of file