Merge "callnode handling updates"

3 files changed, 37 insertions, 33 deletions

diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/CallNodeExecutor.java b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/CallNodeExecutor.java
index 6036c38ac..c8e6548fd 100644..100755
--- a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/CallNodeExecutor.java
+++ b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/CallNodeExecutor.java
@@ -118,16 +118,18 @@ public class CallNodeExecutor extends SvcLogicNodeExecutor {
         ctx.setAttribute("parentGraph", parentGraph);
 
 		SvcLogicStore store = svc.getStore();
-
-        if (store != null) {
+		String errorMessage = "Parent " + parentGraph + " failed to call child [" + module + "," + rpc + "," + version + "," + mode + "] because the graph could not be found";
+		boolean graphWasCalled = false;
+		if (store != null) {
             SvcLogicGraph calledGraph = store.fetch(module, rpc, version, mode);
             if (calledGraph != null) {
                 LOG.debug("Parent " + parentGraph + " is calling child " + calledGraph.toString());
                 ctx.setAttribute("currentGraph", calledGraph.toString());
                 svc.execute(calledGraph, ctx);
                 outValue = ctx.getStatus();
+                graphWasCalled = true;
             } else {
-                LOG.debug("Parent " + parentGraph + " failed to call child [" + module + "," + rpc + "," + version + "," + mode + "] because the graph could not be found");
+                LOG.debug(errorMessage);
             }
         } else {
             LOG.debug("Could not get SvcLogicStore reference");
@@ -152,7 +154,18 @@ public class CallNodeExecutor extends SvcLogicNodeExecutor {
 				LOG.debug("no " + outValue + " or Other branch found");
 			}
 		}
-        ctx.setAttribute("currentGraph", parentGraph);
+		
+		if (graphWasCalled == false) {
+			if (node.getOutcomeValue("catch") != null) {
+				nextNode = node.getOutcomeValue("catch");
+				LOG.debug("graph could not be called, but catch node was found and will be executed");
+			} else {
+				LOG.debug("graph could not be called and no catch node was found, throwing exception");
+				throw new SvcLogicException(errorMessage);
+			}
+		}
+
+		ctx.setAttribute("currentGraph", parentGraph);
         ctx.setAttribute("parentGraph", null);
 
 		return (nextNode);
diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java
index 0a2869580..dd7139a7b 100755
--- a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java
+++ b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java
@@ -185,28 +185,7 @@ public class SvcLogicServiceImpl implements SvcLogicService {
                     executor.getClass().getName());
             return (executor.execute(this, node, ctx));
         } else {
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("{} node not implemented", node.getNodeType());
-            }
-            SvcLogicNode nextNode = node.getOutcomeValue("failure");
-            if (nextNode != null) {
-                if (LOG.isDebugEnabled()) {
-                    LOG.debug("about to execute failure branch");
-                }
-                return (nextNode);
-            }
-
-            nextNode = node.getOutcomeValue("Other");
-            if (nextNode != null) {
-                if (LOG.isDebugEnabled()) {
-                    LOG.debug("about to execute Other branch");
-                }
-            } else {
-                if (LOG.isDebugEnabled()) {
-                    LOG.debug("no failure or Other branch found");
-                }
-            }
-            return (nextNode);
+            throw new SvcLogicException("Attempted to execute a node of type " + node.getNodeType() + ", but no executor was registered for this type");
         }
     }
 
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 d8698860f..445df36f6 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
@@ -136,19 +136,21 @@ public class ITCaseSvcLogicGraphExecutor {
             Properties svcprops = new Properties();
             svcprops.load(propStr);
 
-            SvcLogicStore store = SvcLogicStoreFactory.getSvcLogicStore(svcprops);
 
 
-            assertNotNull(store);
-
 
             SvcLogicParser parser = new SvcLogicParser();
 
             // Loop through executor tests
-            SvcLogicPropertiesProvider resourceProvider = new SvcLogicPropertiesProviderImpl();
-
+            SvcLogicPropertiesProvider resourceProvider = new SvcLogicPropertiesProvider() {
+                @Override
+                public Properties getProperties() {
+                    return svcprops;
+                }
+            };
             SvcLogicServiceImpl svc = new SvcLogicServiceImpl(resourceProvider);
-
+            SvcLogicStore store = svc.getStore();
+            assertNotNull(store);
             for (String nodeType : BUILTIN_NODES.keySet()) {
 
                 LOG.info("SLI - registering node executor for node type {}", nodeType);
@@ -203,7 +205,17 @@ public class ITCaseSvcLogicGraphExecutor {
                     assertNotNull(graphs);
 
                     // Load grqphs into db to support call node
-                    parser.load(testCaseUrl.getPath(), store);
+                    SvcLogicParser.load(testCaseUrl.getPath(), store);
+                    SvcLogicParser.activate("neutron", "canCreateNetwork", "1.0.0", "sync", store);
+                    SvcLogicParser.activate("neutron", "switchTester", "1.0.0", "sync", store);
+                    SvcLogicParser.activate("neutron", "forRecordTester", "1.0.0", "sync", store);
+                    SvcLogicParser.activate("neutron", "whileNodeTester", "1.0.0", "sync", store);
+                    SvcLogicParser.activate("neutron", "resourceTester", "1.0.0", "sync", store);
+                    SvcLogicParser.activate("neutron", "configureTester", "1.0.0", "sync", store);
+                    SvcLogicParser.activate("neutron", "javaPluginTester", "1.0.0", "sync", store);
+                    SvcLogicParser.activate("neutron", "allNodesTester", "1.0.0", "sync", store);
+                    SvcLogicParser.activate("neutron", "networkCreated", "1.0.0", "sync", store);
+
                     for (SvcLogicGraph graph : graphs) {
                         if (graph.getRpc().equals(testCaseMethod)) {
                             Properties props = ctx.toProperties();