Merge "remove unused parameter in methods"

6 files changed, 12 insertions, 24 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 f45e97fa6e..3a20992bdb 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
@@ -341,12 +341,11 @@ public class ReplaceVnfInfra extends VnfCmBase {
 		msoLogger.trace('Entered ' + method)
 
 		try {
-			def transactionLoggingUuid = UUID.randomUUID().toString()
 			AAIRestClientImpl client = new AAIRestClientImpl()
 			AAIValidatorImpl aaiValidator = new AAIValidatorImpl()
 			aaiValidator.setClient(client)
 			def vnfId = execution.getVariable("vnfId")
-			boolean isInMaint = aaiValidator.isVNFLocked(vnfId, transactionLoggingUuid)
+			boolean isInMaint = aaiValidator.isVNFLocked(vnfId)
 			msoLogger.debug("isInMaint result: " + isInMaint)
 			execution.setVariable('isVnfInMaintenance', isInMaint)
 			
@@ -385,12 +384,11 @@ public class ReplaceVnfInfra extends VnfCmBase {
 		execution.setVariable("failedActivity", "AAI")
 
 		try {
-			def transactionLoggingUuid = UUID.randomUUID().toString()
 			AAIRestClientImpl client = new AAIRestClientImpl()
 			AAIValidatorImpl aaiValidator = new AAIValidatorImpl()
 			aaiValidator.setClient(client)
 			def vnfId = execution.getVariable("vnfId")			
-			boolean areLocked = aaiValidator.isPhysicalServerLocked(vnfId, transactionLoggingUuid)
+			boolean areLocked = aaiValidator.isPhysicalServerLocked(vnfId)
 			msoLogger.debug("areLocked result: " + areLocked)
 			execution.setVariable('arePserversLocked', areLocked)
 			
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/UpdateVfModuleInfraV2.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/UpdateVfModuleInfraV2.groovy
index 0972ee184e..1a8df1664f 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/UpdateVfModuleInfraV2.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/UpdateVfModuleInfraV2.groovy
@@ -285,9 +285,8 @@ public class UpdateVfModuleInfraV2 {
 
 		System.out.println("*****************************CheckingPserverFlag*************************")
 		String vnfId = (String)execution.getVariable('vnfId')
-		String uuid = (String)execution.getVariable('moduleUuid')
 		AAIValidatorImpl aaiVI = new AAIValidatorImpl()
-		boolean flag = aaiVI.isPhysicalServerLocked(vnfId, uuid)
+		boolean flag = aaiVI.isPhysicalServerLocked(vnfId)
 	}
 
 	//check to see if the VFFlag is locked
@@ -295,9 +294,8 @@ public class UpdateVfModuleInfraV2 {
 
 		System.out.print("*****************************VfFlagCheck*************************")
 		String vnfId = (String)execution.getVariable('vnfId')
-		String uuid = (String)execution.getVariable('moduleUuid')
 		AAIValidatorImpl aaiVI = new AAIValidatorImpl()
-		boolean flag = aaiVI.isVNFLocked(vnfId, uuid)
+		boolean flag = aaiVI.isVNFLocked(vnfId)
 
 	}
 	//lock the VF Flag
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 4978faf46c..8c1df9b2e7 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
@@ -321,12 +321,11 @@ public class UpdateVnfInfra extends VnfCmBase {
 		msoLogger.trace('Entered ' + method)
 
 		try {
-			def transactionLoggingUuid = UUID.randomUUID().toString()
 			AAIRestClientImpl client = new AAIRestClientImpl()
 			AAIValidatorImpl aaiValidator = new AAIValidatorImpl()
 			aaiValidator.setClient(client)
 			def vnfId = execution.getVariable("vnfId")
-			boolean isInMaint = aaiValidator.isVNFLocked(vnfId, transactionLoggingUuid)
+			boolean isInMaint = aaiValidator.isVNFLocked(vnfId)
 			msoLogger.debug("isInMaint result: " + isInMaint)
 			execution.setVariable('isVnfInMaintenance', isInMaint)
 			
@@ -365,12 +364,11 @@ public class UpdateVnfInfra extends VnfCmBase {
 		execution.setVariable("failedActivity", "AAI")
 
 		try {
-			def transactionLoggingUuid = UUID.randomUUID().toString()
 			AAIRestClientImpl client = new AAIRestClientImpl()
 			AAIValidatorImpl aaiValidator = new AAIValidatorImpl()
 			aaiValidator.setClient(client)
 			def vnfId = execution.getVariable("vnfId")			
-			boolean areLocked = aaiValidator.isPhysicalServerLocked(vnfId, transactionLoggingUuid)
+			boolean areLocked = aaiValidator.isPhysicalServerLocked(vnfId)
 			msoLogger.debug("areLocked result: " + areLocked)
 			execution.setVariable('arePserversLocked', areLocked)
 			
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 fd9d9cc8a3..ae89fa52dd 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
@@ -167,12 +167,11 @@ public abstract class VnfCmBase extends AbstractServiceTaskProcessor {
 		msoLogger.trace('Entered ' + method)
 
 		try {
-			def transactionLoggingUuid = UUID.randomUUID().toString()
 			AAIRestClientImpl client = new AAIRestClientImpl()
 			AAIValidatorImpl aaiValidator = new AAIValidatorImpl()
 			aaiValidator.setClient(client)
 			def vnfId = execution.getVariable("vnfId")
-			boolean isInMaint = aaiValidator.isVNFLocked(vnfId, transactionLoggingUuid)
+			boolean isInMaint = aaiValidator.isVNFLocked(vnfId)
 			msoLogger.debug("isInMaint result: " + isInMaint)
 			execution.setVariable('isVnfInMaintenance', isInMaint)
 			
@@ -355,12 +354,11 @@ public abstract class VnfCmBase extends AbstractServiceTaskProcessor {
 		execution.setVariable("failedActivity", "AAI")
 
 		try {
-			def transactionLoggingUuid = UUID.randomUUID().toString()
 			AAIRestClientImpl client = new AAIRestClientImpl()
 			AAIValidatorImpl aaiValidator = new AAIValidatorImpl()
 			aaiValidator.setClient(client)
 			def vnfId = execution.getVariable("vnfId")			
-			boolean areLocked = aaiValidator.isPhysicalServerLocked(vnfId, transactionLoggingUuid)
+			boolean areLocked = aaiValidator.isPhysicalServerLocked(vnfId)
 			msoLogger.debug("areLocked result: " + areLocked)
 			execution.setVariable('arePserversLocked', areLocked)
 			
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 8ca2871916..7de3359f51 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
@@ -219,12 +219,11 @@ public class VnfConfigUpdate extends VnfCmBase {
 		msoLogger.trace('Entered ' + method)
 
 		try {
-			def transactionLoggingUuid = UUID.randomUUID().toString()
 			AAIRestClientImpl client = new AAIRestClientImpl()
 			AAIValidatorImpl aaiValidator = new AAIValidatorImpl()
 			aaiValidator.setClient(client)
 			def vnfId = execution.getVariable("vnfId")
-			boolean isInMaint = aaiValidator.isVNFLocked(vnfId, transactionLoggingUuid)
+			boolean isInMaint = aaiValidator.isVNFLocked(vnfId)
 			msoLogger.debug("isInMaint result: " + isInMaint)
 			execution.setVariable('isVnfInMaintenance', isInMaint)
 			
@@ -262,12 +261,11 @@ public class VnfConfigUpdate extends VnfCmBase {
 		execution.setVariable("failedActivity", "AAI")
 
 		try {
-			def transactionLoggingUuid = UUID.randomUUID().toString()
 			AAIRestClientImpl client = new AAIRestClientImpl()
 			AAIValidatorImpl aaiValidator = new AAIValidatorImpl()
 			aaiValidator.setClient(client)
 			def vnfId = execution.getVariable("vnfId")			
-			boolean areLocked = aaiValidator.isPhysicalServerLocked(vnfId, transactionLoggingUuid)
+			boolean areLocked = aaiValidator.isPhysicalServerLocked(vnfId)
 			msoLogger.debug("areLocked result: " + areLocked)
 			execution.setVariable('arePserversLocked', areLocked)
 			
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 2c1b66ded5..f6788fb745 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
@@ -240,12 +240,11 @@ public class VnfInPlaceUpdate extends VnfCmBase {
 		msoLogger.trace('Entered ' + method)
 
 		try {
-			def transactionLoggingUuid = UUID.randomUUID().toString()
 			AAIRestClientImpl client = new AAIRestClientImpl()
 			AAIValidatorImpl aaiValidator = new AAIValidatorImpl()
 			aaiValidator.setClient(client)
 			def vnfId = execution.getVariable("vnfId")
-			boolean isInMaint = aaiValidator.isVNFLocked(vnfId, transactionLoggingUuid)
+			boolean isInMaint = aaiValidator.isVNFLocked(vnfId)
 			msoLogger.debug("isInMaint result: " + isInMaint)
 			execution.setVariable('isVnfInMaintenance', isInMaint)
 
@@ -284,12 +283,11 @@ public class VnfInPlaceUpdate extends VnfCmBase {
 		execution.setVariable("failedActivity", "AAI")
 
 		try {
-			def transactionLoggingUuid = UUID.randomUUID().toString()
 			AAIRestClientImpl client = new AAIRestClientImpl()
 			AAIValidatorImpl aaiValidator = new AAIValidatorImpl()
 			aaiValidator.setClient(client)
 			def vnfId = execution.getVariable("vnfId")
-			boolean areLocked = aaiValidator.isPhysicalServerLocked(vnfId, transactionLoggingUuid)
+			boolean areLocked = aaiValidator.isPhysicalServerLocked(vnfId)
 			msoLogger.debug("areLocked result: " + areLocked)
 			execution.setVariable('arePserversLocked', areLocked)