X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=bpmn%2FMSOCommonBPMN%2Fsrc%2Fmain%2Fgroovy%2Forg%2Fonap%2Fso%2Fbpmn%2Fcommon%2Fscripts%2FSDNCAdapterUtils.groovy;h=32d1ee74bf0d81f8d60a3bcd9e870921429796f0;hb=a8f7d742c1368e640a05c45ebc7c30bb4dff8385;hp=58c8f27de9d735c55efe98dd6756261ea7074f49;hpb=f2afd9880e409317626f393ab6d0a414a80653de;p=so.git

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterUtils.groovy
index 58c8f27de9..32d1ee74bf 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SDNCAdapterUtils.groovy
@@ -20,9 +20,9 @@
 
 package org.onap.so.bpmn.common.scripts;
 
-import org.apache.commons.lang3.*
 import org.camunda.bpm.engine.delegate.BpmnError
 import org.camunda.bpm.engine.delegate.DelegateExecution
+import org.onap.aai.domain.yang.L3Network
 import org.onap.so.bpmn.core.WorkflowException
 import org.onap.so.bpmn.core.json.JsonUtils;
 import org.springframework.web.util.UriUtils
@@ -495,7 +495,7 @@ class SDNCAdapterUtils {
 	 * @param additionalData additional XML content to be inserted into the
 	 *   RequestData element (may be null)
 	 */
-	 public String sdncTopologyRequestV2 (DelegateExecution execution, String requestXML, String serviceInstanceId, String callbackUrl, String action, String requestAction, String cloudRegionId, networkId, String queryAAIResponse, String additionalData) {
+	 public String sdncTopologyRequestV2 (DelegateExecution execution, String requestXML, String serviceInstanceId, String callbackUrl, String action, String requestAction, String cloudRegionId, networkId, L3Network queryAAIResponse, String additionalData) {
 		 def utils=new MsoUtils()
 
 		 // SNDC is expecting request Id for header as unique each call.
@@ -526,7 +526,7 @@ class SDNCAdapterUtils {
 
 		 // Replace/Use the value of network-type from aai query (vs input) during Delete Network flows.
 		 if (queryAAIResponse != null) {
-		     networkType = utils.getNodeText(queryAAIResponse, "network-type")
+		     networkType = queryAAIResponse.getNetworkType()
 		 }
 
 		 String serviceId = ""
@@ -536,7 +536,7 @@ class SDNCAdapterUtils {
 		 String networkName = ""
 		 // Replace/Use the value of network-name from aai query (vs input) if it was already set in AAI
 		 if (queryAAIResponse != null) {
-			 networkName = utils.getNodeText(queryAAIResponse, "network-name")
+			 networkName = queryAAIResponse.getNetworkName()
 		 }
 		 if (networkName.isEmpty() && utils.nodeExists(requestXML, "network-name")) {
 			 networkName = utils.getNodeText(requestXML, "network-name")