[SDNC-5] summary

Synchronized source code with 17.07 after cleaning up deprecated code

Change-Id: Ieabd58d25bb405ad15ad255e1cf40797e91d937f
Signed-off-by: Rich Tabedzki <richard.tabedzki@att.com>

1 files changed, 37 insertions, 20 deletions

diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv6AddressListRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv6AddressListRequest.java
index da57abf..aa6b098 100644
--- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv6AddressListRequest.java
+++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv6AddressListRequest.java
@@ -31,7 +31,7 @@ import org.openecomp.sdnc.sli.aai.data.AAIDatum;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import org.openecomp.aai.inventory.v8.L3InterfaceIpv6AddressList;
+import org.openecomp.aai.inventory.v10.L3InterfaceIpv6AddressList;
 
 public class L3InterfaceIpv6AddressListRequest extends AAIRequest {
 
@@ -60,16 +60,17 @@ public class L3InterfaceIpv6AddressListRequest extends AAIRequest {
 	 * aaiv7:inventory/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
 	 * aaiv7:inventory/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
 	 */
-	
+
 	public static final String L3_INTERFACE_IPV6_ADDRESS_LIST_PATH	= "org.openecomp.sdnc.sli.aai.path.l3.interface.ipv6.address.list";
 	public static final String VLAN_L3_INTERFACE_IPV6_ADDRESS_LIST_PATH	= "org.openecomp.sdnc.sli.aai.path.vlan.l3.interface.ipv6.address.list";
-	
+
 	private final String l3_interface_ipv6_address_list_path;
 	private final String vlan_l3_interface_ipv6_address_list_path;
-	
+
 	public static final String L3_INTERFACE_IPV6_ADDRESS		= "l3-interface-ipv6-address";
 	public static final String LIST_L3_INTERFACE_IPV6_ADDRESS	= "l3-interface-ipv6-address-list.l3-interface-ipv6-address";
-
+	public static final String VLAN_INTERFACE	= "vlan-interface";
+	public static final String VLAN_VLAN_INTERFACE	= "vlan.vlan-interface";
 
 	public L3InterfaceIpv6AddressListRequest() {
 		l3_interface_ipv6_address_list_path = configProperties.getProperty(L3_INTERFACE_IPV6_ADDRESS_LIST_PATH);
@@ -80,20 +81,20 @@ public class L3InterfaceIpv6AddressListRequest 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 {
 
 		String request_url = target_uri+l3_interface_ipv6_address_list_path;
 
-		if(requestProperties.containsKey(VLanRequest.VLAN_INTERFACE) || requestProperties.containsKey(VLanRequest.VLAN_VLAN_INTERFACE)){
+		if(requestProperties.containsKey(VLAN_INTERFACE) || requestProperties.containsKey(VLAN_VLAN_INTERFACE)){
 			request_url = target_uri+vlan_l3_interface_ipv6_address_list_path;
-			request_url = VLanRequest.processPathData(request_url, requestProperties);
+			request_url = processVLanRequestPathData(request_url, requestProperties);
 		}
 
 		request_url = processPathData(request_url, requestProperties);
 		request_url = LInterfaceRequest.processPathData(request_url, requestProperties);
-		request_url = GenericVnfRequest.processPathData(request_url, requestProperties);
+//		request_url = GenericVnfRequest.processPathData(request_url, requestProperties);
 
 		if(resourceVersion != null) {
 			request_url = request_url +"?resource-version="+resourceVersion;
@@ -101,10 +102,27 @@ public class L3InterfaceIpv6AddressListRequest extends AAIRequest {
 		URL http_req_url =	new URL(request_url);
 
 		aaiService.LOGwriteFirstTrace(method, http_req_url.toString());
-		
+
 		return http_req_url;
 	}
 
+	public static String processVLanRequestPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException {
+		String key = null;
+
+		if(requestProperties.containsKey(VLAN_VLAN_INTERFACE)) {
+			key = VLAN_VLAN_INTERFACE;
+		} else if(requestProperties.containsKey(VLAN_INTERFACE)) {
+			key = VLAN_INTERFACE;
+		} else {
+			aaiService.logKeyError(String.format("%s,%s", VLAN_INTERFACE, VLAN_VLAN_INTERFACE));
+		}
+
+		String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
+
+		request_url = request_url.replace("{vlan-interface}", encoded_vnf) ;
+		aaiService.LOGwriteDateTrace("vlan-interface", requestProperties.getProperty(key));
+		return request_url;
+	}
 
 	@Override
 	public String toJSONString() {
@@ -122,16 +140,15 @@ public class L3InterfaceIpv6AddressListRequest extends AAIRequest {
 
 	@Override
 	public String[] getArgsList() {
-		String[] args =  
+		String[] args =
 		{
 			L3_INTERFACE_IPV6_ADDRESS,
 			LIST_L3_INTERFACE_IPV6_ADDRESS,
-			VLanRequest.VLAN_INTERFACE,
-			VLanRequest.VLAN_VLAN_INTERFACE,
-			LInterfaceRequest.INTERFACE_NAME, 
+			VLAN_INTERFACE,
+			VLAN_VLAN_INTERFACE,
+			LInterfaceRequest.INTERFACE_NAME,
 			LInterfaceRequest.LINTERFACE_INTERFACE_NAME,
-			GenericVnfRequest.GENERIC_VNF_ID,
-			GenericVnfRequest.VNF_ID
+			"generic-vnf.vnf-id"
 
 		};
 
@@ -142,21 +159,21 @@ public class L3InterfaceIpv6AddressListRequest extends AAIRequest {
 	public Class<? extends AAIDatum> getModelClass() {
 		return L3InterfaceIpv6AddressList.class;
 	}
-	
+
 	public static String processPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException {
 		String key = L3_INTERFACE_IPV6_ADDRESS;
 		if(requestProperties.containsKey(LIST_L3_INTERFACE_IPV6_ADDRESS)) {
 			key = LIST_L3_INTERFACE_IPV6_ADDRESS;
 		}
-		
+
 		if(!requestProperties.containsKey(key)) {
 			aaiService.logKeyError(String.format("%s,%s", L3_INTERFACE_IPV6_ADDRESS, LIST_L3_INTERFACE_IPV6_ADDRESS));
 		}
-		
+
 		String encoded_vnf = encodeQuery(requestProperties.getProperty(key));
 
 		request_url = request_url.replace("{l3-interface-ipv6-address}", encoded_vnf) ;
-		
+
 		aaiService.LOGwriteDateTrace("l3-interface-ipv6-address", requestProperties.getProperty(key));
 		return request_url;
 	}