diff options
Diffstat (limited to 'adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java')
-rw-r--r-- | adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java | 28 |
1 files changed, 15 insertions, 13 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 f7758c315c..450ffd6d93 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 @@ -20,7 +20,6 @@ package org.openecomp.mso.adapters.catalogdb.catalogrest; import org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization; -import org.jboss.resteasy.annotations.providers.NoJackson; import javax.xml.bind.annotation.XmlRootElement; import java.util.ArrayList; @@ -29,7 +28,6 @@ import java.util.List; import java.util.Map; @XmlRootElement(name = "serviceAllottedResources") -@NoJackson public class QueryAllottedResourceCustomization extends CatalogQuery { private List<AllottedResourceCustomization> allottedResourceCustomization; private final String template = @@ -43,15 +41,17 @@ public class QueryAllottedResourceCustomization extends CatalogQuery { "\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\t\"toscaNodeType\" : <TOSCA_NODE_TYPE>,\n"+ + "\t\t\"allottedResourceType\" : <ALLOTTED_RESOURCE_TYPE>,\n"+ + "\t\t\"allottedResourceRole\" : <ALLOTTED_RESOURCE_ROLE>,\n"+ + "\t\t\"providingServiceModelName\" : <PROVIDING_SERVICE_MODEL_NAME>,\n"+ + "\t\t\"providingServiceModelInvariantUuid\" : <PROVIDING_SERVICE_MODEL_INVARIANT_UUID>,\n"+ + "\t\t\"providingServiceModelUuid\" : <PROVIDING_SERVICE_MODEL_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<>(); } @@ -96,13 +96,15 @@ 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", o.getNfType()); - put(valueMap, "ALLOTTED_RESOURCE_ROLE", o.getNfRole()); + put(valueMap, "ALLOTTED_RESOURCE_TYPE", arNull ? null : o.getAllottedResource().getSubcategory()); + put(valueMap, "ALLOTTED_RESOURCE_ROLE", o.getTargetNetworkRole()); 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()); + put(valueMap, "PROVIDING_SERVICE_MODEL_UUID", o.getProvidingServiceModelUuid()); + put(valueMap, "PROVIDING_SERVICE_MODEL_NAME", o.getProvidingServiceModelName()); sb.append(sep).append(this.setTemplate(template, valueMap)); sep = ",\n"; |