Merge "remove useless log lines"

8 files changed, 24 insertions, 175 deletions

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExprListener.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExprListener.java
index e96b702e..185986d8 100644
--- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExprListener.java
+++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicExprListener.java
@@ -52,7 +52,7 @@ public class SvcLogicExprListener extends ExprGrammarBaseListener
 			.getLogger(SvcLogicExprListener.class);
 	
 	private SvcLogicExpression curExpr;
-	private SvcLogicExpression topExpr;
+	//private SvcLogicExpression topExpr;
 	private LinkedList<SvcLogicExpression> exprStack;
 	
 	public SvcLogicExprListener()
@@ -91,37 +91,27 @@ public class SvcLogicExprListener extends ExprGrammarBaseListener
 	{
 		if (exprStack.isEmpty())
 		{
-			LOG.trace("Popping last expression");
-			topExpr = curExpr;
+			//topExpr = curExpr;
 		}
 		else
 		{
 			SvcLogicExpression lastExpr = curExpr;
 			curExpr = exprStack.pop();
 			curExpr.addOperand(lastExpr);
-			LOG.trace("New curExpr is ["+curExpr.getClass().getName()+"]");
 		}
 		
 	}
 	
 	@Override
 	public void enterAtom(AtomContext ctx) {
-		
-		String atomText = ctx.getText();
-		
-		LOG.trace("enterAtom: text = "+atomText);
-
-		
+		String atomText = ctx.getText();	
 		SvcLogicAtom newAtom = new SvcLogicAtom(atomText);
-		
 		pushExpr(newAtom);
 	}
 
 
 	@Override
 	public void enterMultExpr(MultExprContext ctx) {
-		LOG.trace("enterMultExpr: text = "+ctx.getText());
-		
 		SvcLogicBinaryExpression curBinExpr = new SvcLogicBinaryExpression();
 		pushExpr(curBinExpr);
 		
@@ -129,7 +119,6 @@ public class SvcLogicExprListener extends ExprGrammarBaseListener
 		
 		for (TerminalNode nd : opList)
 		{
-			LOG.trace("enterMultExpr: operator - "+nd.getText());
 			curBinExpr.addOperator(nd.getText());
 		}
 
@@ -137,22 +126,16 @@ public class SvcLogicExprListener extends ExprGrammarBaseListener
 
 	@Override
 	public void exitMultExpr(MultExprContext ctx) {
-
-		LOG.trace("exitMultExpr: text = "+ctx.getText());
-
 		popExpr();
-		
 	}
 
 	@Override
 	public void exitAtom(AtomContext ctx) {
-		LOG.trace("exitAtom: text = "+ctx.getText());
 		popExpr();
 	}
 
 	@Override
 	public void enterAddExpr(AddExprContext ctx) {
-		LOG.trace("enterAddExpr: text = "+ctx.getText());
 		List<TerminalNode> opList = ctx.ADDOP();
 		
 
@@ -162,16 +145,13 @@ public class SvcLogicExprListener extends ExprGrammarBaseListener
 		
 		for (TerminalNode nd : opList)
 		{
-			LOG.trace("enterAddExpr: operator - "+nd.getText());
 			curBinExpr.addOperator(nd.getText());
 		}
 		
 	}
 
 	@Override
-	public void exitAddExpr(AddExprContext ctx) {
-		LOG.trace("exitAddExpr: text = "+ctx.getText());
-		
+	public void exitAddExpr(AddExprContext ctx) {		
 		popExpr();
 	}
 
@@ -190,9 +170,7 @@ public class SvcLogicExprListener extends ExprGrammarBaseListener
 	}
 
 	@Override
-	public void exitFuncExpr(FuncExprContext ctx) {
-		LOG.trace("exitFuncExpr: text = "+ctx.getText());
-		
+	public void exitFuncExpr(FuncExprContext ctx) {	
 		popExpr();
 	}
 
@@ -208,9 +186,7 @@ public class SvcLogicExprListener extends ExprGrammarBaseListener
 	}
 
 	@Override
-	public void enterRelExpr(RelExprContext ctx) {
-		LOG.trace("enterRelExpr: text = "+ctx.getText());
-		
+	public void enterRelExpr(RelExprContext ctx) {	
 		List<TerminalNode> opList = ctx.RELOP();
 		
 
@@ -220,36 +196,30 @@ public class SvcLogicExprListener extends ExprGrammarBaseListener
 		
 		for (TerminalNode nd : opList)
 		{
-			LOG.trace("enterRelExpr: operator - "+nd.getText());
 			curBinExpr.addOperator(nd.getText());
 		}
 		
 	}
 
 	@Override
-	public void exitRelExpr(RelExprContext ctx) {
-		LOG.trace("exitRelExpr: text = "+ctx.getText());
-		
+	public void exitRelExpr(RelExprContext ctx) {	
 		popExpr();
 	}
 
 	@Override
 	public void enterCompareExpr(CompareExprContext ctx) {
-		LOG.trace("enterCompareExpr: text = "+ctx.getText());
 		
 		TerminalNode nd = ctx.COMPAREOP();
 
 		SvcLogicBinaryExpression curBinExpr = new SvcLogicBinaryExpression();
 		pushExpr(curBinExpr);
 
-		LOG.trace("enterCompareExpr: operator - "+nd.getText());
 		curBinExpr.addOperator(nd.getText());
 
 	}
 
 	@Override
 	public void exitCompareExpr(CompareExprContext ctx) {
-		LOG.trace("exitCompareExpr : text = "+ctx.getText());
 		
 		popExpr();
 	}
@@ -258,47 +228,32 @@ public class SvcLogicExprListener extends ExprGrammarBaseListener
 	
 	@Override 
 	public void enterConstant(ConstantContext ctx) {
-		LOG.trace("enterConstant: text = "+ctx.getText());
 	}
 
 	@Override
 	public void exitConstant(ConstantContext ctx) {
-		LOG.trace("exitConstant: text = "+ctx.getText());
 	}
 
 
 	@Override
 	public void enterVariable(VariableContext ctx) {
-		LOG.trace("enterVariable: text = "+ctx.getText());
-		
-		
 	}
 
 	@Override
-	public void exitVariable(VariableContext ctx) {
-		LOG.debug("exitVariable: text ="+ctx.getText());
-		
+	public void exitVariable(VariableContext ctx) {	
 	}
 	
 
 	@Override
 	public void enterVariableLead(VariableLeadContext ctx) {
-
-		LOG.debug("enterVariableLead: text ="+ctx.getText());
-		
-
 	}
 
 	@Override
 	public void exitVariableLead(VariableLeadContext ctx) {
-
-		LOG.trace("exitVariableLead: text ="+ctx.getText());
 	}
 
 	@Override
-	public void enterVariableTerm(VariableTermContext ctx) {
-		LOG.trace("enterVariableTerm: text ="+ctx.getText());
-		
+	public void enterVariableTerm(VariableTermContext ctx) {		
 		String name = ctx.getText();
 		
 		int subscrStart = name.indexOf("[");
@@ -312,7 +267,6 @@ public class SvcLogicExprListener extends ExprGrammarBaseListener
 
 	@Override
 	public void exitVariableTerm(VariableTermContext ctx) {
-		LOG.trace("exitVariableTerm: text="+ctx.getText());
-		popExpr();
+	    popExpr();
 	}
 }
diff --git a/sli/features/features-sli/src/main/feature/feature.xml b/sli/features/features-sli/src/main/feature/feature.xml
new file mode 100644
index 00000000..f8ecf8d6
--- /dev/null
+++ b/sli/features/features-sli/src/main/feature/feature.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="ccsdk-dblib">
+    <feature name="features-sli" description="ccsdk-sli-core :: sli :: features-sli" version="${project.version}">
+    <!-- the generated bundle symbolic name is very long for wrapped jars, providing an instruction to shorten it -->
+        <bundle>wrap:mvn:org.onap.ccsdk.sli.core/sli-provider-base/${project.version}$Bundle-SymbolicName=org.onap.ccsdk.sli.core.sli-provider.base</bundle>
+    </feature>
+</features>
diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/BlockNodeExecutor.java b/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/BlockNodeExecutor.java
index 7aaf795b..fb152790 100644
--- a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/BlockNodeExecutor.java
+++ b/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/BlockNodeExecutor.java
@@ -54,17 +54,11 @@ public class BlockNodeExecutor extends AbstractSvcLogicNodeExecutor {
 			
 			SvcLogicNode nextNode = node.getOutcomeValue("" + (i + 1));
 			if (nextNode != null) {
-				if (LOG.isDebugEnabled()) {
-					LOG.debug("Block - executing outcome " + (i + 1));
-				}
+
 				while (nextNode != null)
 				{
 				       nextNode = svc.executeNode(nextNode, ctx);
 				}
-			} else {
-				if (LOG.isDebugEnabled()) {
-					LOG.debug("Block - done: no outcome " + (i + 1));
-				}
 			}
 		}
 
diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/CallNodeExecutor.java b/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/CallNodeExecutor.java
index fd052ada..766826f7 100644
--- a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/CallNodeExecutor.java
+++ b/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/CallNodeExecutor.java
@@ -50,10 +50,6 @@ public class CallNodeExecutor extends AbstractSvcLogicNodeExecutor {
 		{
 			LOG.debug("execute: getGraph returned null");
 		}
-		else
-		{
-			LOG.debug("execute: got SvcLogicGraph");
-		}
 
 		SvcLogicExpression moduleExpr = null;
 
@@ -70,7 +66,6 @@ public class CallNodeExecutor extends AbstractSvcLogicNodeExecutor {
 			if (myGraph != null)
 			{
 				module = myGraph.getModule();
-				LOG.debug("myGraph.getModule() returned "+module);
 			}
 		}
 
@@ -87,7 +82,6 @@ public class CallNodeExecutor extends AbstractSvcLogicNodeExecutor {
 			if (myGraph != null)
 			{
 				rpc = myGraph.getRpc();
-				LOG.debug("myGraph.getRpc() returned "+rpc);
 			}
 		}
 
@@ -104,8 +98,6 @@ public class CallNodeExecutor extends AbstractSvcLogicNodeExecutor {
 			if (myGraph != null)
 			{
 				mode = myGraph.getMode();
-
-				LOG.debug("myGraph.getMode() returned "+mode);
 			}
 		}
 
diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicExpressionResolver.java b/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicExpressionResolver.java
index 0e502035..59ba6cd7 100644
--- a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicExpressionResolver.java
+++ b/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicExpressionResolver.java
@@ -68,7 +68,6 @@ public class SvcLogicExpressionResolver {
 				
 				if (atomType == AtomType.CONTEXT_VAR)
 				{
-					LOG.trace("Evaluating context variable $"+varName);
 					
 					String varValue = ctx.getAttribute(varName);
 					
@@ -80,9 +79,7 @@ public class SvcLogicExpressionResolver {
 					return (varValue);
 				}
 				SvcLogicExpression parm = node.getParameter(varName);
-				if (parm != null) {
-					LOG.trace("Evaluating value of parameter "+varName+": "+parm.asParsedExpr());
-					
+				if (parm != null) {				
 					return (evaluate(parm, node, ctx));
 				}
 				else
@@ -491,7 +488,6 @@ public class SvcLogicExpressionResolver {
                 }
 
 				String varName = varNameBuff.toString();
-				LOG.debug("Evaluating context variable $"+varName);
 				String ctxValue = ctx.getAttribute(varName);
 				if (ctxValue == null)
 				{
diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicServiceImplBase.java b/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicServiceImplBase.java
index 8351e95b..5d6843f9 100644
--- a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicServiceImplBase.java
+++ b/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/provider/base/SvcLogicServiceImplBase.java
@@ -77,26 +77,20 @@ public class SvcLogicServiceImplBase implements SvcLogicServiceBase {
     }
 
     protected void registerExecutors() {
-
-        LOG.info("Entered register executors");
         for (String nodeType : BUILTIN_NODES.keySet()) {
-            LOG.info("SLI - registering node executor for node type " + nodeType);
             registerExecutor(nodeType, BUILTIN_NODES.get(nodeType));
         }
-        LOG.info("Done registerExecutors");
     }
 
     public void registerExecutor(String nodeName, AbstractSvcLogicNodeExecutor executor) {
         if (nodeExecutors == null) {
             nodeExecutors = new HashMap<>();
         }
-        LOG.info("SLI - registering executor for node type {}", nodeName);
         executor.setResolver(resolver);
         nodeExecutors.put(nodeName, executor);
     }
 
     public void unregisterExecutor(String nodeName) {
-        LOG.info("SLI - unregistering executor for node type {}", nodeName);
         nodeExecutors.remove(nodeName);
     }
 
@@ -137,9 +131,6 @@ public class SvcLogicServiceImplBase implements SvcLogicServiceBase {
         AbstractSvcLogicNodeExecutor executor = nodeExecutors.get(node.getNodeType());
 
         if (executor != null) {
-            LOG.debug("Executing node executor for node type {} - {}", node.getNodeType(),
-                    executor.getClass().getName());
-
     		MDC.put("nodeId", node.getNodeId() + " (" + node.getNodeType() + ")");
             return (executor.execute(this, node, ctx));
         } else {
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 730f272b..3b6151c9 100755
--- 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
@@ -128,7 +128,6 @@ public class MdsalHelper {
         }
         String simpleTypeName = fromObj.getClass().getTypeName();
         simpleTypeName = simpleTypeName.substring(simpleTypeName.lastIndexOf(".") + 1);
-        LOG.trace("Extracting properties from " + fromClass.getName() + " class");
         
         if (classHasSpecialHandling(simpleTypeName)) {
             try {
@@ -157,10 +156,6 @@ public class MdsalHelper {
                         + ".getValue() to Properties entry", e);
             }
         } else if (fromObj instanceof List) {
-
-            // Class is a List. List should contain yang-generated classes.
-            LOG.trace(fromClass.getName() + " is a List");
-
             List fromList = (List) fromObj;
 
             for (int i = 0; i < fromList.size(); i++) {
@@ -170,7 +165,6 @@ public class MdsalHelper {
 
         } else if (isYangGenerated(fromClass)) {
             // Class is yang generated.
-            LOG.trace(fromClass.getName() + " is a Yang-generated class");
 
             String propNamePfx = null;
 
@@ -261,10 +255,7 @@ public class MdsalHelper {
                                 Object retValue = m.invoke(fromObj);
 
                                 if (retValue instanceof byte[]) {
-                                    LOG.trace(m.getName() + " returns a byte[]");
                                     retValue = new String((byte[]) retValue, "UTF-8");
-                                    LOG.trace("Converted byte array " + propNamePfx + "." + fieldName + "to string "
-                                            + retValue);
                                 }
                                 if (!isAccessible) {
                                     m.setAccessible(isAccessible);
@@ -285,8 +276,6 @@ public class MdsalHelper {
                         }
                     } else if (returnType.equals(Class.class)) {
 
-                        LOG.trace(m.getName() + " returns a Class object - not interested");
-
                     } else if (List.class.isAssignableFrom(returnType)) {
 
                         // This getter method returns a list.
@@ -327,11 +316,7 @@ public class MdsalHelper {
 
                             if (propValObj != null) {
                                 if (propValObj instanceof byte[]) {
-                                    LOG.trace(m.getName() + " returns a byte[]");
                                     propVal = new String((byte[]) propValObj, "UTF-8");
-                                    LOG.trace("Converted byte array " + propNamePfx + "." + fieldName + "to string "
-                                            + propVal);
-
                                 } else {
                                     propVal = propValObj.toString();
                                 }
@@ -373,7 +358,6 @@ public class MdsalHelper {
             if (fromObj instanceof byte[]) {
                 try {
                     fromVal = new String((byte[]) fromObj, "UTF-8");
-                    LOG.trace("Converted byte array " + pfx + "to string " + fromVal);
                 } catch (Exception e) {
                     LOG.warn("Caught exception trying to convert " + pfx + " from byte[] to String", e);
                     fromVal = fromObj.toString();
@@ -399,8 +383,6 @@ public class MdsalHelper {
         int maxIdx = -1;
         boolean foundValue = false;
 
-        LOG.trace("Saving properties to List<" + elemType.getName() + ">  from " + pfx);
-
         if (props.containsKey(pfx + "_length")) {
             try {
                 int listLength = Integer.parseInt(props.getProperty(pfx + "_length"));
@@ -439,7 +421,6 @@ public class MdsalHelper {
             }
         }
 
-        LOG.trace(pfx + " has max index of " + maxIdx);
         for (int i = 0; i <= maxIdx; i++) {
 
             String curBase = pfx + "[" + i + "]";
@@ -501,8 +482,6 @@ public class MdsalHelper {
                         Method buildMethod = builderClass.getMethod("build");
                         builderObj = toBuilder(props, curBase, builderObj, true);
                         if (builderObj != null) {
-                            LOG.trace(
-                                    "Calling " + builderObj.getClass().getName() + "." + buildMethod.getName() + "()");
                             Object builtObj = buildMethod.invoke(builderObj);
                             toObj.add(builtObj);
                             foundValue = true;
@@ -544,14 +523,10 @@ public class MdsalHelper {
         Class toClass = toObj.getClass();
         boolean foundValue = false;
 
-        LOG.trace("Saving properties to " + toClass.getName() + " class from " + pfx);
-
         Ipv4Address addr;
 
         if (isYangGenerated(toClass)) {
             // Class is yang generated.
-            LOG.trace(toClass.getName() + " is a Yang-generated class");
-
             String propNamePfx = null;
             if (preservePfx) {
                 propNamePfx = pfx;
@@ -573,7 +548,6 @@ public class MdsalHelper {
             }
 
             if (toObj instanceof Identifier) {
-                LOG.trace(toClass.getName() + " is a Key - skipping");
                 return (toObj);
             }
 
@@ -592,12 +566,12 @@ public class MdsalHelper {
 
                     String paramValue = props.getProperty(propName);
                     if (paramValue == null) {
-                        LOG.trace(propName + " is unset");
+
                     } else if ("".equals(paramValue)) {
                         LOG.trace(propName + " was set to the empty string, setting it to null");
                         paramValue = null;
                     } else {
-                        LOG.trace(propName + " = " + paramValue);
+
                     }
 
                     // Is the return type a yang generated class?
@@ -605,7 +579,6 @@ public class MdsalHelper {
                         // Is it an enum?
                         if (paramClass.isEnum()) {
 
-                            LOG.trace(m.getName() + " expects an Enum");
                             // Param type is a typedef.
                             if ((paramValue != null) && (paramValue.length() > 0)) {
                                 Object paramObj = null;
@@ -623,8 +596,6 @@ public class MdsalHelper {
                                         m.setAccessible(true);
                                     }
 
-                                    LOG.trace("Calling " + toObj.getClass().getName() + "." + m.getName() + "("
-                                            + paramValue + ")");
                                     m.invoke(toObj, paramObj);
 
                                     if (!isAccessible) {
@@ -669,8 +640,7 @@ public class MdsalHelper {
                                         if (!isAccessible) {
                                             m.setAccessible(true);
                                         }
-                                        LOG.trace("Calling " + toObj.getClass().getName() + "." + m.getName() + "("
-                                                + paramValue + ")");
+
                                         m.invoke(toObj, paramValue);
                                         if (!isAccessible) {
                                             m.setAccessible(isAccessible);
@@ -727,8 +697,6 @@ public class MdsalHelper {
 
                                 Object constObj = null;
 
-                                LOG.trace(m.getName() + " expects a yang-generated class - looking for builder "
-                                        + builderName);
                                 try {
                                     builderClass = Class.forName(builderName);
                                     builderObj = builderClass.newInstance();
@@ -741,8 +709,7 @@ public class MdsalHelper {
                                             if (!isAccessible) {
                                                 m.setAccessible(true);
                                             }
-                                            LOG.trace("Calling " + toObj.getClass().getName() + "." + m.getName()
-                                                    + "(null)");
+
                                             m.invoke(toObj, new Object[] { null });
                                             if (!isAccessible) {
                                                 m.setAccessible(isAccessible);
@@ -826,8 +793,7 @@ public class MdsalHelper {
 
                                     try {
                                         Method buildMethod = builderClass.getMethod("build");
-                                        LOG.trace("Calling " + paramObj.getClass().getName() + "."
-                                                + buildMethod.getName() + "()");
+
                                         Object builtObj = buildMethod.invoke(paramObj);
 
                                         boolean isAccessible = m.isAccessible();
@@ -835,7 +801,6 @@ public class MdsalHelper {
                                             m.setAccessible(true);
                                         }
 
-                                        LOG.trace("Calling " + toObj.getClass().getName() + "." + m.getName() + "()");
                                         m.invoke(toObj, builtObj);
                                         if (!isAccessible) {
                                             m.setAccessible(isAccessible);
@@ -855,15 +820,9 @@ public class MdsalHelper {
                                         }
 
                                         if (constObj != null) {
-
-                                            LOG.trace("Calling " + toObj.getClass().getName() + "." + m.getName() + "("
-                                                    + constObj.toString() + ")");
                                             m.invoke(toObj, constObj);
                                         } else {
-                                            LOG.trace("Calling " + toObj.getClass().getName() + "." + m.getName() + "("
-                                                    + paramValue + ")");
                                             m.invoke(toObj, paramValue);
-
                                         }
                                         if (!isAccessible) {
                                             m.setAccessible(isAccessible);
@@ -883,9 +842,6 @@ public class MdsalHelper {
                         // if it is a List.
 
                         if (List.class.isAssignableFrom(paramClass)) {
-
-                            LOG.trace("Parameter class " + paramClass.getName() + " is a List");
-
                             // Figure out what type of args are in List and pass
                             // that to toList().
 
@@ -905,8 +861,6 @@ public class MdsalHelper {
                                     if (!isAccessible) {
                                         m.setAccessible(true);
                                     }
-                                    LOG.trace("Calling " + toObj.getClass().getName() + "." + m.getName() + "("
-                                            + paramValue + ")");
                                     m.invoke(toObj, paramObj);
                                     if (!isAccessible) {
                                         m.setAccessible(isAccessible);
@@ -922,10 +876,6 @@ public class MdsalHelper {
 
                             // Setter expects something that is not a List and
                             // not yang-generated. Just pass the parameter value
-
-                            LOG.trace("Parameter class " + paramClass.getName()
-                                    + " is not a yang-generated class or a List");
-
                             if ((paramValue != null) && (paramValue.length() > 0)) {
 
                                 Object constObj = null;
@@ -958,8 +908,6 @@ public class MdsalHelper {
 
                                     if (constObj != null) {
                                         try {
-                                            LOG.trace("Calling " + toObj.getClass().getName() + "." + m.getName() + "("
-                                                    + constObj + ")");
                                             m.invoke(toObj, constObj);
                                             foundValue = true;
                                         } catch (Exception e2) {
@@ -971,8 +919,6 @@ public class MdsalHelper {
                                             if (!isAccessible) {
                                                 m.setAccessible(true);
                                             }
-                                            LOG.trace("Calling " + toObj.getClass().getName() + "." + m.getName() + "("
-                                                    + paramValue + ")");
                                             m.invoke(toObj, paramValue);
                                             if (!isAccessible) {
                                                 m.setAccessible(isAccessible);
@@ -1022,21 +968,8 @@ public class MdsalHelper {
     public static void printPropertyList(PrintStream pstr, String pfx, Class toClass) {
         boolean foundValue = false;
 
-        LOG.trace("Analyzing " + toClass.getName() + " class : pfx " + pfx);
-
         if (isYangGenerated(toClass) && (!Identifier.class.isAssignableFrom(toClass))) {
             // Class is yang generated.
-            LOG.trace(toClass.getName() + " is a Yang-generated class");
-
-            if (toClass.getName().endsWith("Key")) {
-                if (Identifier.class.isAssignableFrom(toClass)) {
-                    LOG.trace(Identifier.class.getName() + " is assignable from " + toClass.getName());
-                } else {
-
-                    LOG.trace(Identifier.class.getName() + " is NOT assignable from " + toClass.getName());
-                }
-            }
-
             String propNamePfx = null;
             if (pfx.endsWith("]")) {
                 propNamePfx = pfx;
@@ -1061,9 +994,7 @@ public class MdsalHelper {
             // set
 
             for (Method m : toClass.getMethods()) {
-                LOG.trace("Is " + m.getName() + " method a getter?");
                 if (isGetter(m)) {
-                    LOG.trace(m.getName() + " is a getter");
                     Class returnClass = m.getReturnType();
 
                     String fieldName = toLowerHyphen(m.getName().substring(3));
@@ -1078,10 +1009,7 @@ public class MdsalHelper {
                     if (isYangGenerated(returnClass)) {
                         // Is it an enum?
                         if (returnClass.isEnum()) {
-
-                            LOG.trace(m.getName() + " is an Enum");
                             pstr.print("\n\n     * " + propName);
-
                         } else {
 
                             String simpleName = returnClass.getSimpleName();
@@ -1089,7 +1017,6 @@ public class MdsalHelper {
                             if (IPV4_ADDRESS.equals(simpleName) || IPV6_ADDRESS.equals(simpleName)
                                     || IP_ADDRESS.equals(simpleName) || IP_PREFIX.equals(simpleName)
                                     || "PortNumber".equals(simpleName) || "Dscp".equals(simpleName)) {
-                                LOG.trace(m.getName() + " is an " + simpleName);
                                 pstr.print("\n\n     * " + propName);
                             } else {
                                 printPropertyList(pstr, propNamePfx, returnClass);
@@ -1102,17 +1029,12 @@ public class MdsalHelper {
                         // if it is a List.
 
                         if (List.class.isAssignableFrom(returnClass)) {
-
-                            LOG.trace("Parameter class " + returnClass.getName() + " is a List");
-
                             // Figure out what type of args are in List and pass
                             // that to toList().
 
                             Type returnType = m.getGenericReturnType();
                             Type elementType = ((ParameterizedType) returnType).getActualTypeArguments()[0];
                             Class elementClass = (Class) elementType;
-                            LOG.trace("Calling printPropertyList on list type (" + elementClass.getName()
-                                    + "), pfx is (" + pfx + "), toClass is (" + toClass.getName() + ")");
                             printPropertyList(pstr,
                                     propNamePfx + "." + toLowerHyphen(elementClass.getSimpleName()) + "[]",
                                     elementClass);
@@ -1121,10 +1043,6 @@ public class MdsalHelper {
 
                             // Setter expects something that is not a List and
                             // not yang-generated. Just pass the parameter value
-
-                            LOG.trace("Parameter class " + returnClass.getName()
-                                    + " is not a yang-generated class or a List");
-
                             pstr.print("\n\n     * " + propName);
                         }
                     }
@@ -1243,7 +1161,6 @@ public class MdsalHelper {
 
         String retval = str.replaceAll(regex, replacement).toLowerCase();
 
-        LOG.trace("Converting " + inStr + " => " + str + " => " + retval);
         return (retval);
     }
 
diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/ITCaseSvcLogicGraphExecutor.java b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/ITCaseSvcLogicGraphExecutor.java
index 6d466bc7..6092d1fb 100644
--- a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/ITCaseSvcLogicGraphExecutor.java
+++ b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/ITCaseSvcLogicGraphExecutor.java
@@ -118,7 +118,6 @@ public class ITCaseSvcLogicGraphExecutor {
         SvcLogicServiceImpl svc = new SvcLogicServiceImpl(resourceProvider);
 
         for (String nodeType : BUILTIN_NODES.keySet()) {
-            LOG.info("SLI - registering node executor for node type " + nodeType);
             svc.registerExecutor(nodeType, BUILTIN_NODES.get(nodeType));
         }
 
@@ -171,7 +170,6 @@ public class ITCaseSvcLogicGraphExecutor {
             assertNotNull(store);
             for (String nodeType : BUILTIN_NODES.keySet()) {
 
-                LOG.info("SLI - registering node executor for node type {}", nodeType);
 
                 svc.registerExecutor(nodeType, BUILTIN_NODES.get(nodeType));