[MSO-8] Second step of the rebase for MSO

Second rebase containing additional features for MSO + total reworking
of the BPMN structure + Notification flow can now be added at the end of
some BPMN flows

Change-Id: I7e937c7a0ba1593ca85e164a093f79c7e38b6ce0
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

12 files changed, 842 insertions, 65 deletions

diff --git a/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/web.xml b/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/web.xml
index 98b6860366..750bba7633 100644
--- a/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/web.xml
+++ b/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/web.xml
@@ -24,7 +24,22 @@
     <servlet-name>Resteasy</servlet-name>
     <url-pattern>/*</url-pattern>
   </servlet-mapping>
-
+    <security-constraint>
+        <web-resource-collection>
+            <web-resource-name>MSO internal Requests</web-resource-name>
+            <description>Internal Requests</description>
+            <url-pattern>/logging/*</url-pattern>
+            <url-pattern>/properties/*</url-pattern>
+            <http-method>POST</http-method>
+            <http-method>GET</http-method>
+        </web-resource-collection>
+        <auth-constraint>
+            <role-name>MSO-Client</role-name>
+        </auth-constraint>
+    </security-constraint>
+    <security-role>
+        <role-name>MSO-Client</role-name>
+    </security-role>
     <filter>
 		<filter-name>LogFilter</filter-name>
 		<filter-class>org.openecomp.mso.logger.LogFilter</filter-class>
diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml
index 828edf772d..e7c4b533c7 100644
--- a/adapters/mso-catalog-db-adapter/pom.xml
+++ b/adapters/mso-catalog-db-adapter/pom.xml
@@ -70,12 +70,6 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.mso.adapters</groupId>
-			<artifactId>mso-adapters-rest-interface</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
 			<groupId>org.jboss.resteasy</groupId>
 			<artifactId>resteasy-jaxrs</artifactId>
 			<version>3.0.19.Final</version>
@@ -96,10 +90,15 @@
 			</exclusions>
 		</dependency>
 		<dependency>
+			<groupId>org.jboss.resteasy</groupId>
+			<artifactId>resteasy-jackson-provider</artifactId>
+			<version>3.0.16.Final</version>
+		</dependency>
+		<!--<dependency>
 			<groupId>org.openecomp.mso</groupId>
 			<artifactId>status-control</artifactId>
 			<version>${project.version}</version>
-		</dependency>
+		</dependency>-->
 	</dependencies>
 
 </project>
\ No newline at end of file
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/CatalogDbAdapterRest.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/CatalogDbAdapterRest.java
index 210e5e7074..20198d1543 100644
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/CatalogDbAdapterRest.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/CatalogDbAdapterRest.java
@@ -73,12 +73,13 @@ import org.apache.http.HttpStatus;
 
 import org.openecomp.mso.logger.MessageEnum;
 import org.openecomp.mso.logger.MsoLogger;
-import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
-import org.openecomp.mso.adapters.vnfrest.VfModuleExceptionResponse;
-import org.openecomp.mso.adapters.catalogrest.QueryServiceVnfs;
-import org.openecomp.mso.adapters.catalogrest.QueryServiceNetworks;
-import org.openecomp.mso.adapters.catalogrest.QueryServiceMacroHolder;
-import org.openecomp.mso.adapters.catalogrest.QueryAllottedResourceCustomization;
+import org.openecomp.mso.adapters.catalogdb.catalogrest.CatalogQueryException;
+import org.openecomp.mso.adapters.catalogdb.catalogrest.CatalogQueryExceptionCategory;
+import org.openecomp.mso.adapters.catalogdb.catalogrest.CatalogQuery;
+import org.openecomp.mso.adapters.catalogdb.catalogrest.QueryServiceVnfs;
+import org.openecomp.mso.adapters.catalogdb.catalogrest.QueryServiceNetworks;
+import org.openecomp.mso.adapters.catalogdb.catalogrest.QueryServiceMacroHolder;
+import org.openecomp.mso.adapters.catalogdb.catalogrest.QueryAllottedResourceCustomization;
 import org.openecomp.mso.db.catalog.CatalogDatabase;
 import org.openecomp.mso.db.catalog.beans.VnfResource;
 import org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization;
@@ -90,16 +91,28 @@ import org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization;
  * Both XML and JSON can be produced/consumed.  Set Accept: and Content-Type: headers appropriately.  XML is the default.
  * Requests respond synchronously only
  */
-@Path("/v1")
+@Path("/{version: v[0-9]+}")
 public class CatalogDbAdapterRest {
 	private static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+	private static final boolean IS_ARRAY = true;
+
+	public Response respond(String version, int respStatus, boolean isArray, CatalogQuery qryResp) {
+		return Response
+				.status(respStatus)
+				//.entity(new GenericEntity<QueryServiceVnfs>(qryResp) {})
+				.entity(qryResp.toJsonString(version, isArray))
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+				.build();
+	}
 
 	@HEAD
 	@GET
 	@Path("healthcheck")
 	@Produces(MediaType.TEXT_HTML)
-	public Response healthcheck () {
-		String CHECK_HTML = "<!DOCTYPE html><html><head><meta charset=\"ISO-8859-1\"><title>Health Check</title></head><body>Application ready</body></html>";
+	public Response healthcheck (
+			@PathParam("version") String version
+	) {
+		String CHECK_HTML = "<!DOCTYPE html><html><head><meta charset=\"ISO-8859-1\"><title>Health Check</title></head><body>Application "+ version+ " ready</body></html>";
 		return Response.ok().entity(CHECK_HTML).build();
 	}
 
@@ -109,23 +122,38 @@ public class CatalogDbAdapterRest {
 	 * RESP:
 	 * {"queryVfModule":{"version":1,"asdcUuid":"MANUAL RECORD","created":{"nanos":0},"description":"vSAMP10","environmentId":15184,"id":2312,"isBase":1,"modelName":"vSAMP10::base::module-0","modelVersion":1,"templateId":15123,"type":"Test\/vSAMP10::vSAMP10::base::module-0","vnfResourceId":15187}}
 	 */
+
+	@GET
+	@Path("vnfs/{vnfModelCustomizationUuid}")
+	@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+	public Response serviceVnfs (
+			@PathParam("version") String version,
+			@PathParam("vnfModelCustomizationUuid") String vnfUuid
+	) {
+		return serviceVnfsImpl (version, !IS_ARRAY, vnfUuid, null, null, null, null);
+	}
+
 	@GET
 	@Path("serviceVnfs")
 	@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
 	public Response serviceVnfs(
+			@PathParam("version") String version,
 			@QueryParam("vnfModelCustomizationUuid") String vnfUuid,
 			@QueryParam("serviceModelUuid") String smUuid,
 			@QueryParam("serviceModelInvariantUuid") String smiUuid,
 			@QueryParam("serviceModelVersion") String smVer,
 			@QueryParam("serviceModelName") String smName
-			) {
+	) {
+		return serviceVnfsImpl (version, IS_ARRAY, vnfUuid, smUuid, smiUuid, smVer, smName);
+	}
+
+	public Response serviceVnfsImpl(String version, boolean isArray, String vnfUuid, String smUuid, String smiUuid, String smVer, String smName) {
 		QueryServiceVnfs qryResp;
 		int respStatus = HttpStatus.SC_OK;
 		String uuid = "";
 		List<VnfResource> ret;
 
-        try (CatalogDatabase db = new CatalogDatabase()) {
-
+		try (CatalogDatabase db = new CatalogDatabase()) {
 			if (vnfUuid != null && !vnfUuid.equals("")) {
 				uuid = vnfUuid;
 				LOGGER.debug ("Query serviceVnfs getAllVnfsByVnfModelCustomizationUuid vnfModelCustomizationUuid: " + uuid);
@@ -157,6 +185,16 @@ public class CatalogDbAdapterRest {
 					ret = db.getAllVnfsByServiceName(smName);
 				}
 			}
+			else if (smName != null && !smName.equals("")) {
+				if (smVer != null && !smVer.equals("")) {
+					LOGGER.debug ("Query serviceVnfs getAllVnfsByServiceName serviceModelInvariantName: " + smName+ " serviceModelVersion: "+ smVer);
+					ret = db.getAllVnfsByServiceName(smName, smVer);
+				}
+				else {
+					LOGGER.debug ("Query serviceVnfs getAllVnfsByServiceName serviceModelName: " + smName);
+					ret = db.getAllVnfsByServiceName(smName);
+				}
+			}
 			else {
 				throw(new Exception("no matching parameters"));
 			}
@@ -169,41 +207,50 @@ public class CatalogDbAdapterRest {
 				LOGGER.debug ("serviceVnfs found");
 				qryResp = new QueryServiceVnfs(ret);
 				LOGGER.debug ("serviceVnfs qryResp="+ qryResp);
-				LOGGER.debug ("serviceVnfs tojsonstring="+ qryResp.toJsonString());
 			}
 			LOGGER.debug ("Query serviceVnfs exit");
-			return Response
-				.status(respStatus)
-				//.entity(new GenericEntity<QueryServiceVnfs>(qryResp) {})
-				.entity(qryResp.toJsonString())
-				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-				.build();
+			return respond(version, respStatus, isArray, qryResp);
 		} catch (Exception e) {
 			LOGGER.error (MessageEnum.RA_QUERY_VNF_ERR,  uuid, "", "queryServiceVnfs", MsoLogger.ErrorCode.BusinessProcesssError, "Exception - queryServiceVnfs", e);
-			VfModuleExceptionResponse excResp = new VfModuleExceptionResponse(e.getMessage(), MsoExceptionCategory.INTERNAL, Boolean.FALSE, null);
+			CatalogQueryException excResp = new CatalogQueryException(e.getMessage(), CatalogQueryExceptionCategory.INTERNAL, Boolean.FALSE, null);
 			return Response
 				.status(HttpStatus.SC_INTERNAL_SERVER_ERROR)
-				.entity(new GenericEntity<VfModuleExceptionResponse>(excResp) {})
+				.entity(new GenericEntity<CatalogQueryException>(excResp) {})
 				.build();
 		}
 	}
 
 	@GET
+	@Path("networks/{networkModelCustomizationUuid}")
+	@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+	public Response serviceNetworks (
+			@PathParam("version") String version,
+			@PathParam("networkModelCustomizationUuid") String nUuid
+	) {
+		return serviceNetworksImpl (version, !IS_ARRAY, nUuid, null, null, null, null);
+	}
+
+	@GET
 	@Path("serviceNetworks")
 	@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
 	public Response serviceNetworks (
+			@PathParam("version") String version,
 			@QueryParam("networkModelCustomizationUuid") String nUuid,
 			@QueryParam("networkType") String nType,
 			@QueryParam("serviceModelUuid") String smUuid,
 			@QueryParam("serviceModelInvariantUuid") String smiUuid,
 			@QueryParam("serviceModelVersion") String smVer
-			) {
+	) {
+		return serviceNetworksImpl (version, IS_ARRAY, nUuid, nType, smUuid, smiUuid, smVer);
+	}
+
+	public Response serviceNetworksImpl (String version, boolean isArray, String nUuid, String nType, String smUuid, String smiUuid, String smVer) {
 		QueryServiceNetworks qryResp;
 		int respStatus = HttpStatus.SC_OK;
 		String uuid = "";
 		List<NetworkResourceCustomization> ret;
 
-        try (CatalogDatabase db = new CatalogDatabase()) {
+		try (CatalogDatabase db = new CatalogDatabase()) {
 			if (nUuid != null && !nUuid.equals("")) {
 				uuid = nUuid;
 				LOGGER.debug ("Query serviceNetworks getAllNetworksByNetworkModelCustomizationUuid networkModelCustomizationUuid: " + uuid);
@@ -242,21 +289,15 @@ public class CatalogDbAdapterRest {
 				LOGGER.debug ("serviceNetworks found");
 				qryResp = new QueryServiceNetworks(ret);
 				LOGGER.debug ("serviceNetworks qryResp="+ qryResp);
-				LOGGER.debug ("serviceNetworks tojsonstring="+ qryResp.toJsonString());
 			}
 			LOGGER.debug ("Query serviceNetworks exit");
-			return Response
-				.status(respStatus)
-				//.entity(new GenericEntity<QueryServiceNetworks>(qryResp) {})
-				.entity(qryResp.toJsonString())
-				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-				.build();
+			return respond(version, respStatus, isArray, qryResp);
 		} catch (Exception e) {
 			LOGGER.error (MessageEnum.RA_QUERY_VNF_ERR,  uuid, "", "queryServiceNetworks", MsoLogger.ErrorCode.BusinessProcesssError, "Exception - queryServiceNetworks", e);
-			VfModuleExceptionResponse excResp = new VfModuleExceptionResponse(e.getMessage(), MsoExceptionCategory.INTERNAL, Boolean.FALSE, null);
+			CatalogQueryException excResp = new CatalogQueryException(e.getMessage(), CatalogQueryExceptionCategory.INTERNAL, Boolean.FALSE, null);
 			return Response
 				.status(HttpStatus.SC_INTERNAL_SERVER_ERROR)
-				.entity(new GenericEntity<VfModuleExceptionResponse>(excResp) {})
+				.entity(new GenericEntity<CatalogQueryException>(excResp) {})
 				.build();
 		}
 	}
@@ -265,17 +306,16 @@ public class CatalogDbAdapterRest {
 	@Path("serviceResources")
 	@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
 	public Response serviceResources(
+			@PathParam("version") String version,
 			@QueryParam("serviceModelUuid") String smUuid,
 			@QueryParam("serviceModelInvariantUuid") String smiUuid,
-			@QueryParam("serviceModelVersion") String smVer
-			) {
+			@QueryParam("serviceModelVersion") String smVer) {
 		QueryServiceMacroHolder qryResp;
 		int respStatus = HttpStatus.SC_OK;
 		String uuid = "";
 		ServiceMacroHolder ret;
 
-        try (CatalogDatabase db = new CatalogDatabase()) {
-
+		try (CatalogDatabase db = new CatalogDatabase()) {
 			if (smUuid != null && !smUuid.equals("")) {
 				uuid = smUuid;
 				LOGGER.debug ("Query serviceMacroHolder getAllResourcesByServiceModelUuid serviceModelUuid: " + uuid);
@@ -304,41 +344,49 @@ public class CatalogDbAdapterRest {
 				LOGGER.debug ("serviceMacroHolder found");
 				qryResp = new QueryServiceMacroHolder(ret);
 				LOGGER.debug ("serviceMacroHolder qryResp="+ qryResp);
-				LOGGER.debug ("serviceMacroHolder tojsonstring="+ qryResp.toJsonString());
 			}
 			LOGGER.debug ("Query serviceMacroHolder exit");
-			return Response
-				.status(respStatus)
-				//.entity(new GenericEntity<QueryServiceMacroHolder>(qryResp) {})
-				.entity(qryResp.toJsonString())
-				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-				.build();
+			return respond(version, respStatus, IS_ARRAY, qryResp);
 		} catch (Exception e) {
 			LOGGER.error (MessageEnum.RA_QUERY_VNF_ERR,  uuid, "", "queryServiceMacroHolder", MsoLogger.ErrorCode.BusinessProcesssError, "Exception - queryServiceMacroHolder", e);
-			VfModuleExceptionResponse excResp = new VfModuleExceptionResponse(e.getMessage(), MsoExceptionCategory.INTERNAL, Boolean.FALSE, null);
+			CatalogQueryException excResp = new CatalogQueryException(e.getMessage(), CatalogQueryExceptionCategory.INTERNAL, Boolean.FALSE, null);
 			return Response
 				.status(HttpStatus.SC_INTERNAL_SERVER_ERROR)
-				.entity(new GenericEntity<VfModuleExceptionResponse>(excResp) {})
+				.entity(new GenericEntity<CatalogQueryException>(excResp) {})
 				.build();
 		}
 	}
 
 	@GET
+	@Path("allottedResources/{arModelCustomizationUuid}")
+	@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+	public Response serviceAllottedResources (
+			@PathParam("version") String version,
+			@PathParam("arModelCustomizationUuid") String aUuid
+	) {
+		return serviceAllottedResourcesImpl(version, !IS_ARRAY, aUuid, null, null, null);
+	}
+
+	@GET
 	@Path("serviceAllottedResources")
 	@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
 	public Response serviceAllottedResources(
+			@PathParam("version") String version,
 			@QueryParam("serviceModelUuid") String smUuid,
 			@QueryParam("serviceModelInvariantUuid") String smiUuid,
 			@QueryParam("serviceModelVersion") String smVer,
 			@QueryParam("arModelCustomizationUuid") String aUuid
-			) {
+	) {
+		return serviceAllottedResourcesImpl(version, IS_ARRAY, aUuid, smUuid, smiUuid, smVer);
+	}
+
+	public Response serviceAllottedResourcesImpl(String version, boolean isArray, String aUuid, String smUuid, String smiUuid, String smVer) {
 		QueryAllottedResourceCustomization qryResp;
 		int respStatus = HttpStatus.SC_OK;
 		String uuid = "";
 		List<AllottedResourceCustomization > ret;
 
-        try (CatalogDatabase db = new CatalogDatabase()) {
-
+		try (CatalogDatabase db = new CatalogDatabase()) {
 			if (smUuid != null && !smUuid.equals("")) {
 				uuid = smUuid;
 				LOGGER.debug ("Query AllottedResourceCustomization getAllAllottedResourcesByServiceModelUuid serviceModelUuid: " + uuid);
@@ -372,21 +420,15 @@ public class CatalogDbAdapterRest {
 				LOGGER.debug ("AllottedResourceCustomization found");
 				qryResp = new QueryAllottedResourceCustomization(ret);
 				LOGGER.debug ("AllottedResourceCustomization qryResp="+ qryResp);
-				LOGGER.debug ("AllottedResourceCustomization tojsonstring="+ qryResp.toJsonString());
 			}
 			LOGGER.debug ("Query AllottedResourceCustomization exit");
-			return Response
-				.status(respStatus)
-				//.entity(new GenericEntity<QueryAllottedResourceCustomization>(qryResp) {})
-				.entity(qryResp.toJsonString())
-				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-				.build();
+			return respond(version, respStatus, isArray, qryResp);
 		} catch (Exception e) {
 			LOGGER.error (MessageEnum.RA_QUERY_VNF_ERR,  uuid, "", "queryAllottedResourceCustomization", MsoLogger.ErrorCode.BusinessProcesssError, "Exception - queryAllottedResourceCustomization", e);
-			VfModuleExceptionResponse excResp = new VfModuleExceptionResponse(e.getMessage(), MsoExceptionCategory.INTERNAL, Boolean.FALSE, null);
+			CatalogQueryException excResp = new CatalogQueryException(e.getMessage(), CatalogQueryExceptionCategory.INTERNAL, Boolean.FALSE, null);
 			return Response
 				.status(HttpStatus.SC_INTERNAL_SERVER_ERROR)
-				.entity(new GenericEntity<VfModuleExceptionResponse>(excResp) {})
+				.entity(new GenericEntity<CatalogQueryException>(excResp) {})
 				.build();
 		}
 	}
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQuery.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQuery.java
new file mode 100644
index 0000000000..565c4ff1e9
--- /dev/null
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQuery.java
@@ -0,0 +1,90 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.mso.adapters.catalogdb.catalogrest;
+
+import org.openecomp.mso.logger.MsoLogger;
+import org.codehaus.jackson.map.ObjectMapper;
+
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public abstract class CatalogQuery {
+	protected static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+	private static final boolean IS_EMBED = true;
+
+	public abstract String JSON2(boolean isArray, boolean isEmbed);
+
+	protected void put(Map<String, String> valueMap, String key, String value) {
+		valueMap.put(key, value == null? "null": '"'+ value+ '"');
+	}
+
+	protected void put(Map<String, String> valueMap, String key, Integer value) {
+		valueMap.put(key, value == null? "null": value.toString());
+	}
+
+	protected void put(Map<String, String> valueMap, String key, Boolean value) {
+		valueMap.put(key, value == null? "null": value? "true": "false");
+	}
+
+	protected String setTemplate(String template, Map<String, String> valueMap) {
+		LOGGER.debug ("CatalogQuery setTemplate");
+		StringBuffer result = new StringBuffer();
+
+		String pattern = "<.*>";
+		Pattern r = Pattern.compile(pattern);
+		Matcher m = r.matcher(template);
+
+		LOGGER.debug ("CatalogQuery template:"+ template);
+		while(m.find()) {
+			String key = template.substring(m.start()+1, m.end()-1);
+			LOGGER.debug ("CatalogQuery key:"+ key+ " contains key? "+ valueMap.containsKey(key));
+	         m.appendReplacement(result, valueMap.containsKey(key)? valueMap.get(key): "\"TBD\"");
+		}
+		m.appendTail(result);
+                LOGGER.debug ("CatalogQuery return:"+ result.toString());
+		return result.toString();
+	}
+
+	/**
+	 * The simple, clean, generic way to handle the interface
+	 */
+ 	protected String smartToJSON() {
+		String jsonString = null;
+		try {
+			ObjectMapper mapper = new ObjectMapper();
+			jsonString = mapper.writeValueAsString(this);
+		}
+		catch (Exception e) {
+			LOGGER.debug ("jsonString exception:"+e.getMessage());
+			jsonString = "invalid"; //throws instead?
+		}
+		return jsonString;
+	}
+
+	public String toJsonString(String version, boolean isArray) {
+		switch(version) {
+		case "v1": return smartToJSON();
+		case "v2": return JSON2(isArray, !IS_EMBED);
+		default:
+			return ("invalid version: "+ version);
+		}
+	}
+}
\ No newline at end of file
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryException.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryException.java
new file mode 100644
index 0000000000..0fed791b0e
--- /dev/null
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryException.java
@@ -0,0 +1,57 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.mso.adapters.catalogdb.catalogrest;
+
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+
+@XmlRootElement(name = "catalogQueryException")
+@NoJackson
+public class CatalogQueryException extends CatalogQueryExceptionCommon implements Serializable {
+    private static final long serialVersionUID = -9062290006520066109L;
+
+    private String message;
+	private CatalogQueryExceptionCategory category;
+	private Boolean rolledBack;
+
+	public CatalogQueryException () {}
+
+	public CatalogQueryException (String message) {
+		this.message = message;
+	}
+
+	public CatalogQueryException (String message, CatalogQueryExceptionCategory category, boolean rolledBack, String messageid) {
+		super(messageid);
+		this.message = message;
+		this.category = category;
+		this.rolledBack = rolledBack;
+	}
+
+	public String getMessage() { return message; }
+	public void setMessage(String message) { this.message = message; }
+
+	public CatalogQueryExceptionCategory getCategory () { return category; }
+	public void setCategory (CatalogQueryExceptionCategory category) { this.category = category; }
+
+	public Boolean getRolledBack() { return rolledBack; }
+	public void setRolledBack(Boolean rolledBack) { this.rolledBack = rolledBack; }
+}
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryExceptionCategory.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryExceptionCategory.java
new file mode 100644
index 0000000000..4fef8ac777
--- /dev/null
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryExceptionCategory.java
@@ -0,0 +1,22 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.mso.adapters.catalogdb.catalogrest;
+
+public enum CatalogQueryExceptionCategory { OPENSTACK, IO, INTERNAL, USERDATA }
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryExceptionCommon.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryExceptionCommon.java
new file mode 100644
index 0000000000..09a469d893
--- /dev/null
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryExceptionCommon.java
@@ -0,0 +1,64 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.mso.adapters.catalogdb.catalogrest;
+
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.SerializationConfig;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Marshaller;
+import java.io.ByteArrayOutputStream;
+
+public abstract class CatalogQueryExceptionCommon {
+	private String messageId;
+
+	public CatalogQueryExceptionCommon() { messageId = null; }
+	public CatalogQueryExceptionCommon(String messageId) { this.messageId = messageId; }
+
+	public String getMessageId() { return messageId; }
+	public void setMessageId(String messageId) { this.messageId = messageId; }
+
+	public String toJsonString() {
+		try {
+			String jsonString = null;
+			ObjectMapper mapper = new ObjectMapper();
+			mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
+			jsonString = mapper.writeValueAsString(this);
+			return jsonString;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return "";
+		}
+	}
+
+	public String toXmlString() {
+		try {
+			ByteArrayOutputStream bs = new ByteArrayOutputStream();
+			JAXBContext context = JAXBContext.newInstance(this.getClass());
+			Marshaller marshaller = context.createMarshaller();
+			marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); //pretty print XML
+			marshaller.marshal(this, bs);
+			return bs.toString();
+		} catch (Exception e) {
+			e.printStackTrace();
+			return "";
+		}
+	}
+}
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
new file mode 100644
index 0000000000..9c81476f5d
--- /dev/null
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java
@@ -0,0 +1,93 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+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;
+import java.util.HashMap;
+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 =
+		"\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}}";
+
+	public QueryAllottedResourceCustomization() { super(); allottedResourceCustomization = new ArrayList<AllottedResourceCustomization>(); }
+	public QueryAllottedResourceCustomization(List<AllottedResourceCustomization> vlist) { allottedResourceCustomization = vlist; }
+
+	public List<AllottedResourceCustomization> getServiceAllottedResources(){ return this.allottedResourceCustomization; }
+	public void setServiceAllottedResources(List<AllottedResourceCustomization> v) { this.allottedResourceCustomization = v; }
+
+	@Override
+	public String toString () {
+		StringBuffer buf = new StringBuffer();
+
+		boolean first = true;
+		int i = 1;
+		for (AllottedResourceCustomization o : allottedResourceCustomization) {
+			buf.append(i+"\t");
+			if (!first) buf.append("\n"); first = false;
+			buf.append(o);
+		}
+		return buf.toString();
+    }
+
+	@Override
+	public String JSON2(boolean isArray, boolean isEmbed) {
+		StringBuffer buf = new StringBuffer();
+		if (!isEmbed && isArray) buf.append("{ ");
+		if (isArray) buf.append("\"serviceAllottedResources\": [");
+		Map<String, String> valueMap = new HashMap<String, String>();
+		String sep = "";
+		boolean first = true;
+
+		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());
+		    put(valueMap, "MODEL_CUSTOMIZATION_UUID", o.getModelCustomizationUuid());
+		    put(valueMap, "MODEL_INSTANCE_NAME",      o.getModelInstanceName());
+
+            buf.append(sep+ this.setTemplate(template, valueMap));
+            sep = ",\n";
+		}
+		if (!first) buf.append("\n");
+		if (isArray) buf.append("]");
+		if (!isEmbed && isArray) buf.append("}");
+		return buf.toString();
+	}
+
+}
\ No newline at end of file
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceMacroHolder.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceMacroHolder.java
new file mode 100644
index 0000000000..5ac54164c7
--- /dev/null
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceMacroHolder.java
@@ -0,0 +1,82 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.mso.adapters.catalogdb.catalogrest;
+
+import org.openecomp.mso.db.catalog.beans.Service;
+import org.openecomp.mso.db.catalog.beans.ServiceMacroHolder;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.HashMap;
+import java.util.Map;
+
+@XmlRootElement(name = "serviceResources")
+@NoJackson
+public class QueryServiceMacroHolder extends CatalogQuery {
+	private ServiceMacroHolder serviceMacroHolder;
+	private final String template =
+		"{ \"serviceResources\"    : {\n"+
+            "\t\"modelName\"          : <SERVICE_MODEL_NAME>,\n"+
+            "\t\"modelUuid\"          : <SERVICE_MODEL_UUID>,\n"+
+            "\t\"modelInvariantUuid\" : <SERVICE_MODEL_INVARIANT_ID>,\n"+
+            "\t\"modelVersion\"       : <SERVICE_MODEL_VERSION>,\n"+
+
+            "<_SERVICEVNFS_>,\n"+
+            "<_SERVICENETWORKS_>,\n"+
+            "<_SERVICEALLOTTEDRESOURCES_>\n"+
+        "\t}}";
+
+	public QueryServiceMacroHolder() { super(); serviceMacroHolder = new ServiceMacroHolder(); }
+	public QueryServiceMacroHolder(ServiceMacroHolder vlist) { serviceMacroHolder = vlist; }
+
+	public ServiceMacroHolder getServiceResources(){ return this.serviceMacroHolder; }
+	public void setServiceResources(ServiceMacroHolder v) { this.serviceMacroHolder = v; }
+
+	@Override
+	public String toString () { return serviceMacroHolder.toString(); }
+
+	@Override
+	public String JSON2(boolean isArray, boolean x) {
+		Service service = serviceMacroHolder.getService();
+		if (service == null) return "\"serviceResources\": null";
+
+		StringBuffer buf = new StringBuffer();
+		Map<String, String> valueMap = new HashMap<String, String>();
+
+		put(valueMap, "SERVICE_MODEL_NAME",         service.getServiceName()); //getServiceModelName());
+		put(valueMap, "SERVICE_MODEL_UUID",         service.getServiceNameVersionId()); //getServiceModelUuid());
+		put(valueMap, "SERVICE_MODEL_INVARIANT_ID", service.getModelInvariantUUID()); //getServiceModelInvariantId());
+		put(valueMap, "SERVICE_MODEL_VERSION",      service.getServiceVersion()); //getServiceModelVersion());
+
+	    String subitem;
+	    subitem = new QueryServiceVnfs(serviceMacroHolder.getVnfResources()).JSON2(true, true);
+	    valueMap.put("_SERVICEVNFS_",               subitem.replaceAll("(?m)^", "\t"));
+
+		subitem = new QueryServiceNetworks(serviceMacroHolder.getNetworkResourceCustomization()).JSON2(true, true);
+		valueMap.put("_SERVICENETWORKS_",           subitem.replaceAll("(?m)^", "\t"));
+
+		subitem = new QueryAllottedResourceCustomization(serviceMacroHolder.getAllottedResourceCustomization()).JSON2(true, true);
+		valueMap.put("_SERVICEALLOTTEDRESOURCES_",  subitem.replaceAll("(?m)^", "\t"));
+
+        buf.append(this.setTemplate(template, valueMap));
+		return buf.toString();
+	}
+
+}
\ No newline at end of file
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceNetworks.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceNetworks.java
new file mode 100644
index 0000000000..573a0c77a2
--- /dev/null
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceNetworks.java
@@ -0,0 +1,102 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.mso.adapters.catalogdb.catalogrest;
+
+import org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization;
+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;
+
+@XmlRootElement(name = "serviceNetworks")
+@NoJackson
+public class QueryServiceNetworks extends CatalogQuery {
+	private List<NetworkResourceCustomization> serviceNetworks;
+	private final String template =
+		"\t{ \"network\"                : {\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\"networkType\"            : <NETWORK_TYPE>\n"+
+		"\t}}";
+
+	public QueryServiceNetworks() { super(); serviceNetworks = new ArrayList<NetworkResourceCustomization>(); }
+	public QueryServiceNetworks(List<NetworkResourceCustomization> vlist) {
+		LOGGER.debug ("QueryServiceNetworks:");
+		serviceNetworks = new ArrayList<NetworkResourceCustomization>();
+		for (NetworkResourceCustomization o : vlist) {
+			LOGGER.debug (o.toString());
+			serviceNetworks.add(o);
+			LOGGER.debug ("-------------------");
+		}
+	}
+
+	public List<NetworkResourceCustomization> getServiceNetworks(){ return this.serviceNetworks; }
+	public void setServiceNetworks(List<NetworkResourceCustomization> v) { this.serviceNetworks = v; }
+
+	@Override
+	public String toString () {
+		StringBuffer buf = new StringBuffer();
+
+		boolean first = true;
+		int i = 1;
+		for (NetworkResourceCustomization o : serviceNetworks) {
+			buf.append(i+"\t");
+			if (!first) buf.append("\n"); first = false;
+			buf.append(o);
+		}
+		return buf.toString();
+    }
+
+	@Override
+	public String JSON2(boolean isArray, boolean isEmbed) {
+		StringBuffer buf = new StringBuffer();
+		if (!isEmbed && isArray) buf.append("{ ");
+		if (isArray) buf.append("\"serviceNetworks\": [");
+		Map<String, String> valueMap = new HashMap<String, String>();
+		String sep = "";
+		boolean first = true;
+
+		for (NetworkResourceCustomization o : serviceNetworks) {
+			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());
+		    put(valueMap, "MODEL_CUSTOMIZATION_UUID", o.getModelCustomizationUuid());
+		    put(valueMap, "MODEL_INSTANCE_NAME",      o.getModelInstanceName());
+		    put(valueMap, "NETWORK_TYPE",             o.getNetworkType());
+
+            buf.append(sep+ this.setTemplate(template, valueMap));
+            sep = ",\n";
+		}
+		if (!first) buf.append("\n");
+		if (isArray) buf.append("]");
+		if (!isEmbed && isArray) buf.append("}");
+		return buf.toString();
+	}
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..a917cd9efe
--- /dev/null
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceVnfs.java
@@ -0,0 +1,106 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.mso.adapters.catalogdb.catalogrest;
+/* should be called QueryVnfResource.java */
+
+import org.openecomp.mso.db.catalog.beans.VnfResource;
+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;
+
+@XmlRootElement(name = "serviceVnfs")
+@NoJackson
+public class QueryServiceVnfs extends CatalogQuery {
+	private List<VnfResource> serviceVnfs;
+	private final String template =
+        "\t{ \"vnf\"                    : {\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}}";
+
+	public QueryServiceVnfs() { super(); serviceVnfs = new ArrayList<VnfResource>(); }
+	public QueryServiceVnfs(List<VnfResource> vlist) {
+		LOGGER.debug ("QueryServiceVnfs:");
+		serviceVnfs = new ArrayList<VnfResource>();
+		for (VnfResource o : vlist) {
+			LOGGER.debug ("-- o is a  serviceVnfs ----");
+			LOGGER.debug (o.toString());
+			serviceVnfs.add(o);
+			LOGGER.debug ("-------------------");
+		}
+	}
+
+	public List<VnfResource> getServiceVnfs(){ return this.serviceVnfs; }
+	public void setServiceVnfs(List<VnfResource> v) { this.serviceVnfs = v; }
+
+	@Override
+	public String toString () {
+		StringBuffer buf = new StringBuffer();
+
+		boolean first = true;
+		int i = 1;
+		for (VnfResource o : serviceVnfs) {
+			buf.append(i+"\t");
+			if (!first) buf.append("\n"); first = false;
+			buf.append(o);
+		}
+		return buf.toString();
+    }
+
+	@Override
+	public String JSON2(boolean isArray, boolean isEmbed) {
+		StringBuffer buf = new StringBuffer();
+		if (!isEmbed && isArray) buf.append("{ ");
+		if (isArray) buf.append("\"serviceVnfs\": [");
+		Map<String, String> valueMap = new HashMap<String, String>();
+		String sep = "";
+		boolean first = true;
+
+		for (VnfResource 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());
+		    put(valueMap, "MODEL_CUSTOMIZATION_UUID", o.getModelCustomizationUuid());
+		    put(valueMap, "MODEL_INSTANCE_NAME",      o.getModelInstanceName());
+
+		    String subitem = new QueryVfModule(o.getVfModules()).JSON2(true, true);
+		    valueMap.put("_VFMODULES_",               subitem.replaceAll("(?m)^", "\t\t"));
+
+            buf.append(sep+ this.setTemplate(template, valueMap));
+            sep = ",\n";
+		}
+		if (!first) buf.append("\n");
+		if (isArray) buf.append("]");
+		if (!isEmbed && isArray) buf.append("}");
+		return buf.toString();
+	}
+}
\ No newline at end of file
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryVfModule.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryVfModule.java
new file mode 100644
index 0000000000..e7113e60c5
--- /dev/null
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryVfModule.java
@@ -0,0 +1,105 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - MSO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.mso.adapters.catalogdb.catalogrest;
+
+import org.openecomp.mso.db.catalog.beans.VfModule;
+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;
+
+@XmlRootElement(name = "vfModules")
+@NoJackson
+public class QueryVfModule extends CatalogQuery {
+	private List<VfModule> vfModules;
+	private final String template =
+		"\t{ \"vfModule\"               : { \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\"vfModuleType\"           : <VF_MODULE_TYPE>,\n"+
+			"\t\t\"isBase\"                 : <IS_BASE>,\n"+
+			"\t\t\"vfModuleLabel\"          : <VF_MODULE_LABEL>,\n"+
+			"\t\t\"initialCount\"           : <INITIAL_COUNT>\n"+
+		"\t}}";
+
+	public QueryVfModule() { super(); vfModules = new ArrayList<VfModule>(); }
+	public QueryVfModule(List<VfModule> vlist) {
+		LOGGER.debug ("QueryVfModule:");
+		vfModules = new ArrayList<VfModule>();
+		for (VfModule o : vlist) {
+			LOGGER.debug ("-- o is a  vfModules ----");
+			LOGGER.debug (o.toString());
+			vfModules.add(o);
+			LOGGER.debug ("-------------------");
+		}
+	}
+
+	public List<VfModule> getVfModule(){ return this.vfModules; }
+	public void setVfModule(List<VfModule> v) { this.vfModules = v; }
+
+	@Override
+	public String toString () {
+		StringBuffer buf = new StringBuffer();
+
+		boolean first = true;
+		int i = 1;
+		for (VfModule o : vfModules) {
+			buf.append(i+"\t");
+			if (!first) buf.append("\n"); first = false;
+			buf.append(o);
+		}
+		return buf.toString();
+    }
+
+	@Override
+	public String JSON2(boolean isArray, boolean x) {
+		StringBuffer buf = new StringBuffer();
+		if (isArray) buf.append("\"vfModules\": [");
+		Map<String, String> valueMap = new HashMap<String, String>();
+		String sep = "";
+		boolean first = true;
+
+		for (VfModule o : vfModules) {
+			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());
+		    put(valueMap, "MODEL_CUSTOMIZATION_UUID", o.getModelCustomizationUuid());
+		    put(valueMap, "VF_MODULE_TYPE",           o.getVfModuleType());
+		    put(valueMap, "IS_BASE",                  new Boolean(o.isBase()? true: false));
+		    put(valueMap, "VF_MODULE_LABEL",          o.getVfModuleLabel());
+		    put(valueMap, "INITIAL_COUNT",            o.getInitialCount());
+
+            buf.append(sep+ this.setTemplate(template, valueMap));
+            sep = ",\n";
+		}
+		if (!first) buf.append("\n");
+		if (isArray) buf.append("]");
+		return buf.toString();
+	}
+}
\ No newline at end of file