From 7666d2a36849f88e917d87abec2e177dac500191 Mon Sep 17 00:00:00 2001 From: Deven Date: Thu, 27 Feb 2020 14:33:33 -0500 Subject: Modify Runtime for new bpgen dependency Modify Runtime core and web components to build with the new bpgen dependency Issue-ID: DCAEGEN2-2091 Change-Id: Id9dac8f4cc24a39dac2dac8dce7a84b54c1e1229 Signed-off-by: Deven --- mod/runtimeapi/runtime-core/pom.xml | 4 +- .../blueprint_creator/BlueprintCreatorOnap.java | 78 ++++++++++++++++++++++ .../BlueprintCreatorOnapDublin.java | 78 ---------------------- .../dcae/runtime/core/TestFlowGraphParser.java | 4 +- .../onap/dcae/runtime/core/TestIntegeration.java | 4 +- .../org/onap/dcae/runtime/core/TestOnapBpGen.java | 2 +- 6 files changed, 85 insertions(+), 85 deletions(-) create mode 100644 mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnap.java delete mode 100644 mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnapDublin.java (limited to 'mod/runtimeapi/runtime-core') 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. 28.0-jre - org.onap.dcaegen2.platform.cli + org.onap.dcaegen2.platform.mod blueprint-generator - 1.0.0 + 1.3.1-SNAPSHOT org.json diff --git a/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnap.java b/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnap.java new file mode 100644 index 0000000..c12b970 --- /dev/null +++ b/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnap.java @@ -0,0 +1,78 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * 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.dcae.runtime.core.blueprint_creator; + +import org.onap.dcae.runtime.core.Node; +import org.onap.blueprintgenerator.models.blueprint.Blueprint; +import org.onap.blueprintgenerator.models.componentspec.ComponentSpec; +import org.yaml.snakeyaml.DumperOptions; +import org.yaml.snakeyaml.Yaml; + +import java.util.Map; + +public class BlueprintCreatorOnap implements BlueprintCreator{ + + private String topicUrl; + private String importFilePath; + + public void setTopicUrl(String topicUrl) { + this.topicUrl = topicUrl; + } + + public void setImportFilePath(String importFilePath) { + this.importFilePath = importFilePath; + } + + @Override + public String createBlueprint(String componentSpecString) { + ComponentSpec componentSpec = new ComponentSpec(); + componentSpec.createComponentSpecFromString(componentSpecString); + Blueprint blueprint = new Blueprint().createBlueprint(componentSpec,"",'o',importFilePath,""); + return blueprint.blueprintToString(); + } + + @Override + public void resolveDmaapConnection(Node node, String locationPort, String dmaapEntityName) { + if(node == null || locationPort == null){ + return; + } + String blueprintContent = node.getBlueprintData().getBlueprint_content(); + locationPort = locationPort.replaceAll("-","_"); + Yaml yaml = getYamlInstance(); + Map obj = yaml.load(blueprintContent); + Map inputsObj = (Map) obj.get("inputs"); + for(Map.Entry entry: inputsObj.entrySet()){ + if(entry.getKey().matches(locationPort+".*url")) { + Map inputValue = (Map) entry.getValue(); + inputValue.put("default",topicUrl + "/" + dmaapEntityName); + } + } + node.getBlueprintData().setBlueprint_content(yaml.dump(obj)); + } + + private Yaml getYamlInstance() { + DumperOptions options = new DumperOptions(); + options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); + options.setPrettyFlow(true); + return new Yaml(options); + } + +// private String attachSingleQoutes(String str) { +// return "'" + str + "'"; +// } +} 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/BlueprintCreatorOnapDublin.java deleted file mode 100644 index 2225971..0000000 --- a/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnapDublin.java +++ /dev/null @@ -1,78 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * 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.dcae.runtime.core.blueprint_creator; - -import org.onap.dcae.runtime.core.Node; -import org.onap.blueprintgenerator.models.blueprint.Blueprint; -import org.onap.blueprintgenerator.models.componentspec.ComponentSpec; -import org.yaml.snakeyaml.DumperOptions; -import org.yaml.snakeyaml.Yaml; - -import java.util.Map; - -public class BlueprintCreatorOnapDublin implements BlueprintCreator{ - - private String topicUrl; - private String importFilePath; - - public void setTopicUrl(String topicUrl) { - this.topicUrl = topicUrl; - } - - public void setImportFilePath(String importFilePath) { - this.importFilePath = importFilePath; - } - - @Override - public String createBlueprint(String componentSpecString) { - ComponentSpec componentSpec = new ComponentSpec(); - componentSpec.createComponentSpecFromString(componentSpecString); - Blueprint blueprint = new Blueprint().createBlueprint(componentSpec,"",'o',importFilePath); - return blueprint.blueprintToString(); - } - - @Override - public void resolveDmaapConnection(Node node, String locationPort, String dmaapEntityName) { - if(node == null || locationPort == null){ - return; - } - String blueprintContent = node.getBlueprintData().getBlueprint_content(); - locationPort = locationPort.replaceAll("-","_"); - Yaml yaml = getYamlInstance(); - Map obj = yaml.load(blueprintContent); - Map inputsObj = (Map) obj.get("inputs"); - for(Map.Entry entry: inputsObj.entrySet()){ - if(entry.getKey().matches(locationPort+".*url")) { - Map inputValue = (Map) entry.getValue(); - inputValue.put("default",topicUrl + "/" + dmaapEntityName); - } - } - node.getBlueprintData().setBlueprint_content(yaml.dump(obj)); - } - - private Yaml getYamlInstance() { - DumperOptions options = new DumperOptions(); - options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); - options.setPrettyFlow(true); - return new Yaml(options); - } - -// private String attachSingleQoutes(String str) { -// return "'" + str + "'"; -// } -} 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 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 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()); } } -- cgit 1.2.3-korg