diff options
Diffstat (limited to 'appc-directed-graph/dg-loader')
12 files changed, 93 insertions, 30 deletions
diff --git a/appc-directed-graph/dg-loader/provider/pom.xml b/appc-directed-graph/dg-loader/provider/pom.xml index c074ca6d8..65be0dc53 100644 --- a/appc-directed-graph/dg-loader/provider/pom.xml +++ b/appc-directed-graph/dg-loader/provider/pom.xml @@ -36,7 +36,7 @@ <dependencies> <dependency> - <groupId>org.openecomp.sdnc.core</groupId> + <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> <version>${sdnctl.sli.version}</version> <scope>compile</scope> @@ -75,7 +75,7 @@ <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-api-mockito</artifactId> - <version>1.6.2</version> + <version>1.6.4</version> <scope>test</scope> </dependency> <dependency> diff --git a/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLActivate.java b/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLActivate.java index ac3f6392b..6af447742 100644 --- a/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLActivate.java +++ b/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLActivate.java @@ -30,9 +30,9 @@ import java.util.List; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; -import org.openecomp.sdnc.sli.SvcLogicGraph; -import org.openecomp.sdnc.sli.SvcLogicStore; -import org.openecomp.sdnc.sli.SvcLogicStoreFactory; +import org.onap.ccsdk.sli.core.sli.SvcLogicGraph; +import org.onap.ccsdk.sli.core.sli.SvcLogicStore; +import org.onap.ccsdk.sli.core.sli.SvcLogicStoreFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoad.java b/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoad.java index 13e5e293f..1b6116cc3 100644 --- a/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoad.java +++ b/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoad.java @@ -33,10 +33,10 @@ import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.SvcLogicParser; -import org.openecomp.sdnc.sli.SvcLogicStore; -import org.openecomp.sdnc.sli.SvcLogicStoreFactory; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicParser; +import org.onap.ccsdk.sli.core.sli.SvcLogicStore; +import org.onap.ccsdk.sli.core.sli.SvcLogicStoreFactory; public class DGXMLLoad { private final static Logger logger = LoggerFactory.getLogger(DGXMLLoad.class); diff --git a/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoadNActivate.java b/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoadNActivate.java index ae7156cc2..d07621681 100644 --- a/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoadNActivate.java +++ b/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoadNActivate.java @@ -33,11 +33,11 @@ import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.SvcLogicGraph; -import org.openecomp.sdnc.sli.SvcLogicParser; -import org.openecomp.sdnc.sli.SvcLogicStore; -import org.openecomp.sdnc.sli.SvcLogicStoreFactory; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicGraph; +import org.onap.ccsdk.sli.core.sli.SvcLogicParser; +import org.onap.ccsdk.sli.core.sli.SvcLogicStore; +import org.onap.ccsdk.sli.core.sli.SvcLogicStoreFactory; public class DGXMLLoadNActivate { private final static Logger logger = LoggerFactory.getLogger(DGXMLLoadNActivate.class); diff --git a/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/DGLoaderTest.java b/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/DGLoaderTest.java index fea884ca7..084929bc7 100644 --- a/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/DGLoaderTest.java +++ b/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/DGLoaderTest.java @@ -37,10 +37,10 @@ import org.eclipse.osgi.framework.internal.core.BundleHost; import org.junit.Rule; import org.junit.Test; import org.mockito.Mockito; -import org.openecomp.sdnc.sli.ConfigurationException; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.SvcLogicStore; -import org.openecomp.sdnc.sli.SvcLogicStoreFactory; +import org.onap.ccsdk.sli.core.sli.ConfigurationException; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicStore; +import org.onap.ccsdk.sli.core.sli.SvcLogicStoreFactory; import org.osgi.framework.BundleContext; import org.powermock.reflect.Whitebox; import org.powermock.*; diff --git a/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockDGXMLActivate.java b/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockDGXMLActivate.java index 5143120cc..41f1d09f8 100644 --- a/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockDGXMLActivate.java +++ b/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockDGXMLActivate.java @@ -24,7 +24,7 @@ package org.openecomp.sdnc.dg.loader; -import org.openecomp.sdnc.sli.SvcLogicStore; +import org.onap.ccsdk.sli.core.sli.SvcLogicStore; public class MockDGXMLActivate extends DGXMLActivate { private final static SvcLogicStore storeChild=MockSvcLogicFactory.getMockSvcLogicStore();; diff --git a/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockDGXMLLoad.java b/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockDGXMLLoad.java index 56cabbf14..27336d38d 100644 --- a/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockDGXMLLoad.java +++ b/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockDGXMLLoad.java @@ -25,7 +25,7 @@ package org.openecomp.sdnc.dg.loader; import org.mockito.internal.util.reflection.Whitebox; -import org.openecomp.sdnc.sli.SvcLogicStore; +import org.onap.ccsdk.sli.core.sli.SvcLogicStore; public class MockDGXMLLoad extends DGXMLLoad{ diff --git a/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockDGXMLLoadNActivate.java b/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockDGXMLLoadNActivate.java index 266f1cdd6..f60e6ab12 100644 --- a/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockDGXMLLoadNActivate.java +++ b/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockDGXMLLoadNActivate.java @@ -24,7 +24,7 @@ package org.openecomp.sdnc.dg.loader; -import org.openecomp.sdnc.sli.SvcLogicStore; +import org.onap.ccsdk.sli.core.sli.SvcLogicStore; public class MockDGXMLLoadNActivate extends DGXMLLoadNActivate { private final static SvcLogicStore storeChild=MockSvcLogicFactory.getMockSvcLogicStore();; diff --git a/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockSvcLogicDblibStore.java b/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockSvcLogicDblibStore.java index ab96ef7f2..fdfe0ab1b 100644 --- a/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockSvcLogicDblibStore.java +++ b/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockSvcLogicDblibStore.java @@ -26,10 +26,10 @@ package org.openecomp.sdnc.dg.loader; import java.util.Properties; -import org.openecomp.sdnc.sli.SvcLogicDblibStore; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.SvcLogicGraph; -import org.openecomp.sdnc.sli.SvcLogicStore; +import org.onap.ccsdk.sli.core.sli.SvcLogicDblibStore; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.SvcLogicGraph; +import org.onap.ccsdk.sli.core.sli.SvcLogicStore; public class MockSvcLogicDblibStore implements SvcLogicStore { diff --git a/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockSvcLogicFactory.java b/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockSvcLogicFactory.java index e38c64e41..82f75a0f8 100644 --- a/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockSvcLogicFactory.java +++ b/appc-directed-graph/dg-loader/provider/src/test/java/org/openecomp/sdnc/dg/loader/MockSvcLogicFactory.java @@ -24,9 +24,9 @@ package org.openecomp.sdnc.dg.loader; -import org.openecomp.sdnc.sli.SvcLogicStore; -import org.openecomp.sdnc.sli.SvcLogicStoreFactory; -import org.openecomp.sdnc.sli.SvcLogicDblibStore; +import org.onap.ccsdk.sli.core.sli.SvcLogicStore; +import org.onap.ccsdk.sli.core.sli.SvcLogicStoreFactory; +import org.onap.ccsdk.sli.core.sli.SvcLogicDblibStore; public class MockSvcLogicFactory extends SvcLogicStoreFactory { static SvcLogicStore getMockSvcLogicStore() { 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 2a6e49b1b..b56c8f64c 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 +1,64 @@ -[{"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.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.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"]
+ ]
+}]
diff --git a/appc-directed-graph/dg-loader/provider/src/test/resources/xml/Appc_UniTest.xml b/appc-directed-graph/dg-loader/provider/src/test/resources/xml/Appc_UniTest.xml index 6eca1043d..f3615da13 100644 --- a/appc-directed-graph/dg-loader/provider/src/test/resources/xml/Appc_UniTest.xml +++ b/appc-directed-graph/dg-loader/provider/src/test/resources/xml/Appc_UniTest.xml @@ -1,4 +1,4 @@ -<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='Appc' version='4.0.0'><method rpc='unitTestDG' mode='sync'> +<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'><method rpc='unitTestDG' mode='sync'> <block> <return status='success'> |