1710 Rebase - Second Attempt

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

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VidUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VidUtils.groovy
index 022a00c..7ae5821 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VidUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/VidUtils.groovy
@@ -99,7 +99,7 @@ class VidUtils {
                                asdcServiceModelVersion = it.relatedInstance.modelInfo?.modelVersion\r
                        }\r
                        if (it.relatedInstance.modelInfo?.modelType == 'vnf') {\r
-                               modelCustomizationName = it.relatedInstance.modelInfo?.modelCustomizationName\r
+                               modelCustomizationName = it.relatedInstance.modelInfo?.modelInstanceName\r
                        }\r
                }\r
                \r
@@ -110,7 +110,7 @@ class VidUtils {
                if(userParams != null) {\r
                        userParamsNode = buildUserParams(userParams)\r
                }\r
-               def modelCustomizationId = requestMap.requestDetails?.modelInfo?.modelCustomizationId ?: ''\r
+               def modelCustomizationId = requestMap.requestDetails?.modelInfo?.modelCustomizationUuid ?: ''\r
                \r
                def xmlReq = """\r
                <volume-request xmlns="http://www.w3.org/2001/XMLSchema">\r
@@ -205,6 +205,7 @@ class VidUtils {
         * @return\r
         * Note: See latest version: createXmlNetworkRequestInstance()\r
         */\r
+\r
        public String createXmlNetworkRequestInfra(execution, def networkJsonIncoming) {\r
        \r
                def requestId = execution.getVariable("requestId")\r
@@ -216,6 +217,11 @@ class VidUtils {
                try {\r
                        Map reqMap = jsonSlurper.parseText(networkJsonIncoming)\r
                        def instanceName =  reqMap.requestDetails.requestInfo.instanceName\r
+                       def modelCustomizationId =  reqMap.requestDetails.modelInfo.modelCustomizationId\r
+                       if (modelCustomizationId == null) {\r
+                               modelCustomizationId =  reqMap.requestDetails.modelInfo.modelCustomizationUuid !=null ?  \r
+                                                       reqMap.requestDetails.modelInfo.modelCustomizationUuid : ""\r
+                       }\r
                        def modelName = reqMap.requestDetails.modelInfo.modelName\r
                        def lcpCloudRegionId = reqMap.requestDetails.cloudConfiguration.lcpCloudRegionId\r
                        def tenantId = reqMap.requestDetails.cloudConfiguration.tenantId\r
@@ -253,6 +259,7 @@ class VidUtils {
                                <network-id>${networkId}</network-id> \r
                                <network-name>${instanceName}</network-name> \r
                                <network-type>${modelName}</network-type>\r
+                               <modelCustomizationId>${modelCustomizationId}</modelCustomizationId> \r
                                <aic-cloud-region>${lcpCloudRegionId}</aic-cloud-region> \r
                                <tenant-id>${tenantId}</tenant-id>\r
                                <service-id>${serviceId}</service-id> \r
@@ -279,12 +286,11 @@ class VidUtils {
         */\r
        public String createXmlNetworkRequestInstance(execution) {\r
 \r
-               def networkModelVersionId = ""\r
+               def networkModelUuid = ""\r
                def networkModelName = ""\r
-               def networkModelType = ""\r
                def networkModelVersion = ""\r
-               def networkModelCustomizationId = ""\r
-               def networkModelInvariantId = ""\r
+               def networkModelCustomizationUuid = ""\r
+               def networkModelInvariantUuid = ""\r
                \r
                // verify the DB Catalog response JSON structure\r
                def networkModelInfo = execution.getVariable("networkModelInfo")\r
@@ -293,23 +299,20 @@ class VidUtils {
                        try {\r
                                Map modelMap = jsonSlurper.parseText(networkModelInfo)\r
                                if (modelMap != null) {\r
-                                       if (networkModelInfo.contains("modelVersionId")) {\r
-                                               networkModelVersionId = modelMap.modelVersionId !=null ? modelMap.modelVersionId : ""\r
+                                       if (networkModelInfo.contains("modelUuid")) {\r
+                                               networkModelUuid = modelMap.modelUuid !=null ? modelMap.modelUuid : ""\r
                                        }\r
                                        if (networkModelInfo.contains("modelName")) {\r
                                                networkModelName = modelMap.modelName !=null ? modelMap.modelName : ""\r
                                        }\r
-                                       if (networkModelInfo.contains("modelType")) {\r
-                                               networkModelType = modelMap.modelType !=null ? modelMap.modelType : ""\r
-                                       }\r
                                        if (networkModelInfo.contains("modelVersion")) {\r
                                                networkModelVersion = modelMap.modelVersion !=null ? modelMap.modelVersion : ""\r
                                        }\r
-                                       if (networkModelInfo.contains("modelCustomizationId")) {\r
-                                           networkModelCustomizationId = modelMap.modelCustomizationId !=null ? modelMap.modelCustomizationId : ""\r
+                                       if (networkModelInfo.contains("modelCustomizationUuid")) {\r
+                                               networkModelCustomizationUuid = modelMap.modelCustomizationUuid !=null ? modelMap.modelCustomizationUuid : ""\r
                                        }\r
-                                       if (networkModelInfo.contains("modelInvariantId")) {\r
-                                               networkModelInvariantId = modelMap.modelInvariantId !=null ? modelMap.modelInvariantId : ""\r
+                                       if (networkModelInfo.contains("modelInvariantUuid")) {\r
+                                               networkModelInvariantUuid = modelMap.modelInvariantUuid !=null ? modelMap.modelInvariantUuid : ""\r
                                        }\r
                                }\r
                        } catch (Exception ex) {\r
@@ -317,12 +320,11 @@ class VidUtils {
                        }\r
                }               \r
                \r
-               def serviceModelVersionId = ""\r
+               def serviceModelUuid = ""\r
                def serviceModelName = ""\r
-               def serviceModelType = ""\r
                def serviceModelVersion = ""\r
-               def serviceModelCustomizationId = ""\r
-               def serviceModelInvariantId = ""\r
+               def serviceModelCustomizationUuid = ""\r
+               def serviceModelInvariantUuid = ""\r
                \r
                // verify the DB Catalog response JSON structure\r
                def serviceModelInfo = execution.getVariable("serviceModelInfo")\r
@@ -331,23 +333,20 @@ class VidUtils {
                        try {\r
                                Map modelMap = jsonServiceSlurper.parseText(serviceModelInfo)\r
                                if (modelMap != null) {\r
-                                       if (serviceModelInfo.contains("modelVersionId")) {\r
-                                               serviceModelVersionId = modelMap.modelVersionId !=null ? modelMap.modelVersionId : ""\r
+                                       if (serviceModelInfo.contains("modelUuid")) {\r
+                                               serviceModelUuid = modelMap.modelUuid !=null ? modelMap.modelUuid : ""\r
                                        }\r
                                        if (serviceModelInfo.contains("modelName")) {\r
                                                serviceModelName = modelMap.modelName !=null ? modelMap.modelName : ""\r
                                        }\r
-                                       if (serviceModelInfo.contains("modelType")) {\r
-                                               serviceModelType = modelMap.modelType !=null ? modelMap.modelType : ""\r
-                                       }\r
                                        if (serviceModelInfo.contains("modelVersion")) {\r
                                                serviceModelVersion = modelMap.modelVersion !=null ? modelMap.modelVersion : ""\r
                                        }\r
-                                       if (serviceModelInfo.contains("modelCustomizationId")) {\r
-                                               serviceModelCustomizationId = modelMap.modelCustomizationId !=null ? modelMap.modelCustomizationId : ""\r
+                                       if (serviceModelInfo.contains("modelCustomizationUuid")) {\r
+                                               serviceModelCustomizationUuid = modelMap.modelCustomizationUuid !=null ? modelMap.modelCustomizationUuid : ""\r
                                        }\r
-                                       if (serviceModelInfo.contains("modelInvariantId")) {\r
-                                               serviceModelInvariantId = modelMap.modelInvariantId !=null ? modelMap.modelInvariantId : ""\r
+                                       if (serviceModelInfo.contains("modelInvariantUuid")) {\r
+                                               serviceModelInvariantUuid = modelMap.modelInvariantUuid !=null ? modelMap.modelInvariantUuid : ""\r
                                        }\r
                                }\r
                        } catch (Exception ex) {\r
@@ -399,7 +398,7 @@ class VidUtils {
                 <network-inputs> \r
                        <network-id>${networkId}</network-id> \r
                        <network-name>${networkName}</network-name> \r
-                       <network-type>${networkModelType}</network-type>\r
+                       <network-type>${networkModelName}</network-type>\r
                        <subscription-service-type>${subscriptionServiceType}</subscription-service-type>\r
             <global-customer-id>${globalSubscriberId}</global-customer-id>\r
                        <aic-cloud-region>${aicCloudReqion}</aic-cloud-region> \r
@@ -409,19 +408,18 @@ class VidUtils {
                        <failIfExist>${failIfExist}</failIfExist>\r
             <networkModelInfo>\r
               <modelName>${networkModelName}</modelName>\r
-              <modelUuid>${networkModelVersionId}</modelUuid>\r
-              <modelInvariantUuid>${networkModelInvariantId}</modelInvariantUuid>            \r
+              <modelUuid>${networkModelUuid}</modelUuid>\r
+              <modelInvariantUuid>${networkModelInvariantUuid}</modelInvariantUuid>            \r
               <modelVersion>${networkModelVersion}</modelVersion>\r
-              <modelCustomizationUuid>${networkModelCustomizationId}</modelCustomizationUuid>\r
-              <modelType>${networkModelType}</modelType>              \r
+              <modelCustomizationUuid>${networkModelCustomizationUuid}</modelCustomizationUuid>\r
                    </networkModelInfo>\r
             <serviceModelInfo>\r
               <modelName>${serviceModelName}</modelName>\r
-              <modelUuid>${serviceModelVersionId}</modelUuid>\r
-              <modelInvariantUuid>${serviceModelInvariantId}</modelInvariantUuid>            \r
+              <modelUuid>${serviceModelUuid}</modelUuid>\r
+              <modelInvariantUuid>${serviceModelInvariantUuid}</modelInvariantUuid>            \r
               <modelVersion>${serviceModelVersion}</modelVersion>\r
-              <modelCustomizationUuid>${serviceModelCustomizationId}</modelCustomizationUuid>\r
-              <modelType>${serviceModelType}</modelType>              \r
+              <modelCustomizationUuid>${serviceModelCustomizationUuid}</modelCustomizationUuid>\r
+             \r
                    </serviceModelInfo>                                                                                                 \r
             <sdncVersion>${sdncVersion}</sdncVersion>                    \r
                 </network-inputs>\r
@@ -504,9 +502,9 @@ class VidUtils {
                def serviceId = requestMap.requestDetails?.requestParameters?.serviceId ?: ''\r
                def aicCloudRegion = requestMap.requestDetails?.cloudConfiguration?.lcpCloudRegionId ?: ''\r
                def tenantId = requestMap.requestDetails?.cloudConfiguration?.tenantId ?: ''\r
-               def personaModelId = requestMap.requestDetails?.modelInfo?.modelInvariantId ?: ''\r
-               def personaModelVersion = requestMap.requestDetails?.modelInfo?.modelVersion ?: ''\r
-               def modelCustomizationId = requestMap.requestDetails?.modelInfo?.modelCustomizationId ?: ''\r
+               def personaModelId = requestMap.requestDetails?.modelInfo?.modelInvariantUuid ?: ''\r
+               def personaModelVersion = requestMap.requestDetails?.modelInfo?.modelUuid ?: ''\r
+               def modelCustomizationId = requestMap.requestDetails?.modelInfo?.modelCustomizationUuid ?: ''\r
                \r
                def xmlReq = """\r
                <vnf-request>\r