Merge "Reorder modifiers"

[so.git] / adapters / mso-catalog-db-adapter / src / main / java / org / openecomp / mso / adapters / catalogdb / catalogrest / QueryAllottedResourceCustomization.java

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 450ffd6..b249b58 100644 (file)
--- 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
@@ -96,8 +96,8 @@ public class QueryAllottedResourceCustomization extends CatalogQuery {
                    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",     arNull ? null : o.getAllottedResource().getSubcategory());
-                           put(valueMap, "ALLOTTED_RESOURCE_ROLE",     o.getTargetNetworkRole());
+                           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());