Switch between ContainerizedPlatformComponent to ContainerizedServiceComponent, Remove name, dns_name and add service_component_type for onap, Add location_id from dmaap in bp_gen

Issue-ID: DCAEGEN2-2144>
Change-Id: Ice8529336c21b2a6e27555509215e911f80279b8
Signed-off-by: Ravi Mantena <rx908f@att.com>

1 files changed, 18 insertions, 2 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());