diff options
Diffstat (limited to 'mod/runtimeapi')
6 files changed, 48 insertions, 12 deletions
diff --git a/mod/runtimeapi/pom.xml b/mod/runtimeapi/pom.xml index f9919c5..75b68ce 100644 --- a/mod/runtimeapi/pom.xml +++ b/mod/runtimeapi/pom.xml @@ -3,6 +3,8 @@ ============LICENSE_START======================================================= Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved. ================================================================================ +Modifications Copyright (c) 2020 Nokia +================================================================================ 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 @@ -32,19 +34,38 @@ limitations under the License. </parent> <groupId>org.onap.dcaegen2.platform.mod</groupId> <artifactId>runtimeapi</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> <name>dcaegen2-platform-mod-runtimeapi</name> <description>MOD Runtime API</description> <properties> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> - <maven.deploy.skip>true</maven.deploy.skip> - <java.version>1.8</java.version> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml </sonar.coverage.jacoco.xmlReportPaths> </properties> + <profiles> + <profile> + <id>java11</id> + <properties> + <maven.compiler.source>11</maven.compiler.source> + <maven.compiler.target>11</maven.compiler.target> + <maven.compiler.release>11</maven.compiler.release> + </properties> + <activation> + <property> + <name>m2e.version</name> + </property> + <activeByDefault>true</activeByDefault> + </activation> + </profile> + <profile> + <id>java8</id> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + </properties> + </profile> + </profiles> <build> <plugins> diff --git a/mod/runtimeapi/runtime-core/pom.xml b/mod/runtimeapi/runtime-core/pom.xml index 0318d2f..26201e8 100644 --- a/mod/runtimeapi/runtime-core/pom.xml +++ b/mod/runtimeapi/runtime-core/pom.xml @@ -3,6 +3,8 @@ ============LICENSE_START======================================================= Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved. ================================================================================ +Modifications Copyright (c) 2020 Nokia +================================================================================ 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 @@ -23,7 +25,7 @@ limitations under the License. <parent> <artifactId>runtimeapi</artifactId> <groupId>org.onap.dcaegen2.platform.mod</groupId> - <version>1.0.1</version> + <version>1.0.2</version> </parent> <modelVersion>4.0.0</modelVersion> 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..c8ce84a 100644 --- a/mod/runtimeapi/runtime-web/pom.xml +++ b/mod/runtimeapi/runtime-web/pom.xml @@ -3,6 +3,8 @@ ============LICENSE_START======================================================= Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved. ================================================================================ +Modifications Copyright (c) 2020 Nokia +================================================================================ 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 @@ -22,10 +24,10 @@ limitations under the License. <parent> <groupId>org.onap.dcaegen2.platform.mod</groupId> <artifactId>runtimeapi</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> </parent> <artifactId>runtime-web</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.6-SNAPSHOT</version> <packaging>jar</packaging> <name>runtime-web</name> <description>MOD Runtime Web Module</description> @@ -109,7 +111,7 @@ limitations under the License. <name>onap/${project.groupId}.${project.artifactId}</name> <registry>${onap.nexus.dockerregistry.daily}</registry> <build> - <from>openjdk:8-jre-alpine</from> + <from>openjdk:11-jre-slim</from> <tags> <tag>latest</tag> <tag>${project.version}</tag> @@ -119,7 +121,7 @@ limitations under the License. <descriptorRef>artifact</descriptorRef> </assembly> <runCmds> - <runCmd>addgroup -g 1000 dcaemod && adduser -s /bin/bash -u 1000 -G dcaemod -D dcaemod && mkdir -p /maven/data && chown -R dcaemod:dcaemod /maven/data</runCmd> + <runCmd>groupadd -r dcaemod && useradd -ms /bin/bash dcaemod -g dcaemod && mkdir -p /maven/data && chown -R dcaemod:dcaemod /maven/data</runCmd> </runCmds> <workdir>/maven</workdir> <volumes> 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 |