1 files changed, 27 insertions, 11 deletions

diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CloudRegionRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CloudRegionRequest.java
index 9897fbf..eed22f7 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CloudRegionRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CloudRegionRequest.java
@@ -24,21 +24,24 @@ package org.openecomp.sdnc.sli.aai;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 
 import org.openecomp.sdnc.sli.aai.data.AAIDatum;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Joiner;
 
-import org.openecomp.aai.inventory.v8.CloudRegion;
+import org.openecomp.aai.inventory.v10.CloudRegion;
 
 public class CloudRegionRequest extends AAIRequest {
 
 	public static final String CLOUD_REGION_PATH	= "org.openecomp.sdnc.sli.aai.path.cloud.region";
-	
+
 	private final String cloud_region_path;
-	
+
 	public static final String CLOUD_REGION_CLOUD_OWNER	= "cloud-region.cloud-owner";
 	public static final String CLOUD_REGION_CLOUD_REGION_ID	= "cloud-region.cloud-region-id";
 
@@ -51,7 +54,7 @@ public class CloudRegionRequest extends AAIRequest {
 	public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException {
 		return this.getRequestUrl(method, null);
 	}
-	
+
 	@Override
 	public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException {
 
@@ -59,13 +62,25 @@ public class CloudRegionRequest extends AAIRequest {
 
 		request_url = processPathData(request_url, requestProperties);
 
+		Map<String, String> query = new HashMap<String, String>();
+		if(requestProperties.containsKey(DEPTH)) {
+			query.put(DEPTH, requestProperties.getProperty(DEPTH));
+		}
+
 		if(resourceVersion != null) {
-			request_url = request_url +"?resource-version="+resourceVersion;
+//			request_url = request_url +"?resource-version="+resourceVersion;
+			query.put(RESOURCE_VERSION, resourceVersion);
+		}
+		
+		if(!query.isEmpty()) {
+			Joiner.MapJoiner mapJoiner = Joiner.on("&").withKeyValueSeparator("=");
+			String queryString = mapJoiner.join(query);
+			request_url = String.format("%s?%s", request_url, queryString);
 		}
 		URL http_req_url =	new URL(request_url);
 
 		aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
-		
+
 		return http_req_url;
 	}
 
@@ -86,10 +101,11 @@ public class CloudRegionRequest extends AAIRequest {
 
 	@Override
 	public String[] getArgsList() {
-		String[] args =  
+		String[] args =
 			{
 				CLOUD_REGION_CLOUD_OWNER,
-				CLOUD_REGION_CLOUD_REGION_ID
+				CLOUD_REGION_CLOUD_REGION_ID,
+				DEPTH
 			};
 
 		return args;
@@ -99,13 +115,13 @@ public class CloudRegionRequest extends AAIRequest {
 	public Class<? extends AAIDatum> getModelClass() {
 		return CloudRegion.class;
 	}
-	
+
 	public static String processPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException {
 
 		if(!requestProperties.containsKey(CLOUD_REGION_CLOUD_OWNER) || !requestProperties.containsKey(CLOUD_REGION_CLOUD_REGION_ID)) {
 			aaiService.logKeyError(String.format("%s,%s", CLOUD_REGION_CLOUD_OWNER, CLOUD_REGION_CLOUD_REGION_ID));
 		}
-		
+
 		String encoded_vnf = encodeQuery(requestProperties.getProperty(CLOUD_REGION_CLOUD_OWNER));
 		request_url = request_url.replace("{cloud-owner}", encoded_vnf) ;
 
@@ -114,7 +130,7 @@ public class CloudRegionRequest extends AAIRequest {
 
 		aaiService.LOGwriteDateTrace("cloud-owner", requestProperties.getProperty(CLOUD_REGION_CLOUD_OWNER));
 		aaiService.LOGwriteDateTrace("cloud-region-id", requestProperties.getProperty(CLOUD_REGION_CLOUD_REGION_ID));
-		
+
 		return request_url;
 	}
 }