Implement a separate task to query CatalogDB for

Restore script value for the script task
Implement a separate task to query CatalogDB for CloudSite info for CM
flows.

Change-Id: Id9dc4da9a7d50b50b691f30a8e0a5ce68eec1739
Issue-ID: SO-1586
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

1 files changed, 1 insertions, 19 deletions

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 4237a8d6a4..32fc46a84f 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
@@ -264,24 +264,8 @@ public abstract class VnfCmBase extends AbstractServiceTaskProcessor {
 					execution.setVariable("vmIdList", vmidsArray.toString())
 					execution.setVariable("vserverIdList", vserveridsArray.toString())
 				}
-			}
-						
-			if (cloudRegionId != null) {			
-				AAIUri cloudRegionUri = AAIUriFactory.createResourceUri(AAIObjectType.DEFAULT_CLOUD_REGION, cloudRegionId)				
-				// Check if this client region exists
-				if (!client.exists(cloudRegionUri)) {
-					msoLogger.debug("Cloud Region with cloudRegionId " + cloudRegionId + " does not exist in A&AI")
-					exceptionUtil.buildAndThrowWorkflowException(execution, 404, "Cloud Region with cloudRegionId " + cloudRegionId + " does not exist in A&AI")
-				}
-			
-				AAIResultWrapper aaiRWCloud = client.get(cloudRegionUri)
+			}					
 			
-				Map<String, Object> resultCloud = aaiRWCloud.asMap()			
-			
-				String aicIdentity = resultCloud.get("identity-url")
-				msoLogger.debug("aicIdentity from A&AI is: " + aicIdentity)
-				execution.setVariable("aicIdentity", aicIdentity)
-			}
 			// preserve relationships if exist
 			Optional<Relationships> relationships = aaiRW.getRelationships()
 			
@@ -825,7 +809,5 @@ public abstract class VnfCmBase extends AbstractServiceTaskProcessor {
 		}
 		msoLogger.trace("Exit postProcessRollback ")
 	}
- 
-
 	
 }