Merge "remove unused uuid parameter"

5 files changed, 10 insertions, 20 deletions

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/ReplaceVnfInfra.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/ReplaceVnfInfra.groovy
index 3a20992bdb..671796f27f 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/ReplaceVnfInfra.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/ReplaceVnfInfra.groovy
@@ -431,17 +431,16 @@ public class ReplaceVnfInfra extends VnfCmBase {
 		execution.setVariable("failedActivity", "AAI")
 
 		try {
-			def transactionLoggingUuid = UUID.randomUUID().toString()
 			AAIRestClientImpl client = new AAIRestClientImpl()
 			AAIUpdatorImpl aaiUpdator = new AAIUpdatorImpl()
 			aaiUpdator.setClient(client)
 			def vnfId = execution.getVariable("vnfId")
 			if (inMaint) {
-				aaiUpdator.updateVnfToLocked(vnfId, transactionLoggingUuid)
+				aaiUpdator.updateVnfToLocked(vnfId)
 				execution.setVariable("rollbackSetVnfInMaintenanceFlag", true)
 			}
 			else {
-				aaiUpdator.updateVnfToUnLocked(vnfId, transactionLoggingUuid)
+				aaiUpdator.updateVnfToUnLocked(vnfId)
 			}
 							
 			msoLogger.trace('Exited ' + method)
@@ -451,7 +450,6 @@ public class ReplaceVnfInfra extends VnfCmBase {
 			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
 			execution.setVariable("errorCode", "1002")
 			execution.setVariable("errorText", e.getMessage())
-			//exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in setVnfInMaintFlagInAAI(): ' + e.getMessage())
 		}
 	}
 	
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/UpdateVnfInfra.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/UpdateVnfInfra.groovy
index 8c1df9b2e7..f8d73ce020 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/UpdateVnfInfra.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/UpdateVnfInfra.groovy
@@ -411,17 +411,16 @@ public class UpdateVnfInfra extends VnfCmBase {
 		execution.setVariable("failedActivity", "AAI")
 
 		try {
-			def transactionLoggingUuid = UUID.randomUUID().toString()
 			AAIRestClientImpl client = new AAIRestClientImpl()
 			AAIUpdatorImpl aaiUpdator = new AAIUpdatorImpl()
 			aaiUpdator.setClient(client)
 			def vnfId = execution.getVariable("vnfId")
 			if (inMaint) {
-				aaiUpdator.updateVnfToLocked(vnfId, transactionLoggingUuid)
+				aaiUpdator.updateVnfToLocked(vnfId)
 				execution.setVariable("rollbackSetVnfInMaintenanceFlag", true)
 			}
 			else {
-				aaiUpdator.updateVnfToUnLocked(vnfId, transactionLoggingUuid)
+				aaiUpdator.updateVnfToUnLocked(vnfId)
 			}
 							
 			msoLogger.trace('Exited ' + method)
@@ -431,7 +430,6 @@ public class UpdateVnfInfra extends VnfCmBase {
 			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
 			execution.setVariable("errorCode", "1002")
 			execution.setVariable("errorText", e.getMessage())
-			//exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in setVnfInMaintFlagInAAI(): ' + e.getMessage())
 		}
 	}
 	
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/VnfCmBase.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/VnfCmBase.groovy
index ae89fa52dd..4237a8d6a4 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/VnfCmBase.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/VnfCmBase.groovy
@@ -401,17 +401,16 @@ public abstract class VnfCmBase extends AbstractServiceTaskProcessor {
 		execution.setVariable("failedActivity", "AAI")
 
 		try {
-			def transactionLoggingUuid = UUID.randomUUID().toString()
 			AAIRestClientImpl client = new AAIRestClientImpl()
 			AAIUpdatorImpl aaiUpdator = new AAIUpdatorImpl()
 			aaiUpdator.setClient(client)
 			def vnfId = execution.getVariable("vnfId")
 			if (inMaint) {
-				aaiUpdator.updateVnfToLocked(vnfId, transactionLoggingUuid)
+				aaiUpdator.updateVnfToLocked(vnfId)
 				execution.setVariable("rollbackSetVnfInMaintenanceFlag", true)
 			}
 			else {
-				aaiUpdator.updateVnfToUnLocked(vnfId, transactionLoggingUuid)
+				aaiUpdator.updateVnfToUnLocked(vnfId)
 			}
 							
 			msoLogger.trace('Exited ' + method)
@@ -421,7 +420,6 @@ public abstract class VnfCmBase extends AbstractServiceTaskProcessor {
 			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
 			execution.setVariable("errorCode", "1002")
 			execution.setVariable("errorText", e.getMessage())
-			//exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in setVnfInMaintFlagInAAI(): ' + e.getMessage())
 		}
 	}
 	
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/VnfConfigUpdate.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/VnfConfigUpdate.groovy
index 7de3359f51..89f40ed680 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/VnfConfigUpdate.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/VnfConfigUpdate.groovy
@@ -310,17 +310,16 @@ public class VnfConfigUpdate extends VnfCmBase {
 		execution.setVariable("failedActivity", "AAI")
 
 		try {
-			def transactionLoggingUuid = UUID.randomUUID().toString()
 			AAIRestClientImpl client = new AAIRestClientImpl()
 			AAIUpdatorImpl aaiUpdator = new AAIUpdatorImpl()
 			aaiUpdator.setClient(client)
 			def vnfId = execution.getVariable("vnfId")
 			if (inMaint) {
-				aaiUpdator.updateVnfToLocked(vnfId, transactionLoggingUuid)
+				aaiUpdator.updateVnfToLocked(vnfId)
 				execution.setVariable("rollbackSetVnfInMaintenanceFlag", true)
 			}
 			else {
-				aaiUpdator.updateVnfToUnLocked(vnfId, transactionLoggingUuid)
+				aaiUpdator.updateVnfToUnLocked(vnfId)
 			}
 							
 			msoLogger.trace('Exited ' + method)
@@ -330,7 +329,6 @@ public class VnfConfigUpdate extends VnfCmBase {
 			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
 			execution.setVariable("errorCode", "1002")
 			execution.setVariable("errorText", e.getMessage())
-			//exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in setVnfInMaintFlagInAAI(): ' + e.getMessage())
 		}
 	}
 	
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/VnfInPlaceUpdate.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/VnfInPlaceUpdate.groovy
index f6788fb745..84668a5c61 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/VnfInPlaceUpdate.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/VnfInPlaceUpdate.groovy
@@ -330,17 +330,16 @@ public class VnfInPlaceUpdate extends VnfCmBase {
 		execution.setVariable("failedActivity", "AAI")
 
 		try {
-			def transactionLoggingUuid = UUID.randomUUID().toString()
 			AAIRestClientImpl client = new AAIRestClientImpl()
 			AAIUpdatorImpl aaiUpdator = new AAIUpdatorImpl()
 			aaiUpdator.setClient(client)
 			def vnfId = execution.getVariable("vnfId")
 			if (inMaint) {
-				aaiUpdator.updateVnfToLocked(vnfId, transactionLoggingUuid)
+				aaiUpdator.updateVnfToLocked(vnfId)
 				execution.setVariable("rollbackSetVnfInMaintenanceFlag", true)
 			}
 			else {
-				aaiUpdator.updateVnfToUnLocked(vnfId, transactionLoggingUuid)
+				aaiUpdator.updateVnfToUnLocked(vnfId)
 			}
 
 			msoLogger.trace('Exited ' + method)
@@ -350,7 +349,6 @@ public class VnfInPlaceUpdate extends VnfCmBase {
 			msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION_ARG, 'Caught exception in ' + method, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception is:\n" + e);
 			execution.setVariable("errorCode", "1002")
 			execution.setVariable("errorText", e.getMessage())
-			//exceptionUtil.buildAndThrowWorkflowException(execution, 1002, 'Error in setVnfInMaintFlagInAAI(): ' + e.getMessage())
 		}
 	}