Platform Hardening for DG - Part 8

Issue-ID: APPC-305
Change-Id: I70fa76837b02314bdd3211190306cfbd3564d639
Signed-off-by: Skip Wonnell <skip@att.com>

2 files changed, 84 insertions, 69 deletions

diff --git a/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockSvcLogicDblibStore.java b/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockSvcLogicDblibStore.java
index f3c10725e..d0964299b 100644
--- a/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockSvcLogicDblibStore.java
+++ b/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockSvcLogicDblibStore.java
@@ -59,19 +59,18 @@ public class MockSvcLogicDblibStore implements SvcLogicStore {
 
     }
 
-    @Override
+
     public void registerNodeType(String nodeType) throws SvcLogicException {
         // TODO Auto-generated method stub
 
     }
 
-    @Override
     public void unregisterNodeType(String nodeType) throws SvcLogicException {
         // TODO Auto-generated method stub
 
     }
 
-    @Override
+
     public boolean isValidNodeType(String nodeType) throws SvcLogicException {
         // TODO Auto-generated method stub
         return true;
@@ -81,12 +80,14 @@ public class MockSvcLogicDblibStore implements SvcLogicStore {
     public void delete(String module, String rpc, String version, String mode)
             throws SvcLogicException {
         // TODO Auto-generated method stub
-
     }
 
     @Override
     public void activate(SvcLogicGraph graph) throws SvcLogicException {
         // TODO Auto-generated method stub
-
+    }
+    public void activate(String module, String rpc, String version, String mode)
+            throws SvcLogicException {
+        // TODO Auto-generated method stub
     }
 }
diff --git a/appc-directed-graph/dg-loader/provider/src/test/resources/json/Appc_UniTest.json b/appc-directed-graph/dg-loader/provider/src/test/resources/json/Appc_UniTest.json
index b56c8f64c..c6e82fc99 100644
--- a/appc-directed-graph/dg-loader/provider/src/test/resources/json/Appc_UniTest.json
+++ b/appc-directed-graph/dg-loader/provider/src/test/resources/json/Appc_UniTest.json
@@ -1,64 +1,78 @@
-[{

-  "id": "1606180e.6254c",

-  "type": "dgstart",

-  "name": "DGSTART",

-  "outputs": 1,

-  "x": 494.75,

-  "y": 149.75,

-  "z": "7174441c.9fb7f4",

-  "wires": [

-    ["f650067e.2ad7e"]

-  ]

-}, {

-  "id": "f650067e.2ad7e",

-  "type": "service-logic",

-  "name": "Appc 4.0.0",

-  "module": "Appc",

-  "version": "4.0.0",

-  "comments": "",

-  "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='Appc' version='4.0.0'>",

-  "outputs": 1,

-  "x": 642.75,

-  "y": 151.75,

-  "z": "7174441c.9fb7f4",

-  "wires": [

-    ["10b2117c.ee118f"]

-  ]

-}, {

-  "id": "e928ee64.3762c",

-  "type": "block",

-  "name": "block",

-  "xml": "<block>\n",

-  "atomic": "false",

-  "comments": "",

-  "outputs": 1,

-  "x": 952.75,

-  "y": 145.75,

-  "z": "7174441c.9fb7f4",

-  "wires": [

-    ["342ce050.4a2fe8"]

-  ]

-}, {

-  "id": "342ce050.4a2fe8",

-  "type": "returnSuccess",

-  "name": "return success",

-  "xml": "<return status='success'>\n\n",

-  "comments": "",

-  "x": 1115.75,

-  "y": 146.75,

-  "z": "7174441c.9fb7f4",

-  "wires": []

-}, {

-  "id": "10b2117c.ee118f",

-  "type": "method",

-  "name": "unitTest",

-  "xml": "<method rpc='unitTestDG' mode='sync'>\n",

-  "comments": "",

-  "outputs": 1,

-  "x": 815.75,

-  "y": 147.75,

-  "z": "7174441c.9fb7f4",

-  "wires": [

-    ["e928ee64.3762c"]

-  ]

-}]

+[

+    {

+        "id": "1606180e.6254c",

+        "type": "dgstart",

+        "name": "DGSTART",

+        "outputs": 1,

+        "x": 494.75,

+        "y": 149.75,

+        "z": "7174441c.9fb7f4",

+        "wires": [

+            [

+                "f650067e.2ad7e"

+            ]

+        ]

+    },

+    {

+        "id": "f650067e.2ad7e",

+        "type": "service-logic",

+        "name": "Appc 4.0.0",

+        "module": "Appc",

+        "version": "4.0.0",

+        "comments": "",

+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='Appc' version='4.0.0'>",

+        "outputs": 1,

+        "x": 642.75,

+        "y": 151.75,

+        "z": "7174441c.9fb7f4",

+        "wires": [

+            [

+                "10b2117c.ee118f"

+            ]

+        ]

+    },

+    {

+        "id": "e928ee64.3762c",

+        "type": "block",

+        "name": "block",

+        "xml": "<block>\n",

+        "atomic": "false",

+        "comments": "",

+        "outputs": 1,

+        "x": 952.75,

+        "y": 145.75,

+        "z": "7174441c.9fb7f4",

+        "wires": [

+            [

+                "342ce050.4a2fe8"

+            ]

+        ]

+    },

+    {

+        "id": "342ce050.4a2fe8",

+        "type": "returnSuccess",

+        "name": "return success",

+        "xml": "<return status='success'>\n\n",

+        "comments": "",

+        "x": 1115.75,

+        "y": 146.75,

+        "z": "7174441c.9fb7f4",

+        "wires": []

+    },

+    {

+        "id": "10b2117c.ee118f",

+        "type": "method",

+        "name": "unitTest",

+        "xml": "<method rpc='unitTestDG' mode='sync'>\n",

+        "comments": "",

+        "outputs": 1,

+        "x": 815.75,

+        "y": 147.75,

+        "z": "7174441c.9fb7f4",

+        "wires": [

+            [

+                "e928ee64.3762c"

+            ]

+        ]

+    }

+]