summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--blueprint-generator/pom.xml4
-rw-r--r--blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Properties.java9
-rw-r--r--pom.xml2
3 files changed, 9 insertions, 6 deletions
diff --git a/blueprint-generator/pom.xml b/blueprint-generator/pom.xml
index 2dbfd9e..6e00c71 100644
--- a/blueprint-generator/pom.xml
+++ b/blueprint-generator/pom.xml
@@ -28,8 +28,8 @@
<version>1.1.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.dcaegen2.platform.cli</groupId>
- <artifactId>blueprint-generator-onap</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <artifactId>blueprint-generator</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<properties>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
diff --git a/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Properties.java b/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Properties.java
index 82afe33..40770f3 100644
--- a/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Properties.java
+++ b/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Properties.java
@@ -62,11 +62,14 @@ public class Properties {
logD.setGet_input("log_directory");
this.setLog_info(logD);
String logger = "";
- for(Volumes v: cs.getAuxilary().getVolumes()) {
- if(v.getContainer().getBind().contains("/opt/app/") && v.getContainer().getBind().contains("logs")) {
- logger = v.getContainer().getBind();
+ if(cs.getAuxilary().getVolumes() != null) {
+ for(Volumes v: cs.getAuxilary().getVolumes()) {
+ if(v.getContainer().getBind().contains("/opt/app/") && v.getContainer().getBind().contains("logs")) {
+ logger = v.getContainer().getBind();
+ }
}
}
+
LinkedHashMap<String, Object> logInp = new LinkedHashMap<String, Object>();
logInp.put("type", "string");
if(logger != "") {
diff --git a/pom.xml b/pom.xml
index 8d20eef..d67457a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<packaging>pom</packaging>
<modules>
<module>dcae-cli</module>
- <module>component-json-schemas</module>
+ <module>component-json-schemas</module>
<module>blueprint-generator</module>
</modules>