UT and defect fixes for DF serializer

[ccsdk/sli/plugins.git] / restconf-client / provider / src / main / java / org / onap / ccsdk / sli / plugins / yangserializers / pnserializer / DefaultPropertiesNodeListener.java

diff --git a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/DefaultPropertiesNodeListener.java b/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/DefaultPropertiesNodeListener.java
index a8a9b49..491dcb0 100644 (file)
--- a/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/DefaultPropertiesNodeListener.java
+++ b/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/DefaultPropertiesNodeListener.java
@@ -20,6 +20,8 @@
 
 package org.onap.ccsdk.sli.plugins.yangserializers.pnserializer;
 
+import org.onap.ccsdk.sli.core.sli.SvcLogicException;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -40,7 +42,7 @@ public class DefaultPropertiesNodeListener implements PropertiesNodeListener {
     }
 
     @Override
-    public void end(PropertiesNode node) {
+    public void end(PropertiesNode node) throws SvcLogicException {
         exitPropertiesNode(node);
     }
 
@@ -52,12 +54,17 @@ public class DefaultPropertiesNodeListener implements PropertiesNodeListener {
          */
         if (node.nodeType() == SINGLE_INSTANCE_LEAF_NODE
                 || node.nodeType() == MULTI_INSTANCE_LEAF_NODE) {
-            params.put(node.uri(), ((LeafNode) node).value());
+            String val = ((LeafNode) node).value();
+            if (((LeafNode) node).valueNs() != null) {
+                val = ((LeafNode) node).valueNs().moduleName() + ":" + val;
+            }
+            params.put(node.uri(), val);
         }
     }
 
     @Override
-    public void exitPropertiesNode(PropertiesNode node) {
+    public void exitPropertiesNode(PropertiesNode node) throws
+            SvcLogicException {
         if (!node.augmentations().isEmpty()) {
             for (Map.Entry<Object, Collection<PropertiesNode>> augmentationTochild
                     : node.augmentations().asMap().entrySet()) {