summaryrefslogtreecommitdiffstats
path: root/mod/runtimeapi/runtime-core
diff options
context:
space:
mode:
authorVijay Venkatesh Kumar <vv770d@att.com>2020-02-28 22:15:30 +0000
committerGerrit Code Review <gerrit@onap.org>2020-02-28 22:15:30 +0000
commit14bbfa10adfc928b74ac9fa266c0d91a93067862 (patch)
tree8eefae21c2da41f1d8e731ce3c1d624dcad4a62e /mod/runtimeapi/runtime-core
parent56c650139f899f1a6d271ed80780a9b576d7ff22 (diff)
parent7666d2a36849f88e917d87abec2e177dac500191 (diff)
Merge "Modify Runtime for new bpgen dependency"
Diffstat (limited to 'mod/runtimeapi/runtime-core')
-rw-r--r--mod/runtimeapi/runtime-core/pom.xml4
-rw-r--r--mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnap.java (renamed from mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnapDublin.java)4
-rw-r--r--mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestFlowGraphParser.java4
-rw-r--r--mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestIntegeration.java4
-rw-r--r--mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestOnapBpGen.java2
5 files changed, 9 insertions, 9 deletions
diff --git a/mod/runtimeapi/runtime-core/pom.xml b/mod/runtimeapi/runtime-core/pom.xml
index dd5d10b..53c8536 100644
--- a/mod/runtimeapi/runtime-core/pom.xml
+++ b/mod/runtimeapi/runtime-core/pom.xml
@@ -41,9 +41,9 @@ limitations under the License.
<version>28.0-jre</version>
</dependency>
<dependency>
- <groupId>org.onap.dcaegen2.platform.cli</groupId>
+ <groupId>org.onap.dcaegen2.platform.mod</groupId>
<artifactId>blueprint-generator</artifactId>
- <version>1.0.0</version>
+ <version>1.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
diff --git a/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnapDublin.java b/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnap.java
index 2225971..c12b970 100644
--- a/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnapDublin.java
+++ b/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnap.java
@@ -25,7 +25,7 @@ import org.yaml.snakeyaml.Yaml;
import java.util.Map;
-public class BlueprintCreatorOnapDublin implements BlueprintCreator{
+public class BlueprintCreatorOnap implements BlueprintCreator{
private String topicUrl;
private String importFilePath;
@@ -42,7 +42,7 @@ public class BlueprintCreatorOnapDublin implements BlueprintCreator{
public String createBlueprint(String componentSpecString) {
ComponentSpec componentSpec = new ComponentSpec();
componentSpec.createComponentSpecFromString(componentSpecString);
- Blueprint blueprint = new Blueprint().createBlueprint(componentSpec,"",'o',importFilePath);
+ Blueprint blueprint = new Blueprint().createBlueprint(componentSpec,"",'o',importFilePath,"");
return blueprint.blueprintToString();
}
diff --git a/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestFlowGraphParser.java b/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestFlowGraphParser.java
index 8412133..25e3e54 100644
--- a/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestFlowGraphParser.java
+++ b/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestFlowGraphParser.java
@@ -26,7 +26,7 @@ import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import org.onap.dcae.runtime.core.blueprint_creator.BlueprintCreatorOnapDublin;
+import org.onap.dcae.runtime.core.blueprint_creator.BlueprintCreatorOnap;
public class TestFlowGraphParser {
@@ -47,7 +47,7 @@ public class TestFlowGraphParser {
}
FlowGraph<Node, Edge> mainFlowGraph = new FlowGraph<>("1234", "nifi-main", true, "mock graph");
mainFlowGraph.addNode(new Node("dummy_id", "dummy_name", "dummy_compspec"));
- BlueprintCreatorOnapDublin bcod = new BlueprintCreatorOnapDublin();
+ BlueprintCreatorOnap bcod = new BlueprintCreatorOnap();
bcod.setTopicUrl("u.r.l");
bcod.setImportFilePath(importsfile.getAbsolutePath());
FlowGraphParser flowGraphParser = new FlowGraphParser(bcod);
diff --git a/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestIntegeration.java b/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestIntegeration.java
index 612f9f0..615993a 100644
--- a/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestIntegeration.java
+++ b/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestIntegeration.java
@@ -21,7 +21,7 @@ import org.onap.dcae.runtime.core.blueprint_creator.BlueprintCreator;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.onap.dcae.runtime.core.blueprint_creator.BlueprintCreatorOnapDublin;
+import org.onap.dcae.runtime.core.blueprint_creator.BlueprintCreatorOnap;
public class TestIntegeration {
@@ -33,7 +33,7 @@ public class TestIntegeration {
FlowGraph<Node, Edge> flowGraph = Helper.prepareFlowGraph();
//2. Inject graph in FlowGraphParser
- BlueprintCreator blueprintCreator = new BlueprintCreatorOnapDublin();
+ BlueprintCreator blueprintCreator = new BlueprintCreatorOnap();
flowGraphParser = new FlowGraphParser(blueprintCreator);
flowGraphParser.parse(flowGraph);
}
diff --git a/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestOnapBpGen.java b/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestOnapBpGen.java
index f717022..60ba323 100644
--- a/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestOnapBpGen.java
+++ b/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestOnapBpGen.java
@@ -29,7 +29,7 @@ public class TestOnapBpGen {
componentSpec.createComponentSpecFromString(Helper.loadFileContent(
"src/test/data/compspecs/componentSpec_hello_world_only_MR.json"));
- Blueprint bp = new Blueprint().createBlueprint(componentSpec,"",'d',"");
+ Blueprint bp = new Blueprint().createBlueprint(componentSpec,"",'d',"","");
System.out.println(bp.getInputs());
}
}