Refactor dblib

Changed openecomp references in dblib, filters and sli to onap.  Note: these
must be committed together to get a clean compile.

Issue: CCSDK-11
Change-Id: Ibe0f64fb20f3ae9cdda2f7ea969ca722bbde0d15
Signed-off-by: Dan Timoney <dtimoney@att.com>

9 files changed, 745 insertions, 0 deletions

diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/BadPlugin.java b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/BadPlugin.java
new file mode 100644
index 00000000..87273d0b
--- /dev/null
+++ b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/BadPlugin.java
@@ -0,0 +1,55 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK
+ * ================================================================================
+ * Copyright (C) 2017 ONAP
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.sli.core.sli.provider;
+
+import java.util.Map;
+
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import org.onap.ccsdk.sli.core.sli.SvcLogicException;
+import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
+
+
+public class BadPlugin implements SvcLogicJavaPlugin {
+    public String selectLunch(Map<String, String> parameters, SvcLogicContext ctx) throws SvcLogicException {
+        String day = parameters.get("day");
+        if (day == null || day.length() < 1) {
+            throw new SvcLogicException("What day is it?");
+        }
+        switch (day) {
+        case ("monday"): {
+            return "pizza";
+        }
+        case ("tuesday"): {
+            return "soup";
+        }
+        case ("wednesday"): {
+            return "salad";
+        }
+        case ("thursday"): {
+            return "sushi";
+        }
+        case ("friday"): {
+            return "bbq";
+        }
+        }
+        throw new SvcLogicException("Lunch cannot be served");
+    }
+}
diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/ExecuteNodeExecutorTest.java b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/ExecuteNodeExecutorTest.java
new file mode 100644
index 00000000..4c16222b
--- /dev/null
+++ b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/ExecuteNodeExecutorTest.java
@@ -0,0 +1,58 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK
+ * ================================================================================
+ * Copyright (C) 2017 ONAP
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.sli.core.sli.provider;
+
+import java.util.Map.Entry;
+
+import org.onap.ccsdk.sli.core.sli.DuplicateValueException;
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import org.onap.ccsdk.sli.core.sli.SvcLogicException;
+import org.onap.ccsdk.sli.core.sli.SvcLogicExpression;
+import org.onap.ccsdk.sli.core.sli.SvcLogicGraph;
+import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
+import org.onap.ccsdk.sli.core.sli.SvcLogicNode;
+import org.onap.ccsdk.sli.core.sli.provider.ExecuteNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.SvcLogicServiceImpl;
+
+import junit.framework.TestCase;
+
+public class ExecuteNodeExecutorTest extends TestCase {
+    public class MockExecuteNodeExecutor extends ExecuteNodeExecutor {
+
+        protected SvcLogicJavaPlugin getSvcLogicJavaPlugin(String pluginName) {
+            return (SvcLogicJavaPlugin) new LunchSelectorPlugin();
+        }
+
+        protected String evaluate(SvcLogicExpression expr, SvcLogicNode node,
+                SvcLogicContext ctx) throws SvcLogicException {
+            return "selectLunch";
+        }
+    }
+
+    public void testBadPlugin() throws DuplicateValueException, SvcLogicException {
+        LunchSelectorPlugin p = new LunchSelectorPlugin();
+        MockExecuteNodeExecutor execute = new MockExecuteNodeExecutor();
+        SvcLogicNode node = new SvcLogicNode(0, "", "", new SvcLogicGraph());
+        node.setAttribute("method", "selectLunch");
+        execute.execute(new SvcLogicServiceImpl(), new SvcLogicNode(0, "", "", new SvcLogicGraph()), new SvcLogicContext());
+    }
+
+}
diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/LunchSelectorPlugin.java b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/LunchSelectorPlugin.java
new file mode 100644
index 00000000..4d6b0b4d
--- /dev/null
+++ b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/LunchSelectorPlugin.java
@@ -0,0 +1,77 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK
+ * ================================================================================
+ * Copyright (C) 2017 ONAP
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.sli.core.sli.provider;
+
+import java.util.Map;
+
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import org.onap.ccsdk.sli.core.sli.SvcLogicException;
+import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
+
+
+
+public class LunchSelectorPlugin implements SvcLogicJavaPlugin {
+    public class UnknownLunchDayException extends Exception{
+
+        public UnknownLunchDayException(String string) {
+            super(string);
+        }
+
+    }
+    class Sandwhich {
+        String meat;
+        String cheese;
+
+        public Sandwhich(String meat, String cheese) {
+            this.meat = meat;
+            this.cheese = cheese;
+        }
+    }
+
+    public String selectLunch(Map<String, String> parameters, SvcLogicContext ctx) throws Exception {
+        String day = parameters.get("day");
+        if (day == null || day.length() < 1) {
+            throw new UnknownLunchDayException("What day is it?");
+        }
+        switch (day) {
+        case ("monday"): {
+            return "pizza";
+        }
+        case ("tuesday"): {
+            return "soup";
+        }
+        case ("wednesday"): {
+            return "salad";
+        }
+        case ("thursday"): {
+            return "sushi";
+        }
+        case ("friday"): {
+            return "bbq";
+        }
+        }
+        throw new SvcLogicException("Lunch cannot be served");
+    }
+
+    public Sandwhich makeLunch(Map<String, String> parameters, SvcLogicContext ctx) throws SvcLogicException {
+        return new Sandwhich("ham", "american");
+    }
+}
diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java
new file mode 100644
index 00000000..8057dbd1
--- /dev/null
+++ b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java
@@ -0,0 +1,42 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK
+ * ================================================================================
+ * Copyright (C) 2017 ONAP
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.sli.core.sli.provider;
+
+import junit.framework.TestCase;
+
+public class MdsalHelperTest extends TestCase {
+
+    public static final String pathToSdnPropertiesFile = "./src/test/resources/l3sdn.properties";
+
+    public void testSdnProperties() {
+        MdsalHelperTesterUtil.loadProperties(pathToSdnPropertiesFile);
+        assertEquals("synccomplete", MdsalHelperTesterUtil.mapEnumeratedValue("request-status", "Synccomplete"));
+        assertEquals("asynccomplete", MdsalHelperTesterUtil.mapEnumeratedValue("request-status", "asynccomplete"));
+        assertEquals("notifycomplete", MdsalHelperTesterUtil.mapEnumeratedValue("request-status", "notifycomplete"));
+        assertEquals("service-configuration-operation", MdsalHelperTesterUtil.mapEnumeratedValue("rpc-name",
+                "ServiceConfigurationOperation"));
+    }
+
+    public void testNegativeSdnProperties() {
+        assertNotSame("synccomplete", MdsalHelperTesterUtil.mapEnumeratedValue("request-status", "Synccomplete"));
+    }
+
+}
diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTesterUtil.java b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTesterUtil.java
new file mode 100644
index 00000000..75517a1e
--- /dev/null
+++ b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTesterUtil.java
@@ -0,0 +1,36 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK
+ * ================================================================================
+ * Copyright (C) 2017 ONAP
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.sli.core.sli.provider;
+
+import org.onap.ccsdk.sli.core.sli.provider.MdsalHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MdsalHelperTesterUtil extends MdsalHelper {
+
+    private static final Logger LOG = LoggerFactory.getLogger(MdsalHelperTesterUtil.class);
+    
+    //Normally static init of classes goes here for some weird classloader thing
+    static {
+        String str = "Hello World!";
+    }
+
+}
diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/PluginTest.java b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/PluginTest.java
new file mode 100644
index 00000000..08ab5eeb
--- /dev/null
+++ b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/PluginTest.java
@@ -0,0 +1,107 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK
+ * ================================================================================
+ * Copyright (C) 2017 ONAP
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.sli.core.sli.provider;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import org.onap.ccsdk.sli.core.sli.SvcLogicGraph;
+import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
+import org.onap.ccsdk.sli.core.sli.SvcLogicNode;
+import org.onap.ccsdk.sli.core.sli.provider.ExecuteNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.SvcLogicExpressionResolver;
+
+import junit.framework.TestCase;
+
+public class PluginTest extends TestCase {
+
+    // The existing plugins work just like a VoidDummyPlugin
+    // They will return null simply because they are all void
+    // The attribute emitsOutcome will not be present, the expected outcome is success when no exception is thrown by the plugin
+    public void testOldPlugin() throws Exception {
+        ExecuteNodeExecutor executor = new ExecuteNodeExecutor();
+        SvcLogicJavaPlugin plugin = new VoidDummyPlugin();
+
+        Class pluginClass = plugin.getClass();
+        Method pluginMethod = pluginClass.getMethod("dummy", Map.class, SvcLogicContext.class);
+        Map<String, String> parmMap = new HashMap<String, String>();
+        SvcLogicContext ctx = new SvcLogicContext();
+        Object o = pluginMethod.invoke(plugin, parmMap, ctx);
+
+        SvcLogicGraph graph = new SvcLogicGraph();
+        SvcLogicNode node = new SvcLogicNode(1, "return", graph);
+        String emitsOutcome = SvcLogicExpressionResolver.evaluate(node.getAttribute("emitsOutcome"),  node, ctx);
+        String outValue = executor.mapOutcome(o, emitsOutcome);
+        assertEquals("success",outValue);
+    }
+
+    //Newer plugins can set the attribute emitsOutcome to true, if so they should return a string
+    //The string represents the outcome value
+    public void testNewPlugin() throws Exception {
+        ExecuteNodeExecutor executor = new ExecuteNodeExecutor();
+        SvcLogicJavaPlugin plugin = new LunchSelectorPlugin();
+
+        Class pluginClass = plugin.getClass();
+        Method pluginMethod = pluginClass.getMethod("selectLunch", Map.class, SvcLogicContext.class);
+
+        Map<String, String> parmMap = new HashMap<String, String>();
+        SvcLogicContext ctx = new SvcLogicContext();
+
+        parmMap.put("day", "monday");
+        Object o = pluginMethod.invoke(plugin, parmMap, ctx);
+        SvcLogicGraph graph = new SvcLogicGraph();
+        SvcLogicNode node = new SvcLogicNode(1, "return", graph);
+        node.setAttribute("emitsOutcome", "true");
+        String emitsOutcome = SvcLogicExpressionResolver.evaluate(node.getAttribute("emitsOutcome"),  node, ctx);
+        String outValue = executor.mapOutcome(o, emitsOutcome);
+        assertEquals("pizza", outValue);
+
+        parmMap.put("day", "tuesday");
+        outValue = (String) pluginMethod.invoke(plugin, parmMap, ctx);
+        o = pluginMethod.invoke(plugin, parmMap, ctx);
+        outValue = executor.mapOutcome(o, emitsOutcome);
+        assertEquals("soup",outValue);
+
+    }
+
+    //APPC had some legacy plugins returning objects which should not be treated as outcomes
+    //The attribute emitsOutcome will not be set
+    //The outcome should be success as it has always been
+    public void testObjPlugin() throws Exception{
+        ExecuteNodeExecutor executor = new ExecuteNodeExecutor();
+        SvcLogicJavaPlugin plugin = new LunchSelectorPlugin();
+
+        Class pluginClass = plugin.getClass();
+        Method pluginMethod = pluginClass.getMethod("makeLunch", Map.class, SvcLogicContext.class);
+
+        Map<String, String> parmMap = new HashMap<String, String>();
+        SvcLogicContext ctx = new SvcLogicContext();
+        Object o = pluginMethod.invoke(plugin, parmMap, ctx);
+        SvcLogicGraph graph = new SvcLogicGraph();
+        SvcLogicNode node = new SvcLogicNode(1, "return", graph);
+        String emitsOutcome = SvcLogicExpressionResolver.evaluate(node.getAttribute("emitsOutcome"),  node, ctx);
+        String outValue = executor.mapOutcome(o, emitsOutcome);
+        assertEquals("success",outValue);
+    }
+
+}
diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicExpressionResolverTest.java b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicExpressionResolverTest.java
new file mode 100644
index 00000000..1705e790
--- /dev/null
+++ b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicExpressionResolverTest.java
@@ -0,0 +1,122 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK
+ * ================================================================================
+ * Copyright (C) 2017 ONAP
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.sli.core.sli.provider;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import org.onap.ccsdk.sli.core.sli.SvcLogicExprListener;
+import org.onap.ccsdk.sli.core.sli.SvcLogicExpression;
+import org.onap.ccsdk.sli.core.sli.SvcLogicExpressionFactory;
+import org.onap.ccsdk.sli.core.sli.SvcLogicGraph;
+import org.onap.ccsdk.sli.core.sli.SvcLogicNode;
+import org.onap.ccsdk.sli.core.sli.provider.SvcLogicExpressionResolver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+public class SvcLogicExpressionResolverTest extends TestCase {
+	
+
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SvcLogicExpressionResolver.class);
+	
+	public void testEvaluate()
+	{
+		InputStream testStr = getClass().getResourceAsStream("/expression.tests");
+		BufferedReader testsReader = new BufferedReader(new InputStreamReader(testStr));
+		
+		try
+		{
+			SvcLogicContext ctx = new SvcLogicContext();
+			SvcLogicGraph graph = new SvcLogicGraph();
+			SvcLogicNode node = new SvcLogicNode(1, "return", graph);
+			graph.setRootNode(node);
+
+			String line = null;
+			int lineNo = 0;
+			while ((line = testsReader.readLine()) != null) {
+				++lineNo;
+				if (line.startsWith("#"))
+				{
+					String testExpr = line.trim().substring(1).trim();
+					String[] nameValue = testExpr.split("=");
+					String name = nameValue[0].trim();
+					String value = nameValue[1].trim();
+
+					if (name.startsWith("$"))
+					{
+						LOG.info("Setting context attribute "+name+" = "+value);
+						ctx.setAttribute(name.substring(1), value);
+					}
+					else
+					{
+
+						LOG.info("Setting node attribute "+name+" = "+value);
+						node.setAttribute(name, value);
+						
+					}
+				}
+				else
+				{
+					// if the line contains #, what comes before is the expression to evaluate, and what comes after
+					// is the expected value
+					String[] substrings = line.split("#");
+					String expectedValue = substrings.length > 1 ? substrings[1].trim() : null;
+					String testExpr = substrings[0].trim();
+
+					LOG.info("Parsing expression "+testExpr);
+					SvcLogicExpression expr = SvcLogicExpressionFactory.parse(testExpr);
+					if (expr == null)
+					{
+						fail("Unable to parse expression "+testExpr);
+					}
+					else
+					{
+						LOG.info("Evaluating parsed expression "+expr.asParsedExpr());
+						String exprValue = SvcLogicExpressionResolver.evaluate(expr,  node, ctx);
+						if (exprValue == null)
+						{
+							fail("Unable to evaluate expression "+testExpr);
+						}
+						else
+						{
+							LOG.info("Expression " + testExpr + " evaluates to " + exprValue);
+							if (expectedValue != null) {
+								Assert.assertEquals("Line " + lineNo + ": " + testExpr, expectedValue, exprValue);
+							}
+						}
+					}
+				}
+			}
+		}
+		catch (Exception e)
+		{
+			LOG.error("Caught exception", e);
+			fail("Caught exception");
+		}
+	}
+
+}
diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicGraphExecutorTest.java b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicGraphExecutorTest.java
new file mode 100644
index 00000000..b54f2846
--- /dev/null
+++ b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicGraphExecutorTest.java
@@ -0,0 +1,211 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK
+ * ================================================================================
+ * Copyright (C) 2017 ONAP
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.sli.core.sli.provider;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Properties;
+
+import org.onap.ccsdk.sli.core.sli.MetricLogger;
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import org.onap.ccsdk.sli.core.sli.SvcLogicGraph;
+import org.onap.ccsdk.sli.core.sli.SvcLogicNode;
+import org.onap.ccsdk.sli.core.sli.SvcLogicParser;
+import org.onap.ccsdk.sli.core.sli.SvcLogicStore;
+import org.onap.ccsdk.sli.core.sli.SvcLogicStoreFactory;
+import org.onap.ccsdk.sli.core.sli.provider.BlockNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.CallNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.ConfigureNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.DeleteNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.ExecuteNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.ExistsNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.ForNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.GetResourceNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.IsAvailableNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.NotifyNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.RecordNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.ReleaseNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.ReserveNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.ReturnNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.SaveNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.SetNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.SvcLogicNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.SvcLogicServiceImpl;
+import org.onap.ccsdk.sli.core.sli.provider.SwitchNodeExecutor;
+import org.onap.ccsdk.sli.core.sli.provider.UpdateNodeExecutor;
+import org.osgi.framework.ServiceRegistration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import junit.framework.TestCase;
+
+public class SvcLogicGraphExecutorTest extends TestCase {
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SvcLogicGraph.class);
+	
+	private static final Map<String, SvcLogicNodeExecutor> BUILTIN_NODES = new HashMap<String, SvcLogicNodeExecutor>() {
+		{
+			put("block", new BlockNodeExecutor());
+			put("call", new CallNodeExecutor());
+			put("configure", new ConfigureNodeExecutor());
+			put("delete", new DeleteNodeExecutor());
+			put("execute", new ExecuteNodeExecutor());
+			put("exists", new ExistsNodeExecutor());
+			put("for", new ForNodeExecutor());
+			put("get-resource", new GetResourceNodeExecutor());
+			put("is-available", new IsAvailableNodeExecutor());
+			put("notify", new NotifyNodeExecutor());
+			put("record", new RecordNodeExecutor());
+			put("release", new ReleaseNodeExecutor());
+			put("reserve", new ReserveNodeExecutor());
+			put("return", new ReturnNodeExecutor());
+			put("save", new SaveNodeExecutor());
+			put("set", new SetNodeExecutor());
+			put("switch", new SwitchNodeExecutor());
+			put("update", new UpdateNodeExecutor());
+
+		}
+	};
+	
+	public void testExecute() {
+		
+		try {
+			InputStream testStr = getClass().getResourceAsStream("/executor.tests");
+			BufferedReader testsReader = new BufferedReader(new InputStreamReader(testStr));
+			
+			InputStream propStr = getClass().getResourceAsStream("/svclogic.properties");
+			
+			SvcLogicStore store = SvcLogicStoreFactory.getSvcLogicStore(propStr);
+			
+			assertNotNull(store);
+			
+			store.registerNodeType("switch");
+			store.registerNodeType("block");
+			store.registerNodeType("get-resource");
+			store.registerNodeType("reserve");
+			store.registerNodeType("is-available");
+			store.registerNodeType("exists");
+			store.registerNodeType("configure");
+			store.registerNodeType("return");
+			store.registerNodeType("record");
+			store.registerNodeType("allocate");
+			store.registerNodeType("release");
+			store.registerNodeType("for");
+			store.registerNodeType("set");
+			SvcLogicParser parser = new SvcLogicParser(store);
+			
+			// Loop through executor tests
+
+			SvcLogicServiceImpl svc = new SvcLogicServiceImpl();
+			
+			for (String nodeType : BUILTIN_NODES.keySet()) {
+
+				LOG.info("SLI - registering node executor for node type "+nodeType);
+				
+				svc.registerExecutor(nodeType, BUILTIN_NODES.get(nodeType));
+
+			}
+			String testCaseLine = null;
+			while ((testCaseLine = testsReader.readLine()) != null) {
+				
+				String[] testCaseFields = testCaseLine.split(":");
+				String testCaseFile = testCaseFields[0];
+				String testCaseMethod = testCaseFields[1];
+				String testCaseParameters = null;
+				
+				if (testCaseFields.length > 2) {
+					testCaseParameters = testCaseFields[2];
+				}
+
+				SvcLogicContext ctx = new SvcLogicContext();
+				if (testCaseParameters != null) {
+					String[] testCaseParameterSettings = testCaseParameters.split(",");
+					
+					for (int i = 0 ; i < testCaseParameterSettings.length ; i++) {
+						String[] nameValue = testCaseParameterSettings[i].split("=");
+						if (nameValue != null) {
+							String name = nameValue[0];
+							String value = "";
+							if (nameValue.length > 1) {
+								value = nameValue[1];
+							}
+							
+							ctx.setAttribute(name,  value);
+						}
+					}
+				}
+				
+				testCaseFile = testCaseFile.trim();
+				
+				if (testCaseFile.length() > 0) {
+					if (!testCaseFile.startsWith("/")) {
+						testCaseFile = "/"+testCaseFile;
+					}
+					URL testCaseUrl = getClass().getResource(testCaseFile);
+					if (testCaseUrl == null) {
+						fail("Could not resolve test case file "+testCaseFile);
+					}
+					
+					LinkedList<SvcLogicGraph> graphs = parser.parse(testCaseUrl.getPath());
+					
+
+					assertNotNull(graphs);
+					
+					for (SvcLogicGraph graph: graphs) {
+						if (graph.getRpc().equals(testCaseMethod)) {
+							Properties props = ctx.toProperties();
+							LOG.info("SvcLogicContext before executing "+testCaseMethod+":");
+							for (Enumeration e1 = props.propertyNames(); e1.hasMoreElements() ; ) {
+								String propName = (String) e1.nextElement();
+								LOG.info(propName+" = "+props.getProperty(propName));
+							}
+							
+							svc.execute(graph, ctx);
+							
+							props = ctx.toProperties();
+							LOG.info("SvcLogicContext after executing "+testCaseMethod+":");
+							for (Enumeration e2 = props.propertyNames(); e2.hasMoreElements() ; ) {
+								String propName = (String) e2.nextElement();
+								LOG.info(propName+" = "+props.getProperty(propName));
+							}
+						}
+					}
+
+				}
+				
+				
+			}
+			
+			
+		} catch (Exception e) {
+			LOG.error("Caught exception executing directed graphs", e);
+			fail("Exception executing graphs");
+		}
+	}
+
+	
+}
diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/VoidDummyPlugin.java b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/VoidDummyPlugin.java
new file mode 100644
index 00000000..7c6eee9a
--- /dev/null
+++ b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/VoidDummyPlugin.java
@@ -0,0 +1,37 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK
+ * ================================================================================
+ * Copyright (C) 2017 ONAP
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.sli.core.sli.provider;
+
+import java.util.Map;
+
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import org.onap.ccsdk.sli.core.sli.SvcLogicException;
+import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
+
+
+
+public class VoidDummyPlugin implements SvcLogicJavaPlugin {
+
+    public void dummy(Map<String, String> parameters, SvcLogicContext ctx) throws SvcLogicException {
+        return;
+    }
+
+}