1710 Rebase - Second Attempt

[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 a917cd9..796fec4 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
@@ -21,6 +21,7 @@ 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;
@@ -32,23 +33,33 @@ import java.util.Map;
 @XmlRootElement(name = "serviceVnfs")
 @NoJackson
 public class QueryServiceVnfs extends CatalogQuery {
-       private List<VnfResource> serviceVnfs;
+       private List<VnfResourceCustomization> serviceVnfs;
        private final String template =
-        "\t{ \"vnf\"                    : {\n"+
+        "\n"+
+//        "\t{ \"vnfResource\"                    : {\n"+
+        "\t{ \"modelInfo\"                    : {\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"+
-                       "<_VFMODULES_>\n"+
-                       "\t}}";
+                       "\t\t\"modelInstanceName\"      : <MODEL_INSTANCE_NAME>\n"+
+        "\t\t},\n"+
+                       "\t\"toscaNodeType\"            : <TOSCA_NODE_TYPE>,\n"+
+                       "\t\"nfFunction\"               : <NF_FUNCTION>,\n"+
+                       "\t\"nfType\"                           : <NF_TYPE>,\n"+
+                       "\t\"nfRole\"                           : <NF_ROLE>,\n"+
+                       "\t\"nfNamingCode\"             : <NF_NAMING_CODE>,\n"+
+//        "\t}\n"+
+                       "<_VFMODULES_>\n" + 
+                       "\t}";
+//                     "\t}}";
 
-       public QueryServiceVnfs() { super(); serviceVnfs = new ArrayList<VnfResource>(); }
-       public QueryServiceVnfs(List<VnfResource> vlist) {
+       public QueryServiceVnfs() { super(); serviceVnfs = new ArrayList<VnfResourceCustomization>(); }
+       public QueryServiceVnfs(List<VnfResourceCustomization> vlist) { 
                LOGGER.debug ("QueryServiceVnfs:");
-               serviceVnfs = new ArrayList<VnfResource>();
-               for (VnfResource o : vlist) {
+               serviceVnfs = new ArrayList<VnfResourceCustomization>();
+               for (VnfResourceCustomization o : vlist) {
                        LOGGER.debug ("-- o is a  serviceVnfs ----");
                        LOGGER.debug (o.toString());
                        serviceVnfs.add(o);
@@ -56,8 +67,8 @@ public class QueryServiceVnfs extends CatalogQuery {
                }
        }
 
-       public List<VnfResource> getServiceVnfs(){ return this.serviceVnfs; }
-       public void setServiceVnfs(List<VnfResource> v) { this.serviceVnfs = v; }
+       public List<VnfResourceCustomization> getServiceVnfs(){ return this.serviceVnfs; }
+       public void setServiceVnfs(List<VnfResourceCustomization> v) { this.serviceVnfs = v; }
 
        @Override
        public String toString () {
@@ -65,7 +76,7 @@ public class QueryServiceVnfs extends CatalogQuery {
 
                boolean first = true;
                int i = 1;
-               for (VnfResource o : serviceVnfs) {
+               for (VnfResourceCustomization o : serviceVnfs) {
                        buf.append(i+"\t");
                        if (!first) buf.append("\n"); first = false;
                        buf.append(o);
@@ -82,17 +93,24 @@ public class QueryServiceVnfs extends CatalogQuery {
                String sep = "";
                boolean first = true;
 
-               for (VnfResource o : serviceVnfs) {
+               for (VnfResourceCustomization o : serviceVnfs) {
                        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 vrNull = o.getVnfResource() == null ? true : false;
+
+                   put(valueMap, "MODEL_NAME",               vrNull ? null : o.getVnfResource().getModelName());
+                   put(valueMap, "MODEL_UUID",               vrNull ? null : o.getVnfResource().getModelUuid());
+                   put(valueMap, "MODEL_INVARIANT_ID",       vrNull ? null : o.getVnfResource().getModelInvariantId());
+                   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());
 
-                   String subitem = new QueryVfModule(o.getVfModules()).JSON2(true, true);
+                   String subitem = new QueryVfModule(vrNull ? null : o.getVfModuleCustomizations()).JSON2(true, true); 
                    valueMap.put("_VFMODULES_",               subitem.replaceAll("(?m)^", "\t\t"));
 
             buf.append(sep+ this.setTemplate(template, valueMap));