commit 4cd2ced6e3ed4df8bd0d09145d0b1adc35e6c47f
author Sithara Punnassery <psithara@gmail.com> Fri Mar 17 17:36:43 2017 -0700
committer Thomas Vachuska <tom@onlab.us> Tue Mar 21 20:33:47 2017 +0000
tree b88cd19c7963295acf5060f665d9ce2b98f123f0
parent c9ce09a10f1738be6b8a88dc448c2f949a5ea5a1

ONOS-6154
Demo1: Integration - Restconf Exception during GET

Change-Id: I5e41de333748ed282f70bdda6e31269668e37ed1

apps/config/src/main/java/org/onosproject/config/ResourceIdParser.java

diff --git a/apps/config/src/main/java/org/onosproject/config/ResourceIdParser.java b/apps/config/src/main/java/org/onosproject/config/ResourceIdParser.java
index 23c107d..089aeff 100755
--- a/apps/config/src/main/java/org/onosproject/config/ResourceIdParser.java
+++ b/apps/config/src/main/java/org/onosproject/config/ResourceIdParser.java
@@ -36,6 +36,8 @@
     public static final String VAL_SEP = "@";
     public static final String KEY_SEP = "$";
     public static final String EL_SEP = ".";
+    public static final String VAL_CHK = "\\@";
+    public static final String KEY_CHK = "\\$";
 
 
 
@@ -69,6 +71,27 @@
         }
     }
 
+    public static String getNamespace(String nmspc) {
+        String ret = null;
+        if (nmspc.contains(ResourceIdParser.KEY_SEP)) {
+            ret = nmspc.split(KEY_CHK)[0];
+        } else if (nmspc.contains(ResourceIdParser.VAL_SEP)) {
+            ret = nmspc.split(VAL_CHK)[0];
+        } else {
+            ret = nmspc;
+        }
+        return ret;
+    }
+
+    public static String getKeyVal(String nmspc) {
+        String ret = null;
+        if (nmspc.contains(ResourceIdParser.VAL_SEP)) {
+            ret = nmspc.split(VAL_CHK)[1];
+        }
+        return ret;
+    }
+
+
     public static String appendMultiInstKey(String path, String leaf) {
         return (path + leaf.substring(leaf.indexOf(KEY_SEP)));
     }
@@ -97,11 +120,11 @@
     }
 
     public static String appendLeafList(String path, LeafListKey key) {
-        return (path + NM_SEP + key.asString());
+        return (path + VAL_SEP + key.asString());
     }
 
     public static String appendLeafList(String path, String val) {
-        return (path + NM_SEP + val);
+        return (path + VAL_SEP + val);
     }
 
     public static String appendKeyList(String path, ListKey key) {