Dynamic Cloud Owner Support

added in cloud configuration object to request params
Fix Bean scanning so it picks up the resttemplate
removed unnecessary RestTemplate Bean configurations
corrected typo in CloudConfiguration class
updated gr api test cases with dynamic cloud owner
updated groovy files to allow for dynamic cloud owner values
updated GR API layer to include cloud owner
added enum for default cloud owner
add cloud owner variable to camunda in mapping
removed references to att-aic from BBInputSetup
updated aai schema dependency to 1.3.1 from 1.3.0
Fixed incorrect type AAIUri and updated logging in the method.
use existing service instance id instead of generating
Pass cloudOwner to process to propagate to subprocesses.

NOTE: our aai-schema dependency is 1.3.1-SNAPSHOT to be
compatible with the cloud owner changes here.  The
releaesed 1.3.0 version is NOT compatible.

Change-Id: I43b46774b77981d1c8bfe7c7a79b9434889e62ae
Issue-ID: SO-1128
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Signed-off-by: Rob Daugherty <rd472p@att.com>

2 files changed, 117 insertions, 6 deletions

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/aai/groovyflows/AAICreateResources.java b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/aai/groovyflows/AAICreateResources.java
index c04c2dc15b..6062129a71 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/aai/groovyflows/AAICreateResources.java
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/aai/groovyflows/AAICreateResources.java
@@ -70,7 +70,7 @@ public class AAICreateResources {
 		AAIResourcesClient aaiRC = new AAIResourcesClient();
 		return aaiRC.get(OwningEntities.class,
 				AAIUriFactory
-						.createResourceUri(AAIObjectPlurals.OWNING_ENTITIES)
+						.createResourceUri(AAIObjectPlurals.OWNING_ENTITY)
 						.queryParam("owning-entity-name", owningEntityName))
 				.orElseGet(() -> {
 					msoLogger.debug("No Owning Entity matched by name");
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java
index 5fe28b918b..e753f79ebd 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java
@@ -28,6 +28,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Optional;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.ParseException;
@@ -45,17 +47,27 @@ import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
 import org.camunda.bpm.engine.delegate.DelegateExecution;
 import org.camunda.bpm.engine.runtime.Execution;
+import org.onap.aai.domain.yang.LogicalLink;
+import org.onap.aai.domain.yang.LogicalLinks;
+import org.onap.aai.domain.yang.PInterface;
 import org.onap.so.bpmn.core.UrnPropertiesReader;
-import org.onap.so.bpmn.core.domain.ServiceDecomposition;
 import org.onap.so.bpmn.core.domain.Resource;
+import org.onap.so.bpmn.core.domain.ServiceDecomposition;
 import org.onap.so.bpmn.core.json.JsonUtils;
+import org.onap.so.client.aai.AAIObjectPlurals;
+import org.onap.so.client.aai.AAIObjectType;
+import org.onap.so.client.aai.AAIResourcesClient;
+import org.onap.so.client.aai.entities.AAIResultWrapper;
+import org.onap.so.client.aai.entities.Relationships;
+import org.onap.so.client.aai.entities.uri.AAIResourceUri;
+import org.onap.so.client.aai.entities.uri.AAIUriFactory;
 import org.onap.so.logger.MessageEnum;
 import org.onap.so.logger.MsoLogger;
-import org.onap.so.bpmn.common.scripts.AaiUtil;
+import org.springframework.web.util.UriUtils;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import org.springframework.web.util.UriUtils;
 
 public class ServicePluginFactory {
 
@@ -307,8 +319,7 @@ public class ServicePluginFactory {
 	@SuppressWarnings("unchecked")
 	private void allocateCrossTPResources(DelegateExecution execution, Map<String, Object> serviceRequestInputs) {
 
-		AaiUtil aai = new AaiUtil();
-		Map<String, Object> crossTPs = aai.getTPsfromAAI(execution);
+		Map<String, Object> crossTPs = this.getTPsfromAAI();
 		
 		if(crossTPs == null || crossTPs.isEmpty()) {
 			serviceRequestInputs.put("local-access-provider-id", "");
@@ -338,6 +349,106 @@ public class ServicePluginFactory {
 		return;
 	}
 
+	// This method returns Local and remote TPs information from AAI	
+	public Map getTPsfromAAI() {
+		Map<String, Object> tpInfo = new HashMap<>();
+		
+		AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectPlurals.LOGICAL_LINK);
+		AAIResourcesClient client = new AAIResourcesClient();
+		Optional<LogicalLinks> result = client.get(LogicalLinks.class, uri);
+		
+		if (result.isPresent()) {
+			LogicalLinks links = result.get();
+			boolean isRemoteLink = false;
+			
+			links.getLogicalLink();
+			
+			for (LogicalLink link : links.getLogicalLink()) {
+				AAIResultWrapper wrapper = new AAIResultWrapper(link);
+				Optional<Relationships> optRelationships = wrapper.getRelationships();
+				List<AAIResourceUri> pInterfaces = new ArrayList<>();
+				if (optRelationships.isPresent()) {
+					Relationships relationships = optRelationships.get();
+					if (!relationships.getRelatedAAIUris(AAIObjectType.EXT_AAI_NETWORK).isEmpty()) {
+						isRemoteLink = true;
+					}
+					pInterfaces.addAll(relationships.getRelatedAAIUris(AAIObjectType.P_INTERFACE));
+				}
+				
+				if (isRemoteLink) {
+					// find remote p interface
+					AAIResourceUri localTP = null;
+					AAIResourceUri remoteTP = null;
+
+					AAIResourceUri pInterface0 = pInterfaces.get(0);
+
+					if (isRemotePInterface(client, pInterface0)) {
+						remoteTP = pInterfaces.get(0);
+						localTP = pInterfaces.get(1);
+					} else {
+						localTP = pInterfaces.get(0);
+						remoteTP = pInterfaces.get(1);
+					}
+
+					if (localTP != null && remoteTP != null) {
+						// give local tp
+						String tpUrl = localTP.build().toString();
+						PInterface intfLocal = client.get(PInterface.class, localTP).get();
+						tpInfo.put("local-access-node-id", tpUrl.split("/")[6]);
+					
+						String[] networkRef = intfLocal.getNetworkRef().split("/");
+						if (networkRef.length == 6) {
+							tpInfo.put("local-access-provider-id", networkRef[1]);
+							tpInfo.put("local-access-client-id", networkRef[3]);
+							tpInfo.put("local-access-topology-id", networkRef[5]);
+						}
+						String ltpIdStr = tpUrl.substring(tpUrl.lastIndexOf("/") + 1);
+						if (ltpIdStr.contains("-")) {
+							tpInfo.put("local-access-ltp-id", ltpIdStr.substring(ltpIdStr.lastIndexOf("-") + 1));
+						}
+						
+						// give remote tp
+						tpUrl = remoteTP.build().toString();
+						PInterface intfRemote = client.get(PInterface.class, remoteTP).get();
+						tpInfo.put("remote-access-node-id", tpUrl.split("/")[6]);
+
+						String[] networkRefRemote = intfRemote.getNetworkRef().split("/");
+
+						if (networkRefRemote.length == 6) {
+							tpInfo.put("remote-access-provider-id", networkRefRemote[1]);
+							tpInfo.put("remote-access-client-id", networkRefRemote[3]);
+							tpInfo.put("remote-access-topology-id", networkRefRemote[5]);
+						}
+						String ltpIdStrR = tpUrl.substring(tpUrl.lastIndexOf("/") + 1);
+						if (ltpIdStrR.contains("-")) {
+							tpInfo.put("remote-access-ltp-id", ltpIdStrR.substring(ltpIdStr.lastIndexOf("-") + 1));
+						}
+						return tpInfo;
+					}
+				}
+			}
+		}
+		return tpInfo;
+	}
+
+	// this method check if pInterface is remote
+	private boolean isRemotePInterface(AAIResourcesClient client, AAIResourceUri uri) {
+		
+		Map<String, String> keys = uri.getURIKeys();
+		String uriString = uri.build().toString();
+		AAIResourceUri parent = AAIUriFactory.createResourceUri(AAIObjectType.PNF, keys.get("pnf-name"));
+		
+		AAIResultWrapper wrapper = client.get(parent);
+		Optional<Relationships> optRelationships = wrapper.getRelationships();
+		if (optRelationships.isPresent()) {
+			Relationships relationships = optRelationships.get();
+			
+			return !relationships.getRelatedAAIUris(AAIObjectType.EXT_AAI_NETWORK).isEmpty();
+		}
+		
+		return false;
+	}
+
 	public String preProcessService(ServiceDecomposition serviceDecomposition, String uuiRequest) {
 
 		// now only for sotn