diff options
author | Remigiusz Janeczek <remigiusz.janeczek@nokia.com> | 2020-06-17 17:52:56 +0200 |
---|---|---|
committer | Remigiusz Janeczek <remigiusz.janeczek@nokia.com> | 2020-07-16 11:41:49 +0200 |
commit | 69644638aa0e93c9c2c2ccea590fa02213d24a7a (patch) | |
tree | 2b9bed117552520851ec4d846eb38a84759fe042 /mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp | |
parent | 7e4e7939f698f593bf4019f3a4a1813206b77463 (diff) |
Add external tls info to bpgenerator and component spec schema
Also:
- Fix issue where local run without import file caused
exception instead of use of default imports.
- Update blueprint generator version from 1.3.2 to 1.4.0
Issue-ID: DCAEGEN2-2251
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: I2f976ccc3e0b271bf9ae1357f02bd86fe0903459
Diffstat (limited to 'mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp')
-rw-r--r-- | mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapBlueprint.java | 8 | ||||
-rw-r--r-- | mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapNode.java | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapBlueprint.java b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapBlueprint.java index c0ef8b3..9f6f560 100644 --- a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapBlueprint.java +++ b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapBlueprint.java @@ -2,7 +2,9 @@ org.onap.dcae ================================================================================ Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. - ================================================================================ + ================================================================================ + Modifications Copyright (c) 2020 Nokia. All rights reserved. + ================================================================================ 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 @@ -52,7 +54,7 @@ public class OnapBlueprint extends Blueprint{ this.setTosca_definitions_version("cloudify_dsl_1_3"); //set the imports - if(importPath != "") { + if(!"".equals(importPath)) { Imports imps = new Imports(); this.setImports(imps.createImportsFromFile(importPath)); } @@ -94,4 +96,4 @@ public class OnapBlueprint extends Blueprint{ return bp; } -}
\ No newline at end of file +} diff --git a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapNode.java b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapNode.java index dbff78c..b0d1302 100644 --- a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapNode.java +++ b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapNode.java @@ -48,9 +48,6 @@ import lombok.NoArgsConstructor; @JsonInclude(value=Include.NON_NULL) public class OnapNode extends Node{ - private TreeMap<String, Interfaces> interfaces; - private Properties properties; - private ArrayList<LinkedHashMap<String, String>> relationships; public TreeMap<String, LinkedHashMap<String, Object>> createOnapNode(TreeMap<String, LinkedHashMap<String, Object>> inps, ComponentSpec cs, String override) { TreeMap<String, LinkedHashMap<String, Object>> retInputs = new TreeMap<String, LinkedHashMap<String, Object>>(); @@ -90,4 +87,4 @@ public class OnapNode extends Node{ return retInputs; } -}
\ No newline at end of file +} |