1 files changed, 36 insertions, 12 deletions

diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java
index 9c81476f5d..503436fa99 100644
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java
@@ -33,14 +33,26 @@ import java.util.Map;
 public class QueryAllottedResourceCustomization extends CatalogQuery {
 	private List<AllottedResourceCustomization> allottedResourceCustomization;
 	private final String template =
-		"\t{ \"allottedResource\"       : {\n"+
-			"\t\t\"modelName\"              : <MODEL_NAME>,\n"+
-			"\t\t\"modelUuid\"              : <MODEL_UUID>,\n"+
-			"\t\t\"modelInvariantUuid\"     : <MODEL_INVARIANT_ID>,\n"+
-			"\t\t\"modelVersion\"           : <MODEL_VERSION>,\n"+
-			"\t\t\"modelCustomizationUuid\" : <MODEL_CUSTOMIZATION_UUID>,\n"+
-			"\t\t\"modelInstanceName\"      : <MODEL_INSTANCE_NAME>\n"+
-		"\t}}";
+		"\t{\n"+
+//		"\t{ \"allottedResource\"       : {\n"+
+		"\t\t\"modelInfo\"       : {\n"+
+			"\t\t\t\"modelName\"              : <MODEL_NAME>,\n"+
+			"\t\t\t\"modelUuid\"              : <MODEL_UUID>,\n"+
+			"\t\t\t\"modelInvariantUuid\"     : <MODEL_INVARIANT_ID>,\n"+
+			"\t\t\t\"modelVersion\"           : <MODEL_VERSION>,\n"+
+			"\t\t\t\"modelCustomizationUuid\" : <MODEL_CUSTOMIZATION_UUID>,\n"+
+			"\t\t\t\"modelInstanceName\"      : <MODEL_INSTANCE_NAME>\n"+
+	        "\t\t},\n"+
+				"\t\t\"toscaNodeType\"              : <TOSCA_NODE_TYPE>,\n"+
+				"\t\t\"allottedResourceType\"              : <ALLOTTED_RESOURCE_TYPE>,\n"+
+				"\t\t\"allottedResourceRole\"              : <ALLOTTED_RESOURCE_ROLE>,\n"+
+				"\t\t\"providingServiceModelInvariantUuid\"              : <PROVIDING_SERVICE_MODEL_INVARIANT_UUID>,\n"+
+				"\t\t\"nfFunction\"              : <NF_FUNCTION>,\n"+
+				"\t\t\"nfType\"              : <NF_TYPE>,\n"+
+				"\t\t\"nfRole\"              : <NF_ROLE>,\n"+
+				"\t\t\"nfNamingCode\"              : <NF_NAMING_CODE>\n"+
+		"\t}";
+//		"\t}}";
 
 	public QueryAllottedResourceCustomization() { super(); allottedResourceCustomization = new ArrayList<AllottedResourceCustomization>(); }
 	public QueryAllottedResourceCustomization(List<AllottedResourceCustomization> vlist) { allottedResourceCustomization = vlist; }
@@ -71,19 +83,31 @@ public class QueryAllottedResourceCustomization extends CatalogQuery {
 		String sep = "";
 		boolean first = true;
 
+		if (this.allottedResourceCustomization != null) {
 		for (AllottedResourceCustomization o : allottedResourceCustomization) {
 			if (first) buf.append("\n"); first = false;
 
-		    put(valueMap, "MODEL_NAME",               o.getModelName());
-		    put(valueMap, "MODEL_UUID",               o.getModelUuid());
-		    put(valueMap, "MODEL_INVARIANT_ID",       o.getModelInvariantId());
-		    put(valueMap, "MODEL_VERSION",            o.getModelVersion());
+				boolean arNull = o.getAllottedResource() == null ? true : false;
+	
+			    put(valueMap, "MODEL_NAME",               arNull ? null : o.getAllottedResource().getModelName());
+			    put(valueMap, "MODEL_UUID",               arNull ? null : o.getAllottedResource().getModelUuid());
+			    put(valueMap, "MODEL_INVARIANT_ID",       arNull ? null : o.getAllottedResource().getModelInvariantUuid());
+			    put(valueMap, "MODEL_VERSION",            arNull ? null : o.getAllottedResource().getModelVersion());
 		    put(valueMap, "MODEL_CUSTOMIZATION_UUID", o.getModelCustomizationUuid());
 		    put(valueMap, "MODEL_INSTANCE_NAME",      o.getModelInstanceName());
+			    put(valueMap, "TOSCA_NODE_TYPE",      arNull ? null : o.getAllottedResource().getToscaNodeType());
+			    put(valueMap, "ALLOTTED_RESOURCE_TYPE",     o.getNfType());
+			    put(valueMap, "ALLOTTED_RESOURCE_ROLE",     o.getNfRole());
+			    put(valueMap, "NF_TYPE",     o.getNfType());
+			    put(valueMap, "NF_ROLE",     o.getNfRole());
+			    put(valueMap, "NF_FUNCTION",     o.getNfFunction());
+			    put(valueMap, "NF_NAMING_CODE",     o.getNfNamingCode());
+			    put(valueMap, "PROVIDING_SERVICE_MODEL_INVARIANT_UUID",     o.getProvidingServiceModelInvariantUuid());
 
             buf.append(sep+ this.setTemplate(template, valueMap));
             sep = ",\n";
 		}
+		}
 		if (!first) buf.append("\n");
 		if (isArray) buf.append("]");
 		if (!isEmbed && isArray) buf.append("}");