Update AAI Need More Params

Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f0643f5
Issue-ID: SO-578
Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstance.groovy
index dff1ecf..74c991e 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstance.groovy
@@ -126,11 +126,16 @@ public class DoUpdateE2EServiceInstance extends AbstractServiceTaskProcessor {
                        \r
                        // user params\r
                        String uuiRequest = execution.getVariable("uuiRequest")\r
+            \r
+                       // target model Invariant uuid\r
+                       String modelInvariantUuid = jsonUtil.getJsonValue(uuiRequest, "service.serviceInvariantUuid")\r
+                       execution.setVariable("modelInvariantUuid", modelInvariantUuid)            \r
+                       utils.log("INFO", "modelInvariantUuid: " + modelInvariantUuid, isDebugEnabled)            \r
+            \r
                        // target model uuid\r
                        String modelUuid = jsonUtil.getJsonValue(uuiRequest, "service.serviceUuid")\r
-                       execution.setVariable("modelUuid", modelUuid)\r
-                       \r
-                       utils.log("INFO","modelUuid: " + modelUuid, isDebugEnabled)\r
+                       execution.setVariable("modelUuid", modelUuid)                   \r
+                       utils.log("INFO", "modelUuid: " + modelUuid, isDebugEnabled)\r
                                \r
                } catch (BpmnError e) {\r
                        throw e;\r
@@ -327,9 +332,20 @@ public class DoUpdateE2EServiceInstance extends AbstractServiceTaskProcessor {
                String msg = ""\r
                utils.log("INFO"," ***** preProcessAAIPUT *****",  isDebugEnabled)\r
 \r
-               String modelUuid = execution.getVariable("modelUuid")\r
+\r
                String serviceInstanceVersion = execution.getVariable("serviceInstanceVersion")\r
-               execution.setVariable("GENPS_serviceResourceVersion", serviceInstanceVersion)\r
+               //execution.setVariable("GENPS_serviceResourceVersion", serviceInstanceVersion)\r
+        \r
+               //requestDetails.modelInfo.for AAI PUT servieInstanceData\r
+               //requestDetails.requestInfo. for AAI GET/PUT serviceInstanceData\r
+               String serviceInstanceName = execution.getVariable("serviceInstanceName")\r
+               String serviceInstanceId = execution.getVariable("serviceInstanceId")\r
+               //aai serviceType and Role can be setted as fixed value now.\r
+               String aaiServiceType = "E2E Service"\r
+               String aaiServiceRole = "E2E Service"\r
+               String modelInvariantUuid = execution.getVariable("modelInvariantUuid")\r
+               String modelUuid = execution.getVariable("modelUuid")\r
+\r
 \r
                AaiUtil aaiUriUtil = new AaiUtil(this)\r
                utils.log("INFO","start create aai uri: " + aaiUriUtil, isDebugEnabled) \r
@@ -341,7 +357,13 @@ public class DoUpdateE2EServiceInstance extends AbstractServiceTaskProcessor {
                //update target model to aai\r
                String serviceInstanceData =\r
                                """<service-instance xmlns=\"${namespace}\">\r
-                              <model-version-id">${modelUuid}</model-version-id>\r
+                    <service-instance-id>${serviceInstanceId}</service-instance-id>\r
+                    <service-instance-name>${serviceInstanceName}</service-instance-name>\r
+                    <service-type>${aaiServiceType}</service-type>\r
+                    <service-role>${aaiServiceRole}</service-role>\r
+                    <resource-version>${serviceInstanceVersion}</resource-version>\r
+                    <model-invariant-id>${modelInvariantUuid}</model-invariant-id>\r
+                    <model-version-id>${modelUuid}</model-version-id>                    \r
                                 </service-instance>""".trim()\r
 \r
                execution.setVariable("serviceInstanceData", serviceInstanceData)\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstanceRollback.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstanceRollback.groovy
index 1e70f95..a55ca02 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstanceRollback.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstanceRollback.groovy
@@ -25,7 +25,9 @@ import groovy.xml.XmlUtil
 import groovy.json.*
 
 import org.openecomp.mso.bpmn.core.json.JsonUtils
+import org.openecomp.mso.bpmn.common.scripts.AaiUtil
 import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor
+import org.openecomp.mso.bpmn.common.scripts.ExceptionUtil
 import org.openecomp.mso.bpmn.common.scripts.SDNCAdapterUtils
 import org.openecomp.mso.bpmn.core.RollbackData
 import org.openecomp.mso.bpmn.core.WorkflowException
@@ -64,6 +66,7 @@ import org.springframework.web.util.UriUtils;
 public class DoUpdateE2EServiceInstanceRollback extends AbstractServiceTaskProcessor{
 
        String Prefix="DUPDSIRB_"
+       ExceptionUtil exceptionUtil = new ExceptionUtil()
 
        public void preProcessRequest(DelegateExecution execution) {
                def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
@@ -259,13 +262,36 @@ public class DoUpdateE2EServiceInstanceRollback extends AbstractServiceTaskProce
                String msg = ""
                utils.log("INFO"," ***** preProcessAAIPUT *****",  isDebugEnabled)
 
-               String modelUuid = execution.getVariable("model-version-id-original")
                String serviceInstanceVersion = execution.getVariable("serviceInstanceVersion_n")
-               execution.setVariable("GENPS_serviceResourceVersion", serviceInstanceVersion)
+//             execution.setVariable("GENPS_serviceResourceVersion", serviceInstanceVersion)
+        
+               //requestDetails.modelInfo.for AAI PUT servieInstanceData
+               //requestDetails.requestInfo. for AAI GET/PUT serviceInstanceData
+               String serviceInstanceName = execution.getVariable("serviceInstanceName")
+               String serviceInstanceId = execution.getVariable("serviceInstanceId")
+               //aai serviceType and Role can be setted as fixed value now.
+               String aaiServiceType = "E2E Service"
+               String aaiServiceRole = "E2E Service"
+               String modelInvariantUuid = execution.getVariable("modelInvariantUuid")
+               String modelUuid = execution.getVariable("model-version-id-original")
+
+               //AAI PUT      
+               AaiUtil aaiUriUtil = new AaiUtil(this)
+               utils.log("INFO","start create aai uri: " + aaiUriUtil, isDebugEnabled)
+               String aai_uri = aaiUriUtil.getBusinessCustomerUri(execution)
+               utils.log("INFO","aai_uri: " + aai_uri, isDebugEnabled)
+               String namespace = aaiUriUtil.getNamespaceFromUri(aai_uri)
+               utils.log("INFO","namespace: " + namespace, isDebugEnabled)
 
                String serviceInstanceData =
                                """<service-instance xmlns=\"${namespace}\">
-                              <resource-version">${modelUuid}</resource-version>
+                    <service-instance-id>${serviceInstanceId}</service-instance-id>
+                    <service-instance-name>${serviceInstanceName}</service-instance-name>
+                    <service-type>${aaiServiceType}</service-type>
+                    <service-role>${aaiServiceRole}</service-role>
+                    <resource-version>${serviceInstanceVersion}</resource-version>
+                    <model-invariant-id>${modelInvariantUuid}</model-invariant-id>
+                    <model-version-id>${modelUuid}</model-version-id>   
                                 </service-instance>""".trim()
 
                execution.setVariable("serviceInstanceData", serviceInstanceData)

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateCustomE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateCustomE2EServiceInstance.groovy
index a964a7e..f3f1a96 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateCustomE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateCustomE2EServiceInstance.groovy
@@ -413,7 +413,6 @@ public class UpdateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                             <ns:updateServiceOperationStatus xmlns:ns="http://org.openecomp.mso/requestsdb">
                             <serviceId>${serviceId}</serviceId>
                             <operationId>${operationId}</operationId>
-                            <serviceName>${serviceName}</serviceName>
                             <operationType>${operationType}</operationType>
                             <userId>${userId}</userId>
                             <result>${result}</result>

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn
index 35cd039..41c9a67 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoUpdateE2EServiceInstance.bpmn
@@ -156,17 +156,17 @@ csi.postConfigRequest(execution)]]></bpmn2:script>
       <bpmn2:scriptTask id="ScriptTask_1awrp72" name="Pre Process Exception" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_05j3sat</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_19ly8h7</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*\r
-def dcsi = new DoCreateResources()\r
-dcsi.preProcessRollback(execution)\r
+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def dcsi = new DoUpdateE2EServiceInstance()
+dcsi.preProcessRollback(execution)
 ]]></bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:scriptTask id="ScriptTask_0vc9jgo" name="Post Process Exception" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_19ly8h7</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_02znk15</bpmn2:outgoing>
-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*\r
-def dcsi = new DoCreateResources()\r
-dcsi.postProcessRollback(execution)\r
+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def dcsi = new DoUpdateE2EServiceInstance()
+dcsi.postProcessRollback(execution)
 ]]></bpmn2:script>
       </bpmn2:scriptTask>
       <bpmn2:sequenceFlow id="SequenceFlow_05j3sat" sourceRef="StartEvent_06768u3" targetRef="ScriptTask_1awrp72" />