AT&T 1712 and 1802 release code

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

diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceVnfs.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceVnfs.java
index f0d4327..383a106 100644 (file)
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceVnfs.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceVnfs.java
@@ -20,23 +20,20 @@
 package org.openecomp.mso.adapters.catalogdb.catalogrest;
 /* should be called QueryVnfResource.java */
 
-import org.openecomp.mso.db.catalog.beans.VnfResource;
-import org.openecomp.mso.db.catalog.beans.VnfResourceCustomization;
-import org.jboss.resteasy.annotations.providers.NoJackson;
-
-import javax.xml.bind.annotation.XmlRootElement;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.openecomp.mso.db.catalog.beans.VnfResourceCustomization;
+
 @XmlRootElement(name = "serviceVnfs")
-@NoJackson
 public class QueryServiceVnfs extends CatalogQuery {
        private List<VnfResourceCustomization> serviceVnfs;
        private final String template =
         "\n"+
-//        "\t{ \"vnfResource\"                    : {\n"+
         "\t{ \"modelInfo\"                    : {\n"+
                        "\t\t\"modelName\"              : <MODEL_NAME>,\n"+
                        "\t\t\"modelUuid\"              : <MODEL_UUID>,\n"+
@@ -50,10 +47,9 @@ public class QueryServiceVnfs extends CatalogQuery {
                        "\t\"nfType\"                           : <NF_TYPE>,\n"+
                        "\t\"nfRole\"                           : <NF_ROLE>,\n"+
                        "\t\"nfNamingCode\"             : <NF_NAMING_CODE>,\n"+
-//        "\t}\n"+
+                       "\t\"multiStageDesign\"         : <MULTI_STEP_DESIGN>,\n"+
                        "<_VFMODULES_>\n" + 
                        "\t}";
-//                     "\t}}";
 
        public QueryServiceVnfs() { super(); serviceVnfs = new ArrayList<>(); }
        public QueryServiceVnfs(List<VnfResourceCustomization> vlist) { 
@@ -104,11 +100,12 @@ public class QueryServiceVnfs extends CatalogQuery {
                    put(valueMap, "MODEL_VERSION",            vrNull ? null : o.getVnfResource().getVersion());
                    put(valueMap, "MODEL_CUSTOMIZATION_UUID", o.getModelCustomizationUuid());
                    put(valueMap, "MODEL_INSTANCE_NAME",      o.getModelInstanceName());
-                   put(valueMap, "TOSCA_NODE_TYPE",     vrNull ? null : o.getVnfResource().getToscaNodeType());
-                   put(valueMap, "NF_FUNCTION", o.getNfFunction());
-                   put(valueMap, "NF_TYPE", o.getNfType());
-                   put(valueMap, "NF_ROLE", o.getNfRole());
-                   put(valueMap, "NF_NAMING_CODE", o.getNfNamingCode());
+                   put(valueMap, "TOSCA_NODE_TYPE",          vrNull ? null : o.getVnfResource().getToscaNodeType());
+                   put(valueMap, "NF_FUNCTION",              o.getNfFunction());
+                   put(valueMap, "NF_TYPE",                  o.getNfType());
+                   put(valueMap, "NF_ROLE",                  o.getNfRole());
+                   put(valueMap, "NF_NAMING_CODE",           o.getNfNamingCode());
+                   put(valueMap, "MULTI_STEP_DESIGN",        o.getMultiStageDesign());
 
                    String subitem = new QueryVfModule(vrNull ? null : o.getVfModuleCustomizations()).JSON2(true, true); 
                    valueMap.put("_VFMODULES_",               subitem.replaceAll("(?m)^", "\t\t"));