diff options
Diffstat (limited to 'mod/bpgenerator/src/main')
| -rw-r--r-- | mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Properties.java | 20 | ||||
| -rw-r--r-- | mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/onapbp/OnapNode.java | 2 |
2 files changed, 19 insertions, 3 deletions
diff --git a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Properties.java b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Properties.java index 31df9c3..382964b 100644 --- a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Properties.java +++ b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Properties.java @@ -92,10 +92,10 @@ public class Properties { retInputs.put("replicas", rep); //set the dns name - this.setDns_name(cs.getSelf().getName()); + //this.setDns_name(cs.getSelf().getName()); //set the name - this.setName(cs.getSelf().getName()); + //this.setName(cs.getSelf().getName()); //set the docker config Auxilary aux = cs.getAuxilary(); @@ -118,6 +118,12 @@ public class Properties { inputAlwaysPullImage.put("default", true); retInputs.put("always_pull_image", inputAlwaysPullImage); + + //set service component type + String sType = cs.getSelf().getName(); + sType = sType.replace('.', '-'); + this.setService_component_type(sType); + //set the tls info if(cs.getAuxilary().getTls_info() != null){ addTlsInfo(cs,retInputs); @@ -144,6 +150,16 @@ public class Properties { img.put("default", cs.getArtifacts()[0].getUri()); retInputs.put("tag_version", img); + + //set the location id + GetInput location = new GetInput(); + location.setGet_input("location_id"); + this.setLocation_id(location); + LinkedHashMap<String, Object> locMap = new LinkedHashMap(); + locMap.put("type", "string"); + locMap.put("default", ""); + retInputs.put("location_id", locMap); + //set the log info this.setLog_info(cs.getAuxilary().getLog_info()); 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 a3d8e3e..dbff78c 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 @@ -64,7 +64,7 @@ public class OnapNode extends Node{ this.setInterfaces(interfaces); //set the type - this.setType("dcae.nodes.ContainerizedPlatformComponent"); + this.setType("dcae.nodes.ContainerizedServiceComponent"); //create and set the relationships ArrayList<LinkedHashMap<String, String>> rets = new ArrayList(); |