summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Gauld <agauld@att.com>2020-07-17 15:46:41 +0000
committerAndrew Gauld <agauld@att.com>2020-07-17 20:04:13 +0000
commita1a37bde3365ebf0aaa543b2f10ebdb13bd4af40 (patch)
tree1bda1fb21c14ca4540e45c445da823c6cfdb6373
parente996e07eea9189ffd89418047eb26293ef33e419 (diff)
Add onap.useDmaapPlugin config parameter
Change-Id: I8c86eb3f1c76c608fe5ce66bc4e0e1f6d8d64abc Issue-ID: DCAEGEN2-1996 Signed-off-by: Andrew Gauld <agauld@att.com>
-rw-r--r--mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnap.java7
-rw-r--r--mod/runtimeapi/runtime-web/pom.xml2
-rw-r--r--mod/runtimeapi/runtime-web/src/main/java/org/onap/dcae/runtime/web/configuration/BlueprintCreatorConfig.java4
-rw-r--r--mod/runtimeapi/runtime-web/src/main/resources/application.properties4
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