From 8550176e6fd49c28cf9d9a5c79cc363eb91e6335 Mon Sep 17 00:00:00 2001 From: "Smokowski, Kevin (ks6305)" Date: Tue, 27 Mar 2018 17:48:55 +0000 Subject: Simplify enumeration handling Use getName() on the java object instead of relying on a mapping file created by yang2props Change-Id: Ie3405903af5211c019c93a9a0b49ba9159b0bbe2 Issue-ID: CCSDK-227 Signed-off-by: Smokowski, Kevin (ks6305) --- .../java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java index 76101514..b652c433 100644 --- a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java +++ b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java @@ -56,6 +56,7 @@ public class MdsalHelper { setYangMappingProperties(input); } + @Deprecated public static void setYangMappingProperties(Properties properties) { for (Object propNameObj : properties.keySet()) { String propName = (String) propNameObj; @@ -63,6 +64,7 @@ public class MdsalHelper { } } + @Deprecated public static void loadProperties(String propertiesFile) { File file = new File(propertiesFile); Properties properties = new Properties(); @@ -186,8 +188,9 @@ public class MdsalHelper { } if (retValue != null) { String propName = propNamePfx + "." + fieldName; - propVal = retValue.toString(); - props.setProperty(propName, mapEnumeratedValue(fieldName, propVal)); + Method method = retValue.getClass().getMethod("getName"); + String yangValue = (String) method.invoke(retValue); + props.setProperty(propName, yangValue); } } catch (Exception e) { LOG.error( @@ -1333,11 +1336,13 @@ public class MdsalHelper { return (false); } + @Deprecated public static String getFullPropertiesPath(String propertiesFileName) { return "/opt/bvc/controller/configuration/" + propertiesFileName; } // This is called when mapping a valid java enumeration back to the yang model value + @Deprecated public static String mapEnumeratedValue(String propertyName, String propertyValue) { LOG.info("mapEnumeratedValue called with propertyName=" + propertyName + " and value=" + propertyValue); String mappingKey = "yang." + propertyName + "." + propertyValue; -- cgit 1.2.3-korg