summaryrefslogtreecommitdiffstats
path: root/mod/runtimeapi/runtime-web
diff options
context:
space:
mode:
Diffstat (limited to 'mod/runtimeapi/runtime-web')
-rw-r--r--mod/runtimeapi/runtime-web/data/imports/onapDublinImports.yaml2
-rw-r--r--mod/runtimeapi/runtime-web/data/imports/onapImports.yaml5
-rw-r--r--mod/runtimeapi/runtime-web/pom.xml6
-rw-r--r--mod/runtimeapi/runtime-web/src/main/java/org/onap/dcae/runtime/web/configuration/BlueprintCreatorConfig.java45
-rw-r--r--mod/runtimeapi/runtime-web/src/main/resources/application.properties19
-rw-r--r--mod/runtimeapi/runtime-web/src/main/resources/imports/OnapImports.yaml (renamed from mod/runtimeapi/runtime-web/src/main/resources/imports/OnapDublinImports.yaml)0
6 files changed, 51 insertions, 26 deletions
diff --git a/mod/runtimeapi/runtime-web/data/imports/onapDublinImports.yaml b/mod/runtimeapi/runtime-web/data/imports/onapDublinImports.yaml
deleted file mode 100644
index 9b9a203..0000000
--- a/mod/runtimeapi/runtime-web/data/imports/onapDublinImports.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-imports: ['http://www.getcloudify.org/spec/cloudify/3.4/types.yaml', 'https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.5/k8splugin_types.yaml',
- 'https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml']
diff --git a/mod/runtimeapi/runtime-web/data/imports/onapImports.yaml b/mod/runtimeapi/runtime-web/data/imports/onapImports.yaml
new file mode 100644
index 0000000..b164a8d
--- /dev/null
+++ b/mod/runtimeapi/runtime-web/data/imports/onapImports.yaml
@@ -0,0 +1,5 @@
+imports: ['https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml', 'https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml',
+ 'https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/dcaepolicyplugin/2.4.0/dcaepolicyplugin_types.yaml',
+ 'https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/pgaas/1.1.0/pgaas_types.yaml',
+ 'https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/clamppolicyplugin/1.1.0/clamppolicyplugin_types.yaml',
+ 'https://nexus.onap.org/content/repositories/raw/org.onap.ccsdk.platform.plugins/type_files/dmaap/dmaap.yaml']
diff --git a/mod/runtimeapi/runtime-web/pom.xml b/mod/runtimeapi/runtime-web/pom.xml
index 413ff9f..ff08ac1 100644
--- a/mod/runtimeapi/runtime-web/pom.xml
+++ b/mod/runtimeapi/runtime-web/pom.xml
@@ -22,10 +22,10 @@ limitations under the License.
<parent>
<groupId>org.onap.dcaegen2.platform.mod</groupId>
<artifactId>runtimeapi</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1</version>
</parent>
<artifactId>runtime-web</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1</version>
<packaging>jar</packaging>
<name>runtime-web</name>
<description>MOD Runtime Web Module</description>
@@ -33,7 +33,7 @@ limitations under the License.
<dependency>
<groupId>org.onap.dcaegen2.platform.mod</groupId>
<artifactId>runtime-core</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
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 8c535c7..11622e6 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
@@ -18,7 +18,7 @@
package org.onap.dcae.runtime.web.configuration;
import org.onap.dcae.runtime.core.FlowGraphParser;
-import org.onap.dcae.runtime.core.blueprint_creator.BlueprintCreatorOnapDublin;
+import org.onap.dcae.runtime.core.blueprint_creator.BlueprintCreatorOnap;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
@@ -43,28 +43,36 @@ public class BlueprintCreatorConfig {
@Autowired
Environment env;
-
- @Value("${onapDublin.topicUrl}")
+
+ @Value("${onap.topicUrl}")
String onapDublinTopicUrl;
- @Value("${onapDublin.import.cloudifyPlugin}")
+ @Value("${onap.import.cloudifyPlugin}")
String onapDublinImportCloudifyPlugin;
- @Value("${onapDublin.import.k8sPlugin}")
+ @Value("${onap.import.k8sPlugin}")
String onapDublinImportK8sPlugin;
- @Value("${onapDublin.import.policyPlugin}")
+ @Value("${onap.import.policyPlugin}")
String onapDublinImportPolicyPlugin;
-
- @Profile("onap_dublin")
+ @Value("${onap.import.postgresPlugin}")
+ String onapDublinImportPostgresPlugin;
+
+ @Value("${onap.import.clampPlugin}")
+ String onapDublinImportClampPlugin;
+
+ @Value("${onap.import.dmaapPlugin}")
+ String onapDublinImportDmaapPlugin;
+
+
+ @Profile("onap")
@Primary
@Bean
public FlowGraphParser getFlowGraphParserForOnapDublin(){
- BlueprintCreatorOnapDublin blueprintCreatorOnapDublin = new BlueprintCreatorOnapDublin();
- blueprintCreatorOnapDublin.setTopicUrl(onapDublinTopicUrl);
- blueprintCreatorOnapDublin.setImportFilePath(writeImportsTofile());
- FlowGraphParser flowGraphParser = new FlowGraphParser(blueprintCreatorOnapDublin);
+ BlueprintCreatorOnap blueprintCreatorOnap = new BlueprintCreatorOnap();
+ blueprintCreatorOnap.setImportFilePath(writeImportsTofile());
+ FlowGraphParser flowGraphParser = new FlowGraphParser(blueprintCreatorOnap);
return flowGraphParser;
}
@@ -84,17 +92,17 @@ public class BlueprintCreatorConfig {
private Path createDataImportDirAndImportFile() {
Path importDirPath = Paths.get("./data/imports").toAbsolutePath().normalize();
- Path onapDublinImportFilePath = Paths.get("./data/imports/onapDublinImports.yaml").toAbsolutePath().normalize();
+ Path onapImportFilePath = Paths.get("./data/imports/onapImports.yaml").toAbsolutePath().normalize();
try {
Files.createDirectories(importDirPath);
- Files.createFile(onapDublinImportFilePath);
+ Files.createFile(onapImportFilePath);
}
catch (FileAlreadyExistsException ignored){
}
catch (IOException e) {
e.printStackTrace();
}
- return onapDublinImportFilePath;
+ return onapImportFilePath;
}
private String getContentToWrite() {
@@ -103,6 +111,13 @@ public class BlueprintCreatorConfig {
importList.add(onapDublinImportCloudifyPlugin);
importList.add(onapDublinImportK8sPlugin);
importList.add(onapDublinImportPolicyPlugin);
+
+ importList.add(onapDublinImportPostgresPlugin);
+ importList.add(onapDublinImportClampPlugin);
+ importList.add(onapDublinImportDmaapPlugin);
+
+
+
result.put("imports",importList);
return new Yaml().dump(result);
}
diff --git a/mod/runtimeapi/runtime-web/src/main/resources/application.properties b/mod/runtimeapi/runtime-web/src/main/resources/application.properties
index 0cd7e03..dccce98 100644
--- a/mod/runtimeapi/runtime-web/src/main/resources/application.properties
+++ b/mod/runtimeapi/runtime-web/src/main/resources/application.properties
@@ -1,17 +1,24 @@
server.port=9090
#BlueprintGenerator profile
-spring.profiles.active=onap_dublin
+spring.profiles.active=onap
#Dashboard/Inventory configs
-dashboard.url=https://oom-dashboard/ccsdk-app/api-if
+dashboard.url=https://dashboard/ccsdk-app/nb-api
dashboard.username=
dashboard.password=
#Onap Dublin BlueprintGenerator configs
-onapDublin.topicUrl=https://url:9999
+onap.topicUrl=https://url:9999
-onapDublin.import.cloudifyPlugin=http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-onapDublin.import.k8sPlugin=https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.5/k8splugin_types.yaml
-onapDublin.import.policyPlugin=https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml
+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
+
+onap.import.policyPlugin=https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/dcaepolicyplugin/2.4.0/dcaepolicyplugin_types.yaml
+
+onap.import.postgresPlugin=https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/pgaas/1.1.0/pgaas_types.yaml
+
+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
diff --git a/mod/runtimeapi/runtime-web/src/main/resources/imports/OnapDublinImports.yaml b/mod/runtimeapi/runtime-web/src/main/resources/imports/OnapImports.yaml
index dc7c45c..dc7c45c 100644
--- a/mod/runtimeapi/runtime-web/src/main/resources/imports/OnapDublinImports.yaml
+++ b/mod/runtimeapi/runtime-web/src/main/resources/imports/OnapImports.yaml