diff options
Diffstat (limited to 'mod/runtimeapi')
4 files changed, 14 insertions, 3 deletions
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 index 7e11b10..c45173d 100644 --- 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 @@ -31,6 +31,7 @@ public class BlueprintCreatorOnap implements BlueprintCreator{ private String topicUrl; private String importFilePath; + private boolean useDmaapPlugin; public void setTopicUrl(String topicUrl) { this.topicUrl = topicUrl; @@ -40,11 +41,15 @@ public class BlueprintCreatorOnap implements BlueprintCreator{ this.importFilePath = importFilePath; } + public void setUseDmaapPlugin(boolean useDmaapPlugin) { + this.useDmaapPlugin = useDmaapPlugin; + } + @Override 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,"",useDmaapPlugin?'d':'o',importFilePath,""); return blueprint.blueprintToString(); } diff --git a/mod/runtimeapi/runtime-web/pom.xml b/mod/runtimeapi/runtime-web/pom.xml index 722c36a..3582c94 100644 --- a/mod/runtimeapi/runtime-web/pom.xml +++ b/mod/runtimeapi/runtime-web/pom.xml @@ -25,7 +25,7 @@ limitations under the License. <version>1.0.1</version> </parent> <artifactId>runtime-web</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.5-SNAPSHOT</version> <packaging>jar</packaging> <name>runtime-web</name> <description>MOD Runtime Web Module</description> diff --git a/mod/runtimeapi/runtime-web/src/main/java/org/onap/dcae/runtime/web/configuration/BlueprintCreatorConfig.java b/mod/runtimeapi/runtime-web/src/main/java/org/onap/dcae/runtime/web/configuration/BlueprintCreatorConfig.java index 11622e6..0741bfa 100644 --- a/mod/runtimeapi/runtime-web/src/main/java/org/onap/dcae/runtime/web/configuration/BlueprintCreatorConfig.java +++ b/mod/runtimeapi/runtime-web/src/main/java/org/onap/dcae/runtime/web/configuration/BlueprintCreatorConfig.java @@ -47,6 +47,9 @@ public class BlueprintCreatorConfig { @Value("${onap.topicUrl}") String onapDublinTopicUrl; + @Value("${onap.useDmaapPlugin}") + boolean useDmaapPlugin; + @Value("${onap.import.cloudifyPlugin}") String onapDublinImportCloudifyPlugin; @@ -72,6 +75,7 @@ public class BlueprintCreatorConfig { public FlowGraphParser getFlowGraphParserForOnapDublin(){ BlueprintCreatorOnap blueprintCreatorOnap = new BlueprintCreatorOnap(); blueprintCreatorOnap.setImportFilePath(writeImportsTofile()); + blueprintCreatorOnap.setUseDmaapPlugin(useDmaapPlugin); FlowGraphParser flowGraphParser = new FlowGraphParser(blueprintCreatorOnap); return flowGraphParser; } diff --git a/mod/runtimeapi/runtime-web/src/main/resources/application.properties b/mod/runtimeapi/runtime-web/src/main/resources/application.properties index dccce98..f3b06aa 100644 --- a/mod/runtimeapi/runtime-web/src/main/resources/application.properties +++ b/mod/runtimeapi/runtime-web/src/main/resources/application.properties @@ -11,6 +11,8 @@ dashboard.password= #Onap Dublin BlueprintGenerator configs onap.topicUrl=https://url:9999 +onap.useDmaapPlugin=false + onap.import.cloudifyPlugin=https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml onap.import.k8sPlugin=https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml @@ -21,4 +23,4 @@ onap.import.postgresPlugin=https://nexus.onap.org/service/local/repositories/raw onap.import.clampPlugin=https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/clamppolicyplugin/1.1.0/clamppolicyplugin_types.yaml -onap.import.dmaapPlugin= https://nexus.onap.org/content/repositories/raw/org.onap.ccsdk.platform.plugins/type_files/dmaap/dmaap.yaml
\ No newline at end of file +onap.import.dmaapPlugin= https://nexus.onap.org/content/repositories/raw/org.onap.ccsdk.platform.plugins/type_files/dmaap/dmaap.yaml |