AT&T 1712 and 1802 release code

[so.git] / bpmn / MSOCommonBPMN / src / main / groovy / org / openecomp / mso / bpmn / common / scripts / CatalogDbUtils.groovy

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CatalogDbUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CatalogDbUtils.groovy
index 921e0ee..7fcf310 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CatalogDbUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/CatalogDbUtils.groovy
@@ -33,7 +33,7 @@ import groovy.json.JsonSlurper
 import groovy.util.slurpersupport.GPathResult\r
 import groovy.xml.QName;\r
 \r
-import org.camunda.bpm.engine.runtime.Execution\r
+import org.camunda.bpm.engine.delegate.DelegateExecution\r
 \r
 import org.openecomp.mso.logger.MsoLogger;\r
 import org.openecomp.mso.rest.APIResponse;\r
@@ -47,14 +47,14 @@ import org.openecomp.mso.rest.RESTConfig
  */\r
 \r
 class CatalogDbUtils {\r
-       \r
+\r
        MsoUtils utils = new MsoUtils()\r
        JsonUtils jsonUtils = new JsonUtils()\r
        MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);\r
        static private String defaultDbAdapterVersion = "v2"\r
 \r
-       public JSONArray getAllNetworksByServiceModelUuid(Execution execution, String serviceModelUuid) {\r
-               JSONArray networksList = null           \r
+       public JSONArray getAllNetworksByServiceModelUuid(DelegateExecution execution, String serviceModelUuid) {\r
+               JSONArray networksList = null\r
                String endPoint = "/serviceNetworks?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")\r
                try {\r
                        String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)\r
@@ -71,8 +71,8 @@ class CatalogDbUtils {
                return networksList\r
        }\r
 \r
-       public JSONArray getAllNetworksByServiceModelUuid(Execution execution, String serviceModelUuid, String catalogUtilsVersion) {\r
-               JSONArray networksList = null           \r
+       public JSONArray getAllNetworksByServiceModelUuid(DelegateExecution execution, String serviceModelUuid, String catalogUtilsVersion) {\r
+               JSONArray networksList = null\r
                String endPoint = "/serviceNetworks?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")\r
                try {\r
                        String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)\r
@@ -95,8 +95,8 @@ class CatalogDbUtils {
                return networksList\r
        }\r
 \r
-       public JSONArray getAllNetworksByServiceModelInvariantUuid(Execution execution, String serviceModelInvariantUuid) {\r
-               JSONArray networksList = null           \r
+       public JSONArray getAllNetworksByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid) {\r
+               JSONArray networksList = null\r
                String endPoint = "/serviceNetworks?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")\r
                try {\r
                        String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)\r
@@ -113,8 +113,8 @@ class CatalogDbUtils {
                return networksList\r
        }\r
 \r
-       public JSONArray getAllNetworksByServiceModelInvariantUuid(Execution execution, String serviceModelInvariantUuid, String catalogUtilsVersion) {\r
-               JSONArray networksList = null           \r
+       public JSONArray getAllNetworksByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid, String catalogUtilsVersion) {\r
+               JSONArray networksList = null\r
                String endPoint = "/serviceNetworks?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")\r
                try {\r
                        String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)\r
@@ -137,8 +137,8 @@ class CatalogDbUtils {
                return networksList\r
        }\r
 \r
-       public JSONArray getAllNetworksByServiceModelInvariantUuidAndServiceModelVersion(Execution execution, String serviceModelInvariantUuid, String serviceModelVersion) {\r
-               JSONArray networksList = null           \r
+       public JSONArray getAllNetworksByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion) {\r
+               JSONArray networksList = null\r
                String endPoint = "/serviceNetworks?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")\r
                try {\r
                        String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)\r
@@ -155,8 +155,8 @@ class CatalogDbUtils {
                return networksList\r
        }\r
 \r
-       public JSONArray getAllNetworksByServiceModelInvariantUuidAndServiceModelVersion(Execution execution, String serviceModelInvariantUuid, String serviceModelVersion, String catalogUtilsVersion) {\r
-               JSONArray networksList = null           \r
+       public JSONArray getAllNetworksByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion, String catalogUtilsVersion) {\r
+               JSONArray networksList = null\r
                String endPoint = "/serviceNetworks?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")\r
                try {\r
                        String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)\r
@@ -179,8 +179,8 @@ class CatalogDbUtils {
                return networksList\r
        }\r
 \r
-       public JSONArray getAllNetworksByNetworkModelCustomizationUuid(Execution execution, String networkModelCustomizationUuid) {\r
-               JSONArray networksList = null           \r
+       public JSONArray getAllNetworksByNetworkModelCustomizationUuid(DelegateExecution execution, String networkModelCustomizationUuid) {\r
+               JSONArray networksList = null\r
                String endPoint = "/serviceNetworks?networkModelCustomizationUuid=" + UriUtils.encode(networkModelCustomizationUuid, "UTF-8")\r
                try {\r
                        String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)\r
@@ -197,8 +197,8 @@ class CatalogDbUtils {
                return networksList\r
        }\r
 \r
-       public JSONArray getAllNetworksByNetworkModelCustomizationUuid(Execution execution, String networkModelCustomizationUuid, String catalogUtilsVersion) {\r
-               JSONArray networksList = null           \r
+       public JSONArray getAllNetworksByNetworkModelCustomizationUuid(DelegateExecution execution, String networkModelCustomizationUuid, String catalogUtilsVersion) {\r
+               JSONArray networksList = null\r
                String endPoint = "/serviceNetworks?networkModelCustomizationUuid=" + UriUtils.encode(networkModelCustomizationUuid, "UTF-8")\r
                try {\r
                        String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)\r
@@ -221,8 +221,8 @@ class CatalogDbUtils {
                return networksList\r
        }\r
 \r
-       public JSONArray getAllNetworksByNetworkType(Execution execution, String networkType) {\r
-               JSONArray networksList = null           \r
+       public JSONArray getAllNetworksByNetworkType(DelegateExecution execution, String networkType) {\r
+               JSONArray networksList = null\r
                String endPoint = "/serviceNetworks?networkType=" + UriUtils.encode(networkType, "UTF-8")\r
                try {\r
                        String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)\r
@@ -239,8 +239,8 @@ class CatalogDbUtils {
                return networksList\r
        }\r
 \r
-       public JSONArray getAllNetworksByNetworkType(Execution execution, String networkType, String catalogUtilsVersion) {\r
-               JSONArray networksList = null           \r
+       public JSONArray getAllNetworksByNetworkType(DelegateExecution execution, String networkType, String catalogUtilsVersion) {\r
+               JSONArray networksList = null\r
                String endPoint = "/serviceNetworks?networkType=" + UriUtils.encode(networkType, "UTF-8")\r
                try {\r
                        String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)\r
@@ -264,8 +264,8 @@ class CatalogDbUtils {
        }\r
 \r
 \r
-       public JSONArray getAllVnfsByServiceModelUuid(Execution execution, String serviceModelUuid) {\r
-               JSONArray vnfsList = null               \r
+       public JSONArray getAllVnfsByServiceModelUuid(DelegateExecution execution, String serviceModelUuid) {\r
+               JSONArray vnfsList = null\r
                String endPoint = "/serviceVnfs?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")\r
                try {\r
                        msoLogger.debug("ENDPOINT: " + endPoint)\r
@@ -283,8 +283,8 @@ class CatalogDbUtils {
                return vnfsList\r
        }\r
 \r
-       public JSONArray getAllVnfsByServiceModelUuid(Execution execution, String serviceModelUuid, String catalogUtilsVersion) {\r
-               JSONArray vnfsList = null               \r
+       public JSONArray getAllVnfsByServiceModelUuid(DelegateExecution execution, String serviceModelUuid, String catalogUtilsVersion) {\r
+               JSONArray vnfsList = null\r
                String endPoint = "/serviceVnfs?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")\r
                try {\r
                        msoLogger.debug("ENDPOINT: " + endPoint)\r
@@ -308,8 +308,8 @@ class CatalogDbUtils {
                return vnfsList\r
        }\r
 \r
-       public JSONArray getAllVnfsByServiceModelInvariantUuid(Execution execution, String serviceModelInvariantUuid) {\r
-               JSONArray vnfsList = null               \r
+       public JSONArray getAllVnfsByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid) {\r
+               JSONArray vnfsList = null\r
                String endPoint ="/serviceVnfs?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")\r
                try {\r
                        msoLogger.debug("ENDPOINT: " + endPoint)\r
@@ -327,8 +327,8 @@ class CatalogDbUtils {
                return vnfsList\r
        }\r
 \r
-       public JSONArray getAllVnfsByServiceModelInvariantUuid(Execution execution, String serviceModelInvariantUuid, String catalogUtilsVersion) {\r
-               JSONArray vnfsList = null               \r
+       public JSONArray getAllVnfsByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid, String catalogUtilsVersion) {\r
+               JSONArray vnfsList = null\r
                String endPoint = "/serviceVnfs?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")\r
                try {\r
                        msoLogger.debug("ENDPOINT: " + endPoint)\r
@@ -352,8 +352,8 @@ class CatalogDbUtils {
                return vnfsList\r
        }\r
 \r
-       public JSONArray getAllVnfsByServiceModelInvariantUuidAndServiceModelVersion(Execution execution, String serviceModelInvariantUuid, String serviceModelVersion) {\r
-               JSONArray vnfsList = null               \r
+       public JSONArray getAllVnfsByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion) {\r
+               JSONArray vnfsList = null\r
                String endPoint =  "/serviceVnfs?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")\r
                try {\r
                        msoLogger.debug("ENDPOINT: " + endPoint)\r
@@ -371,8 +371,8 @@ class CatalogDbUtils {
                return vnfsList\r
        }\r
 \r
-       public JSONArray getAllVnfsByServiceModelInvariantUuidAndServiceModelVersion(Execution execution, String serviceModelInvariantUuid, String serviceModelVersion, String catalogUtilsVersion) {\r
-               JSONArray vnfsList = null               \r
+       public JSONArray getAllVnfsByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion, String catalogUtilsVersion) {\r
+               JSONArray vnfsList = null\r
                String endPoint = "/serviceVnfs?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")\r
                try {\r
                        msoLogger.debug("ENDPOINT: " + endPoint)\r
@@ -396,8 +396,8 @@ class CatalogDbUtils {
                return vnfsList\r
        }\r
 \r
-       public JSONArray getAllVnfsByVnfModelCustomizationUuid(Execution execution, String vnfModelCustomizationUuid) {\r
-               JSONArray vnfsList = null               \r
+       public JSONArray getAllVnfsByVnfModelCustomizationUuid(DelegateExecution execution, String vnfModelCustomizationUuid) {\r
+               JSONArray vnfsList = null\r
                String endPoint = "/serviceVnfs?vnfModelCustomizationUuid=" + UriUtils.encode(vnfModelCustomizationUuid, "UTF-8")\r
                try {\r
                        msoLogger.debug("ENDPOINT: " + endPoint)\r
@@ -414,7 +414,7 @@ class CatalogDbUtils {
 \r
                return vnfsList\r
        }\r
-       \r
+\r
        /**\r
         * This method gets a all vnfs for a particular\r
         * service from the catalog database using the\r
@@ -423,9 +423,9 @@ class CatalogDbUtils {
         * @param catalogDbEndpoint\r
         * @param serviceModelModelName\r
         * @return vnfsList      *\r
-        * \r
+        *\r
         */\r
-       public JSONArray getAllVnfsByServiceModelModelName(Execution execution, String serviceModelModelName) {\r
+       public JSONArray getAllVnfsByServiceModelModelName(DelegateExecution execution, String serviceModelModelName) {\r
                JSONArray vnfsList = null\r
                String endPoint = "/serviceVnfs?serviceModelName=" + UriUtils.encode(serviceModelModelName, "UTF-8")\r
                try {\r
@@ -441,8 +441,8 @@ class CatalogDbUtils {
                return vnfsList\r
        }\r
 \r
-       public JSONArray getAllVnfsByVnfModelCustomizationUuid(Execution execution, String vnfModelCustomizationUuid, String catalogUtilsVersion) {\r
-               JSONArray vnfsList = null               \r
+       public JSONArray getAllVnfsByVnfModelCustomizationUuid(DelegateExecution execution, String vnfModelCustomizationUuid, String catalogUtilsVersion) {\r
+               JSONArray vnfsList = null\r
                String endPoint = "/serviceVnfs?vnfModelCustomizationUuid=" + UriUtils.encode(vnfModelCustomizationUuid, "UTF-8")\r
                try {\r
                        msoLogger.debug("ENDPOINT: " + endPoint)\r
@@ -476,8 +476,8 @@ class CatalogDbUtils {
         * @param vfModuleModelName\r
         * @return vfModule\r
         */\r
-       public JSONObject getVfModuleByVfModuleModelName(Execution execution, String vfModuleModelName) {\r
-               JSONObject vfModule = null              \r
+       public JSONObject getVfModuleByVfModuleModelName(DelegateExecution execution, String vfModuleModelName) {\r
+               JSONObject vfModule = null\r
                String endPoint = "/vfModules?vfModuleModelName=" + UriUtils.encode(vfModuleModelName, "UTF-8")\r
                try{\r
                        msoLogger.debug("Get VfModule By VfModule ModelName Endpoint is: " + endPoint)\r
@@ -505,7 +505,7 @@ class CatalogDbUtils {
         * @param catalogUtilsVersion\r
         * @return vfModules\r
         */\r
-       public JSONObject getVfModuleByVfModuleModelName(Execution execution, String vfModuleModelName, String catalogUtilsVersion)  {\r
+       public JSONObject getVfModuleByVfModuleModelName(DelegateExecution execution, String vfModuleModelName, String catalogUtilsVersion)  {\r
                JSONObject vfModule = null\r
                String endPoint = "/vfModules?vfModuleModelName=" + UriUtils.encode(vfModuleModelName, "UTF-8")\r
                try{\r
@@ -524,7 +524,7 @@ class CatalogDbUtils {
        }\r
 \r
 \r
-       public JSONArray getAllottedResourcesByServiceModelUuid(Execution execution, String serviceModelUuid) {\r
+       public JSONArray getAllottedResourcesByServiceModelUuid(DelegateExecution execution, String serviceModelUuid) {\r
                JSONArray vnfsList = null\r
                String endPoint = "/ServiceAllottedResources?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")\r
                try {\r
@@ -542,7 +542,7 @@ class CatalogDbUtils {
                return vnfsList\r
        }\r
 \r
-       public JSONArray getAllottedResourcesByServiceModelUuid(Execution execution, String serviceModelUuid, String catalogUtilsVersion) {\r
+       public JSONArray getAllottedResourcesByServiceModelUuid(DelegateExecution execution, String serviceModelUuid, String catalogUtilsVersion) {\r
                JSONArray vnfsList = null\r
                String endPoint = "/ServiceAllottedResources?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")\r
                try {\r
@@ -566,7 +566,7 @@ class CatalogDbUtils {
                return vnfsList\r
        }\r
 \r
-       public JSONArray getAllottedResourcesByServiceModelInvariantUuid(Execution execution, String serviceModelInvariantUuid) {\r
+       public JSONArray getAllottedResourcesByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid) {\r
                JSONArray vnfsList = null\r
                String endPoint = "/serviceAllottedResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")\r
                try {\r
@@ -584,7 +584,7 @@ class CatalogDbUtils {
                return vnfsList\r
        }\r
 \r
-       public JSONArray getAllottedResourcesByServiceModelInvariantUuid(Execution execution, String serviceModelInvariantUuid, String catalogUtilsVersion) {\r
+       public JSONArray getAllottedResourcesByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid, String catalogUtilsVersion) {\r
                JSONArray vnfsList = null\r
                String endPoint = "/serviceAllottedResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")\r
                try {\r
@@ -609,7 +609,7 @@ class CatalogDbUtils {
                return vnfsList\r
        }\r
 \r
-       public JSONArray getAllottedResourcesByServiceModelInvariantUuidAndServiceModelVersion(Execution execution, String serviceModelInvariantUuid, String serviceModelVersion) {\r
+       public JSONArray getAllottedResourcesByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion) {\r
                JSONArray vnfsList = null\r
                String endPoint = "/serviceAllottedResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")\r
                try {\r
@@ -627,7 +627,7 @@ class CatalogDbUtils {
                return vnfsList\r
        }\r
 \r
-       public JSONArray getAllottedResourcesByServiceModelInvariantUuidAndServiceModelVersion(Execution execution, String serviceModelInvariantUuid, String serviceModelVersion, String catalogUtilsVersion) {\r
+       public JSONArray getAllottedResourcesByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion, String catalogUtilsVersion) {\r
                JSONArray vnfsList = null\r
                String endPoint = "/serviceAllottedResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")\r
                try {\r
@@ -652,7 +652,7 @@ class CatalogDbUtils {
        }\r
 \r
 \r
-       public JSONArray getAllottedResourcesByArModelCustomizationUuid(Execution execution, String arModelCustomizationUuid) {\r
+       public JSONArray getAllottedResourcesByArModelCustomizationUuid(DelegateExecution execution, String arModelCustomizationUuid) {\r
                JSONArray vnfsList = null\r
                String endPoint = "/serviceAllottedResources?serviceModelCustomizationUuid=" + UriUtils.encode(arModelCustomizationUuid, "UTF-8")\r
                try {\r
@@ -670,7 +670,7 @@ class CatalogDbUtils {
                return vnfsList\r
        }\r
 \r
-       public JSONArray getAllottedResourcesByArModelCustomizationUuid(Execution execution, String arModelCustomizationUuid, String catalogUtilsVersion) {\r
+       public JSONArray getAllottedResourcesByArModelCustomizationUuid(DelegateExecution execution, String arModelCustomizationUuid, String catalogUtilsVersion) {\r
                JSONArray vnfsList = null\r
                String endPoint = "/serviceAllottedResources?serviceModelCustomizationUuid=" + UriUtils.encode(arModelCustomizationUuid, "UTF-8")\r
                try {\r
@@ -694,58 +694,75 @@ class CatalogDbUtils {
                return vnfsList\r
        }\r
 \r
-       public JSONObject getServiceResourcesByServiceModelUuid(Execution execution, String serviceModelUuid) {\r
-        JSONObject resources = null\r
-        String endPoint = "/serviceResources?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")\r
-        try {\r
-            String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)\r
+       public JSONObject getServiceResourcesByServiceModelUuid(DelegateExecution execution, String serviceModelUuid) {\r
+               JSONObject resources = null\r
+               String endPoint = "/serviceResources?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")\r
+               try {\r
+                   String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)\r
+       \r
+                   if (catalogDbResponse != null) {\r
+       \r
+                       resources = parseServiceResourcesJson(catalogDbResponse, "v1")\r
+                   }\r
+       \r
+               }\r
+               catch (Exception e) {\r
+                   utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)\r
+               }\r
+\r
+               return resources\r
+       }\r
 \r
-            if (catalogDbResponse != null) {\r
+       public JSONObject getServiceResourcesByServiceModelUuid(DelegateExecution execution, String serviceModelUuid, String catalogUtilsVersion) {\r
+               JSONObject resources = null\r
+               String endPoint = "/serviceResources?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")\r
+               try {\r
+                       String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)\r
 \r
-                resources = parseServiceResourcesJson(catalogDbResponse, "v1")\r
-            }\r
+                       if (catalogDbResponse != null) {\r
+                               if (!catalogUtilsVersion.equals("v1")) {\r
+                                       resources = new JSONObject(catalogDbResponse)\r
+                               }\r
+                               else {\r
+                                       resources = parseServiceResourcesJson(catalogDbResponse, catalogUtilsVersion)\r
+                               }\r
+                       }\r
+               }\r
+               catch (Exception e) {\r
+                       utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)\r
+               }\r
 \r
-        }\r
-        catch (Exception e) {\r
-            utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)\r
-        }\r
+               return resources\r
+       }\r
 \r
-        return resources\r
-    }\r
+       public JSONObject getServiceResourcesByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid) {\r
+               JSONObject resources = null\r
+               String endPoint = "/serviceResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")\r
+               try {\r
+                       String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)\r
 \r
-    public JSONObject getServiceResourcesByServiceModelUuid(Execution execution, String serviceModelUuid, String catalogUtilsVersion) {\r
-        JSONObject resources = null\r
-        String endPoint = "/serviceResources?serviceModelUuid=" + UriUtils.encode(serviceModelUuid, "UTF-8")\r
-        try {\r
-            String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)\r
+                       if (catalogDbResponse != null) {\r
 \r
-            if (catalogDbResponse != null) {\r
-                if (!catalogUtilsVersion.equals("v1")) {\r
-                    resources = new JSONObject(catalogDbResponse)\r
-                }\r
-                else {\r
-                    resources = parseServiceResourcesJson(catalogDbResponse, catalogUtilsVersion)\r
-                }\r
-            }\r
+                               resources = parseServiceResourcesJson(catalogDbResponse, "v1")\r
+                       }\r
 \r
-        }\r
-        catch (Exception e) {\r
-            utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)\r
-        }\r
+               }\r
+               catch (Exception e) {\r
+                       utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)\r
+               }\r
 \r
-        return resources\r
-    }\r
+               return resources\r
+       }\r
 \r
-       \r
-       public JSONObject getServiceResourcesByServiceModelInvariantUuid(Execution execution, String serviceModelInvariantUuid) {\r
-               JSONObject resources = null\r
+       public String getServiceResourcesByServiceModelInvariantUuidString(DelegateExecution execution, String serviceModelInvariantUuid) {\r
+               String resources = null\r
                String endPoint = "/serviceResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")\r
                try {\r
                        String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)\r
 \r
                        if (catalogDbResponse != null) {\r
 \r
-                               resources = parseServiceResourcesJson(catalogDbResponse, "v1")\r
+                               resources = catalogDbResponse\r
                        }\r
 \r
                }\r
@@ -756,7 +773,7 @@ class CatalogDbUtils {
                return resources\r
        }\r
 \r
-       public JSONObject getServiceResourcesByServiceModelInvariantUuid(Execution execution, String serviceModelInvariantUuid, String catalogUtilsVersion) {\r
+       public JSONObject getServiceResourcesByServiceModelInvariantUuid(DelegateExecution execution, String serviceModelInvariantUuid, String catalogUtilsVersion) {\r
                JSONObject resources = null\r
                String endPoint = "/serviceResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8")\r
                try {\r
@@ -780,13 +797,14 @@ class CatalogDbUtils {
        }\r
 \r
 \r
-       public JSONObject getServiceResourcesByServiceModelInvariantUuidAndServiceModelVersion(Execution execution, String serviceModelInvariantUuid, String serviceModelVersion) {\r
+       public JSONObject getServiceResourcesByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion) {\r
                JSONObject resources = null\r
                String endPoint = "/serviceResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")\r
                try {\r
                        String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)\r
 \r
                        if (catalogDbResponse != null) {\r
+                               //TODO this is wrong\r
                                resources = parseServiceResourcesJson(catalogDbResponse)\r
                        }\r
 \r
@@ -798,7 +816,7 @@ class CatalogDbUtils {
                return resources\r
        }\r
 \r
-       public JSONObject getServiceResourcesByServiceModelInvariantUuidAndServiceModelVersion(Execution execution, String serviceModelInvariantUuid, String serviceModelVersion, String catalogUtilsVersion) {\r
+       public JSONObject getServiceResourcesByServiceModelInvariantUuidAndServiceModelVersion(DelegateExecution execution, String serviceModelInvariantUuid, String serviceModelVersion, String catalogUtilsVersion) {\r
                JSONObject resources = null\r
                String endPoint = "/serviceResources?serviceModelInvariantUuid=" + UriUtils.encode(serviceModelInvariantUuid, "UTF-8") + "&serviceModelVersion=" + UriUtils.encode(serviceModelVersion, "UTF-8")\r
                try {\r
@@ -903,9 +921,11 @@ class CatalogDbUtils {
                                                modelJson.put("nfNamingCode", nfCode)\r
                                                String nfFunction = jsonUtils.getJsonValueForKey(vnf, "nfFunction")\r
                                                modelJson.put("nfFunction", nfFunction)\r
+                                               String multiStageDesign = jsonUtils.getJsonValueForKey(vnf, "multiStageDesign")\r
+                                               modelJson.put("multiStageDesign", multiStageDesign)\r
                                                break\r
                                }\r
-                               \r
+\r
                                JSONArray vfModules = null\r
                                try {\r
                                        vfModules = vnf.getJSONArray("vfModules")\r
@@ -925,6 +945,7 @@ class CatalogDbUtils {
                                                vfModuleModelJson.put("vfModuleType", vfModuleType)\r
                                                switch(catalogUtilsVersion) {\r
                                                        case "v1":\r
+                                                       //TODO this does not work, isBase is not a integer.\r
                                                                Integer isBase = jsonUtils.getJsonIntValueForKey(vfModule, "isBase")\r
                                                                if (isBase.intValue() == 1) {\r
                                                                        vfModuleModelJson.put("isBase", "true")\r
@@ -1042,8 +1063,10 @@ class CatalogDbUtils {
                                                modelJson.put("nfNamingCode", nfCode)\r
                                                String nfFunction = jsonUtils.getJsonValueForKey(allottedResource, "nfFunction")\r
                                                modelJson.put("nfFunction", nfFunction)\r
-                                               String parentServiceModelUuid = jsonUtils.getJsonValueForKey(allottedResource, "parentServiceModelUuid")\r
-                                               modelJson.put("parentServiceModelUuid", parentServiceModelUuid)\r
+                                               String providingServiceModelName = jsonUtils.getJsonValueForKey(allottedResource, "providingServiceModelName")\r
+                                               modelJson.put("providingServiceModelName", providingServiceModelName)\r
+                                               String providingServiceModelUuid = jsonUtils.getJsonValueForKey(allottedResource, "providingServiceModelUuid")\r
+                                               modelJson.put("providingServiceModelUuid", providingServiceModelUuid)\r
                                                break\r
                                }\r
 \r
@@ -1061,6 +1084,7 @@ class CatalogDbUtils {
                return modelInfos\r
        }\r
 \r
+       //TODO this is wrong\r
        private JSONObject parseServiceResourcesJson (String catalogDbResponse) {\r
                JSONObject serviceResources = new JSONObject()\r
                String catalogUtilsVersion = "v1"\r
@@ -1124,7 +1148,7 @@ class CatalogDbUtils {
                        modelInfo.put("modelType", modelType)\r
                        String modelInvariantId = jsonUtils.getJsonValueForKey(modelFromDb, "modelInvariantUuid")\r
                        modelInfo.put("modelInvariantId", modelInvariantId)\r
-                       if(modelType.equalsIgnoreCase("allottedResource")){\r
+                       if(modelType.equalsIgnoreCase("allottedResource") || modelType.equalsIgnoreCase("vnf")){\r
                                String modelInstanceName = jsonUtils.getJsonValueForKey(modelFromDb, "modelInstanceName")\r
                                modelInfo.put("modelInstanceName", modelInstanceName)\r
                        }\r
@@ -1162,7 +1186,7 @@ class CatalogDbUtils {
                return modelInfo\r
        }\r
 \r
-       private String getResponseFromCatalogDb (Execution execution, String endPoint) {\r
+       private String getResponseFromCatalogDb (DelegateExecution execution, String endPoint) {\r
                try {\r
                        String catalogDbEndpoint = execution.getVariable("URN_mso_catalog_db_endpoint")\r
                        String queryEndpoint = catalogDbEndpoint + "/" + defaultDbAdapterVersion + endPoint\r
@@ -1174,7 +1198,7 @@ class CatalogDbUtils {
                                        addHeader('X-FromAppId', 'BPMN').\r
                                        addHeader('Content-Type', 'application/json').\r
                                        addHeader('Accept','application/json');\r
-                                       \r
+\r
                        String basicAuthCred = execution.getVariable("BasicAuthHeaderValueDB")\r
                        if (basicAuthCred != null && !"".equals(basicAuthCred)) {\r
                                        client.addAuthorizationHeader(basicAuthCred)\r
@@ -1203,25 +1227,25 @@ class CatalogDbUtils {
                }\r
 \r
        }\r
-       \r
-    /**\r
-     * get resource recipe by resource model uuid and action\r
-     */\r
-    public JSONObject getResourceRecipe(Execution execution, String resourceModelUuid, String action) {\r
-        String endPoint = "/resourceRecipe?resourceModelUuid=" + UriUtils.encode(resourceModelUuid, "UTF-8")+ "&action=" + UriUtils.encode(action, "UTF-8")\r
-        JSONObject responseJson = null\r
-        try {\r
-            msoLogger.debug("ENDPOINT: " + endPoint)\r
-            String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)\r
-\r
-            if (catalogDbResponse != null) {\r
-                responseJson = new JSONObject(catalogDbResponse)\r
-            }\r
-        }\r
-        catch (Exception e) {\r
-            utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)\r
-        }\r
-\r
-        return responseJson\r
-    }\r
-}
\ No newline at end of file
+\r
+       /**\r
+        * get resource recipe by resource model uuid and action\r
+        */\r
+       public JSONObject getResourceRecipe(DelegateExecution execution, String resourceModelUuid, String action) {\r
+               String endPoint = "/resourceRecipe?resourceModelUuid=" + UriUtils.encode(resourceModelUuid, "UTF-8")+ "&action=" + UriUtils.encode(action, "UTF-8")\r
+               JSONObject responseJson = null\r
+               try {\r
+                       msoLogger.debug("ENDPOINT: " + endPoint)\r
+                       String catalogDbResponse = getResponseFromCatalogDb(execution, endPoint)\r
+\r
+                       if (catalogDbResponse != null) {\r
+                               responseJson = new JSONObject(catalogDbResponse)\r
+                       }\r
+               }\r
+               catch (Exception e) {\r
+                       utils.log("ERROR", "Exception in Querying Catalog DB: " + e.message)\r
+               }\r
+\r
+               return responseJson\r
+       }\r
+}\r