Updating AAI service adaptor to use version 21 (v21) of the schema model.
[ccsdk/sli/adaptors.git] / aai-service / provider / src / main / java / org / onap / ccsdk / sli / adaptors / aai / AAIService.java
index d3d57ea..4d51550 100755 (executable)
@@ -5,6 +5,8 @@
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
  *             reserved.
  * ================================================================================
+ * Modifications Copyright (C) 2019 IBM.
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
+/**
+ * @author Rich Tabedzki
+ *
+ */
 package org.onap.ccsdk.sli.adaptors.aai;
 
-
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
@@ -45,7 +48,6 @@ import java.security.KeyManagementException;
 import java.security.KeyStore;
 import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -67,46 +69,24 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.SSLSocketFactory;
 import javax.ws.rs.HttpMethod;
-import javax.ws.rs.core.UriBuilder;
 import javax.xml.bind.annotation.XmlElement;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
+import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
+import org.onap.ccsdk.sli.adaptors.aai.data.ErrorResponse;
+import org.onap.ccsdk.sli.adaptors.aai.data.notify.NotifyEvent;
 import org.onap.ccsdk.sli.core.sli.ConfigurationException;
 import org.onap.ccsdk.sli.core.sli.MetricLogger;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource;
-import org.openecomp.aai.inventory.v11.AvailabilityZone;
-import org.openecomp.aai.inventory.v11.Complex;
-import org.openecomp.aai.inventory.v11.CtagPool;
-import org.openecomp.aai.inventory.v11.DvsSwitch;
-import org.openecomp.aai.inventory.v11.GenericVnf;
-import org.openecomp.aai.inventory.v11.L3Network;
-import org.openecomp.aai.inventory.v11.OamNetwork;
-import org.openecomp.aai.inventory.v11.PInterface;
-import org.openecomp.aai.inventory.v11.PhysicalLink;
-import org.openecomp.aai.inventory.v11.Pserver;
-import org.openecomp.aai.inventory.v11.ResultData;
-import org.openecomp.aai.inventory.v11.SearchResults;
-import org.openecomp.aai.inventory.v11.Service;
-import org.openecomp.aai.inventory.v11.ServiceInstance;
-import org.openecomp.aai.inventory.v11.SitePairSet;
-import org.openecomp.aai.inventory.v11.Tenant;
-import org.openecomp.aai.inventory.v11.Vce;
-import org.openecomp.aai.inventory.v11.VnfImage;
-import org.openecomp.aai.inventory.v11.VnfImages;
-import org.openecomp.aai.inventory.v11.Vpe;
-import org.openecomp.aai.inventory.v11.VplsPe;
-import org.openecomp.aai.inventory.v11.VpnBinding;
-import org.openecomp.aai.inventory.v11.Vserver;
-import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
-import org.onap.ccsdk.sli.adaptors.aai.data.ErrorResponse;
-import org.onap.ccsdk.sli.adaptors.aai.data.RequestError;
-import org.onap.ccsdk.sli.adaptors.aai.data.ResourceVersion;
-import org.onap.ccsdk.sli.adaptors.aai.data.ServiceException;
-import org.onap.ccsdk.sli.adaptors.aai.data.notify.NotifyEvent;
-import org.onap.ccsdk.sli.adaptors.aai.data.v1507.VServer;
+import org.onap.aai.inventory.v21.GenericVnf;
+import org.onap.aai.inventory.v21.PhysicalLink;
+import org.onap.aai.inventory.v21.ResultData;
+import org.onap.aai.inventory.v21.SearchResults;
+import org.onap.aai.inventory.v21.Vserver;
+import org.onap.logging.ref.slf4j.ONAPLogConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
@@ -118,8 +98,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
-import com.sun.jersey.api.client.config.DefaultClientConfig;
-import com.sun.jersey.client.urlconnection.HTTPSProperties;
 
 
 public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicResource {
@@ -129,45 +107,31 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
 
     private static final Logger LOG = LoggerFactory.getLogger(AAIService.class);
 
-    private final String truststore_path;
-    private final String truststore_password;
-    private final String keystore_path;
-    private final String keystore_password;
-    private final Boolean ignore_certificate_host_error;
-
-    private final String target_uri;
-    private final String query_path;
+    private final String truststorePath;
+    private final String truststorePassword;
+    private final String keystorePath;
+    private final String keystorePassword;
+    private final Boolean ignoreCertificateHostError;
 
-    private final String network_vserver_path;
+    private final String targetUri;
+    private final String networkVserverPath;
 
-    private final String svc_instance_path;
-    private final String svc_inst_qry_path;
-
-    private final String vnf_image_query_path;
-
-    private final String param_service_type;            //= "service-type";
+    private final String svc_inst_query_path;
 
     private final String ubb_notify_path;
-    private final String selflink_avpn;
-    private final String selflink_fqdn;
-
-    private final String p_interface_path;
-
-    private final String service_path;
-    private final String site_pair_set_path;
+    private final String selflinkAvpn;
+    private final String selflinkFqdn;
 
-    private final int connection_timeout;
-    private final int read_timeout;
+    private final int connectionTimeout;
+    private final int readTimeout;
 
     // 1602
-    private final String query_nodes_path;
-    private final String update_path;
-
-    private final String application_id;
+    private final String queryNodesPath;
+    private final String applicationId;
 
     // authentication credentials
-    private String user_name;
-    private String user_password;
+    private String userName;
+    private String userPassword;
 
     // runtime
     private final boolean runtimeOSGI;
@@ -176,9 +140,17 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
 
     private final MetricLogger ml = new MetricLogger();
 
-    private final AAIRequestExecutor executor;
+    private AAIExecutorInterface executor;
+
+    public AAIService(final UtilsProvider configuration) {
+        this(configuration.getProperties());
+    }
+
+    public AAIService(final URL url) {
+        this(getProperties(url));
+    }
 
-    public AAIService(URL propURL) {
+    public AAIService(Properties props) {
         LOG.info("Entered AAIService.ctor");
 
         String runtime = System.getProperty("aaiclient.runtime");
@@ -188,41 +160,39 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
             runtimeOSGI = false;
         }
 
-        Properties props = null;
         try {
-            props = initialize(propURL);
             AAIRequest.setProperties(props, this);
 
         } catch(Exception exc){
             LOG.error("AicAAIResource.static", exc);
         }
 
-        executor = new AAIRequestExecutor();
+        executor = new AAIClientRESTExecutor(props);
 
-        user_name            = props.getProperty(CLIENT_NAME);
-        user_password        = props.getProperty(CLIENT_PWWD);
+        userName            = props.getProperty(CLIENT_NAME);
+        userPassword        = props.getProperty(CLIENT_PWWD);
 
-        if(user_name == null || user_name.isEmpty()){
+        if(userName == null || userName.isEmpty()){
             LOG.debug("Basic user name is not set");
         }
-        if(user_password == null || user_password.isEmpty()) {
+        if(userPassword == null || userPassword.isEmpty()) {
             LOG.debug("Basic password is not set");
         }
 
-        truststore_path     = props.getProperty(TRUSTSTORE_PATH);
-        truststore_password = props.getProperty(TRUSTSTORE_PSSWD);
-        keystore_path         = props.getProperty(KEYSTORE_PATH);
-        keystore_password     = props.getProperty(KEYSTORE_PSSWD);
+        truststorePath     = props.getProperty(TRUSTSTORE_PATH);
+        truststorePassword = props.getProperty(TRUSTSTORE_PSSWD);
+        keystorePath         = props.getProperty(KEYSTORE_PATH);
+        keystorePassword     = props.getProperty(KEYSTORE_PSSWD);
 
-        target_uri             = props.getProperty(TARGET_URI);
-        query_path             = props.getProperty(QUERY_PATH);
-        update_path         = props.getProperty(UPDATE_PATH);
+        targetUri             = props.getProperty(TARGET_URI);
+        props.getProperty(QUERY_PATH);
+        props.getProperty(UPDATE_PATH);
 
-        String applicationId =props.getProperty(APPLICATION_ID);
-        if(applicationId == null || applicationId.isEmpty()) {
-            applicationId = "SDNC";
+        String tmpApplicationId = props.getProperty(APPLICATION_ID);
+        if(tmpApplicationId == null || tmpApplicationId.isEmpty()) {
+            tmpApplicationId = "SDNC";
         }
-        application_id = applicationId;
+        this.applicationId = tmpApplicationId;
 
         // connection timeout
         int tmpConnectionTimeout = 30000;
@@ -239,29 +209,26 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
             tmpConnectionTimeout = 30000;
             tmpReadTimeout = 30000;
         }
-        connection_timeout = tmpConnectionTimeout;
-        read_timeout = tmpReadTimeout;
-
-        network_vserver_path =props.getProperty(NETWORK_VSERVER_PATH);
+        connectionTimeout = tmpConnectionTimeout;
+        readTimeout = tmpReadTimeout;
 
-        svc_instance_path    = props.getProperty(SVC_INSTANCE_PATH);
-        svc_inst_qry_path    = props.getProperty(SVC_INST_QRY_PATH);
-        param_service_type     = props.getProperty(PARAM_SERVICE_TYPE, "service-type");
+        networkVserverPath =props.getProperty(NETWORK_VSERVER_PATH);
 
-        // P-Interfaces
-        p_interface_path   = props.getProperty(P_INTERFACE_PATH);
+        props.getProperty(SVC_INSTANCE_PATH);
+        svc_inst_query_path    = props.getProperty(SVC_INST_QRY_PATH);
+        props.getProperty(PARAM_SERVICE_TYPE, "service-type");
 
-        vnf_image_query_path    = props.getProperty(VNF_IMAGE_QUERY_PATH);
+        props.getProperty(VNF_IMAGE_QUERY_PATH);
 
         ubb_notify_path = props.getProperty(UBB_NOTIFY_PATH);
-        selflink_avpn = props.getProperty(SELFLINK_AVPN);
-        selflink_fqdn = props.getProperty(SELFLINK_FQDN);
+        selflinkAvpn = props.getProperty(SELFLINK_AVPN);
+        selflinkFqdn = props.getProperty(SELFLINK_FQDN);
 
-        service_path  = props.getProperty(SERVICE_PATH);
+        props.getProperty(SERVICE_PATH);
 
-        site_pair_set_path  = props.getProperty(SITE_PAIR_SET_PATH);
+        props.getProperty(SITE_PAIR_SET_PATH);
 
-        query_nodes_path = props.getProperty(QUERY_NODES_PATH);
+        queryNodesPath = props.getProperty(QUERY_NODES_PATH);
 
         String iche = props.getProperty(CERTIFICATE_HOST_ERROR);
         boolean host_error = false;
@@ -269,53 +236,56 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
             host_error = Boolean.valueOf(iche);
         }
 
-        ignore_certificate_host_error = host_error;
+        ignoreCertificateHostError = host_error;
 
         HttpsURLConnection.setDefaultHostnameVerifier( new HostnameVerifier(){
             public boolean verify(String string,SSLSession ssls) {
-                return ignore_certificate_host_error;
+                return ignoreCertificateHostError;
             }
         });
 
-        if(truststore_path != null && truststore_password != null && (new File(truststore_path)).exists()) {
-            System.setProperty("javax.net.ssl.trustStore", truststore_path);
-            System.setProperty("javax.net.ssl.trustStorePassword", truststore_password);
+        if(truststorePath != null && truststorePassword != null && (new File(truststorePath)).exists()) {
+            System.setProperty("javax.net.ssl.trustStore", truststorePath);
+            System.setProperty("javax.net.ssl.trustStorePassword", truststorePassword);
         }
 
-        if(keystore_path != null && keystore_password != null && (new File(keystore_path)).exists()) {
-        DefaultClientConfig config = new DefaultClientConfig();
+        if(keystorePath != null && keystorePassword != null && (new File(keystorePath)).exists()) {
+        //DefaultClientConfig config = new DefaultClientConfig();
         //both jersey and HttpURLConnection can use this
         SSLContext ctx = null;
         try {
             ctx = SSLContext.getInstance("TLS");
 
             KeyManagerFactory kmf = null;
-            try (FileInputStream fin = new FileInputStream(keystore_path)){
+            try (FileInputStream fin = new FileInputStream(keystorePath)){
                 String def = "SunX509";
                 String storeType = "PKCS12";
                 def = KeyStore.getDefaultType();
                 kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
 
-                String extension = keystore_path.substring(keystore_path.lastIndexOf(".") + 1);
+                String extension = keystorePath.substring(keystorePath.lastIndexOf(".") + 1);
                 if("JKS".equalsIgnoreCase(extension)) {
                     storeType = "JKS";
                 }
                 KeyStore ks = KeyStore.getInstance(storeType);
 
-                char[] pwd = keystore_password.toCharArray();
+                char[] pwd = keystorePassword.toCharArray();
                 ks.load(fin, pwd);
                 kmf.init(ks, pwd);
             } catch (Exception ex) {
                 LOG.error("AAIResource", ex);
             }
 
-            ctx.init(kmf.getKeyManagers(), null, null);
-            config.getProperties().put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES, new HTTPSProperties( new HostnameVerifier() {
-                    @Override
-                    public boolean verify( String s, SSLSession sslSession ) {
-                        return ignore_certificate_host_error;
-                    }
-            }, ctx));
+            if(null!=kmf) {
+               ctx.init(kmf.getKeyManagers(), null, null);
+            }
+                /*
+                 * config.getProperties().put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES, new
+                 * HTTPSProperties( new HostnameVerifier() {
+                 * 
+                 * @Override public boolean verify( String s, SSLSession sslSession ) { return
+                 * ignoreCertificateHostError; } }, ctx));
+                 */
 
             CTX = ctx;
                 LOG.debug("SSLContext created");
@@ -346,9 +316,23 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
             methodsField.set(null, methods);
 
         } catch (SecurityException | IllegalArgumentException | IllegalAccessException | NoSuchFieldException e) {
-         e.printStackTrace();
+            LOG.error("Exception occured", e);
+        }
+
+    }
+
+    private static Properties getProperties(URL url) {
+        Properties properties = new Properties();
+        try {
+            properties.load(url.openStream());
+        } catch (IOException exc) {
+            LOG.error("getProperties", exc);
         }
+        return properties;
+    }
 
+    public void setExecutor(AAIExecutorInterface executor) {
+        this.executor = executor;
     }
 
     public void cleanUp() {
@@ -370,23 +354,24 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
         con.setDoInput(true);
         con.setDoOutput(true);
         con.setUseCaches(false);
-        con.setConnectTimeout( connection_timeout );
-        con.setReadTimeout( read_timeout );
+        con.setConnectTimeout( connectionTimeout );
+        con.setReadTimeout( readTimeout );
         con.setRequestMethod( method );
         con.setRequestProperty( "Accept", "application/json" );
         con.setRequestProperty( "Content-Type",  "PATCH".equalsIgnoreCase(method) ? "application/merge-patch+json" : "application/json" );
-        con.setRequestProperty("X-FromAppId", application_id);
+        con.setRequestProperty("X-FromAppId", applicationId);
         con.setRequestProperty("X-TransactionId",TransactionIdTracker.getNextTransactionId());
         String mlId = ml.getRequestID();
         if(mlId != null && !mlId.isEmpty()) {
             LOG.debug(String.format("MetricLogger requestId = %s", mlId));
-            con.setRequestProperty(MetricLogger.REQUEST_ID, mlId);
+            con.setRequestProperty(ONAPLogConstants.MDCs.REQUEST_ID, mlId);
         } else {
             LOG.debug("MetricLogger requestId is null");
         }
+        con.setRequestProperty("Transfer-Encoding","chunked");
 
-        if(user_name != null && !user_name.isEmpty() && user_password != null && !user_password.isEmpty()) {
-            String basicAuth = "Basic " + new String(Base64.encodeBase64((user_name + ":" + user_password).getBytes()));
+        if(userName != null && !userName.isEmpty() && userPassword != null && !userPassword.isEmpty()) {
+            String basicAuth = "Basic " + new String(Base64.encodeBase64((userName + ":" + userPassword).getBytes()));
             con.setRequestProperty ("Authorization", basicAuth);
         }
 
@@ -437,98 +422,16 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
         }
     }
 
-    @Override
-    public boolean deleteGenericVnfData(String vnf_id, String resourceVersion) throws AAIServiceException {
-        boolean response = false;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("generic-vnf");
-            request.addRequestProperty("generic-vnf.vnf-id", vnf_id);
-            response = executor.delete(request, resourceVersion);
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("deleteGenericVnfData", exc);
-            throw new AAIServiceException(exc);
-        }
-        return response;
-    }
-
-    /* (non-Javadoc)
-     * @see org.onap.ccsdk.sli.adaptors.resource.aic.AnAIClient#requestSdnZoneQuery(java.lang.String, java.lang.String, java.lang.String)
-     */
-    @Override
-    public Vce requestNetworkVceData(String vnf_id) throws AAIServiceException {
-        Vce response = null;
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("vce");
-            request.addRequestProperty("vce.vnf-id", vnf_id);
-            String rv = executor.get(request);
-            if(rv != null) {
-                ObjectMapper mapper = getObjectMapper();
-                response = mapper.readValue(rv, Vce.class);
-            }
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn(Object.class.getClass().getEnclosingMethod().getName(), exc);
-            throw new AAIServiceException(exc);
-        }
-
-        return response;
-    }
-
-
-    /* (non-Javadoc)
-     * @see org.onap.ccsdk.sli.adaptors.resource.aic.AnAIClient#requestSdnZoneQuery(java.lang.String, java.lang.String, java.lang.String)
-     */
-    @Override
-    public boolean deleteNetworkVceData(String vnf_id, String resourceVersion) throws AAIServiceException {
-        boolean response = false;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("vce");
-            request.addRequestProperty("vce.vnf-id", vnf_id);
-            response = executor.delete(request, resourceVersion);
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("deleteNetworkVceData", exc);
-            throw new AAIServiceException(exc);
-        }
-        return response;
-    }
-
-    /* (non-Javadoc)
-     * @see org.onap.ccsdk.sli.adaptors.resource.aic.AnAIClient#postNetworkVceData(java.lang.String, org.onap.ccsdk.sli.adaptors.resource.aic.aai.VCERequest)
-     */
-    @Override
-    public boolean postNetworkVceData(String vnf_id, Vce data) throws AAIServiceException {
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("vce");
-            request.addRequestProperty("vce.vnf-id", vnf_id);
-            request.setRequestObject(data);
-            Object response = executor.post(request);
-            return true;
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("requestGenericVnfData", exc);
-            throw new AAIServiceException(exc);
-        }
-    }
-
-
     @Override
     public SearchResults requestServiceInstanceURL(String svc_instance_id) throws AAIServiceException {
         SearchResults response = null;
         InputStream inputStream = null;
 
         try {
-            String path = svc_inst_qry_path;
+            String path = svc_inst_query_path;
             path = path.replace("{svc-instance-id}", encodeQuery(svc_instance_id));
 
-            String request_url = target_uri+path;
+            String request_url = targetUri+path;
             URL http_req_url =    new URL(request_url);
 
             HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.GET);
@@ -573,54 +476,13 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
                 try {
                     inputStream.close();
                 } catch(Exception exc) {
+                    LOG.warn("Error closing Inputstream", exc);
                 }
             }
         }
         return response;
     }
 
-    @Override
-    public ServiceInstance requestServiceInterfaceData(String customer_id, String service_type, String svc_instance_id) throws AAIServiceException {
-        ServiceInstance response = null;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("service-instance");
-            request.addRequestProperty("customer.global-customer-id", customer_id);
-            request.addRequestProperty("service-subscription.service-type", service_type);
-            request.addRequestProperty("service-instance.service-instance-id", svc_instance_id);
-
-            String rv = executor.get(request);
-            if(rv != null) {
-                ObjectMapper mapper = getObjectMapper();
-                response = mapper.readValue(rv, ServiceInstance.class);
-            }
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("requestServiceInterfaceData", exc);
-            throw new AAIServiceException(exc);
-        }
-        return response;
-    }
-
-    @Override
-    public boolean postServiceInterfaceData(String customer_id, String service_type, String svc_instance_id, ServiceInstance data) throws AAIServiceException {
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("service-instance");
-            request.addRequestProperty("customer.global-customer-id", customer_id);
-            request.addRequestProperty("service-subscription.service-type", service_type);
-            request.addRequestProperty("service-instance.service-instance-id", svc_instance_id);
-            request.setRequestObject(data);
-            Object response = executor.post(request);
-            return true;
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("requestGenericVnfData", exc);
-            throw new AAIServiceException(exc);
-        }
-    }
-
 
     private static Properties initialize(URL url ) throws ConfigurationException {
 
@@ -721,1233 +583,115 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
         return encrypted_url;
     }
 
-    @Override
-        public VplsPe requestNetworkVplsPeData(String equipment_name)throws AAIServiceException {
-            VplsPe response = null;
-
-            try {
-                AAIRequest request = AAIRequest.getRequestFromResource("vpls-pe");
-                request.addRequestProperty("vpls-pe.equipment-name", equipment_name);
-
-                String rv = executor.get(request);
-                if(rv != null) {
-                    ObjectMapper mapper = getObjectMapper();
-                    response = mapper.readValue(rv, VplsPe.class);
-                }
-            } catch(AAIServiceException aaiexc) {
-                throw aaiexc;
-            } catch (Exception exc) {
-                LOG.warn(Object.class.getClass().getEnclosingMethod().getName(),
-                        exc);
-                throw new AAIServiceException(exc);
-            }
-            return response;
-        }
 
-    @Override
-    public boolean postNetworkVplsPeData(String equipment_name, VplsPe data) throws AAIServiceException {
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("vpls-pe");
-            request.addRequestProperty("vpls-pe.equipment-name", equipment_name);
-            request.setRequestObject(data);
-            Object response = executor.post(request);
-            return true;
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("requestGenericVnfData", exc);
-            throw new AAIServiceException(exc);
-        }
-    }
 
+    /*
+     * (non-Javadoc)
+     * @see org.onap.sdnct.sli.aai.AAIClient#requestVServersData(java.lang.String, java.lang.String)
+     */
     @Override
-    public boolean deleteNetworkVplsPeData(String vnf_id, String resourceVersion)    throws AAIServiceException {
-        boolean response = false;
+    public Vserver requestVServerData(String tenantId, String vserverId, String cloudOwner, String cloudRegionId)    throws AAIServiceException {
+        Vserver response = null;
 
         try {
-            AAIRequest request = AAIRequest.getRequestFromResource("vpls-pe");
-            request.addRequestProperty("vpls-pe.equipment-name", vnf_id);
-            response = executor.delete(request, resourceVersion);
+            AAIRequest request = AAIRequest.getRequestFromResource("vserver");
+            request.addRequestProperty("cloud-region.cloud-owner", cloudOwner);
+            request.addRequestProperty("cloud-region.cloud-region-id", cloudRegionId);
+            request.addRequestProperty("tenant.tenant-id", tenantId);
+            request.addRequestProperty("vserver.vserver-id", vserverId);
+
+            String rv = executor.get(request);
+            if(rv != null) {
+                ObjectMapper mapper = getObjectMapper();
+                response = mapper.readValue(rv, Vserver.class);
+            }
         } catch(AAIServiceException aaiexc) {
             throw aaiexc;
         } catch (Exception exc) {
-            LOG.warn("deleteNetworkVplsPeData", exc);
+            LOG.warn(Object.class.getClass().getEnclosingMethod().getName(), exc);
             throw new AAIServiceException(exc);
         }
         return response;
     }
 
+
+    //================== End of DvsSwitch =================
+    //==================== PhysicalLink ======================
     @Override
-    public Complex  requestNetworkComplexData(String pLocId) throws AAIServiceException {
-        Complex response = null;
+    public PhysicalLink  requestPhysicalLinkData(String linkName) throws AAIServiceException {
+        PhysicalLink response = null;
 
         try {
-            AAIRequest request = AAIRequest.getRequestFromResource("complex");
-            request.addRequestProperty("complex.physical-location-id", pLocId);
+            AAIRequest request = AAIRequest.getRequestFromResource("physical-link");
+            request.addRequestProperty("physical-link.link-name", linkName);
 
             String rv = executor.get(request);
             if(rv != null) {
                 ObjectMapper mapper = getObjectMapper();
-                response = mapper.readValue(rv, Complex.class);
+                response = mapper.readValue(rv, PhysicalLink.class);
             }
         } catch(AAIServiceException aaiexc) {
             throw aaiexc;
         } catch (Exception exc) {
-            LOG.warn("requestNetworkComplexData", exc);
+            LOG.warn("requestPhysicalLinkData", exc);
             throw new AAIServiceException(exc);
         }
         return response;
     }
 
     @Override
-    public boolean postNetworkComplexData(String vnf_id, Complex data) throws AAIServiceException {
+    public boolean postPhysicalLinkData(String linkName, PhysicalLink data) throws AAIServiceException {
         try {
-            AAIRequest request = AAIRequest.getRequestFromResource("complex");
-            request.addRequestProperty("complex.physical-location-id", vnf_id);
+            AAIRequest request = AAIRequest.getRequestFromResource("physical-link");
+            request.addRequestProperty("physical-link.link-name", linkName);
             request.setRequestObject(data);
             Object response = executor.post(request);
             return true;
         } catch(AAIServiceException aaiexc) {
             throw aaiexc;
         } catch (Exception exc) {
-            LOG.warn("postNetworkComplexData", exc);
+            LOG.warn(Object.class.getClass().getEnclosingMethod().getName(), exc);
             throw new AAIServiceException(exc);
         }
     }
 
     @Override
-    public boolean deleteNetworkComplexData(String pLocId, String resourceVersion) throws AAIServiceException {
+    public boolean deletePhysicalLinkData(String linkName, String resourceVersion) throws AAIServiceException {
         boolean response = false;
 
         try {
-            AAIRequest request = AAIRequest.getRequestFromResource("complex");
-            request.addRequestProperty("complex.physical-location-id", pLocId);
-
+            AAIRequest request = AAIRequest.getRequestFromResource("physical-link");
+            request.addRequestProperty("physical-link.link-name", linkName);
             response = executor.delete(request, resourceVersion);
-
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("deleteNetworkComplexData", exc);
-            throw new AAIServiceException(exc);
-        }
-        return response;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.openecomp.sdnct.sli.aai.AAIClient#requestVServersData(java.lang.String, java.lang.String)
-     */
-    @Override
-    public Vserver requestVServerData(String tenantId, String vserverId, String cloudOwner, String cloudRegionId)    throws AAIServiceException {
-        Vserver response = null;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("vserver");
-            request.addRequestProperty("cloud-region.cloud-owner", cloudOwner);
-            request.addRequestProperty("cloud-region.cloud-region-id", cloudRegionId);
-            request.addRequestProperty("tenant.tenant-id", tenantId);
-            request.addRequestProperty("vserver.vserver-id", vserverId);
-
-            String rv = executor.get(request);
-            if(rv != null) {
-                ObjectMapper mapper = getObjectMapper();
-                response = mapper.readValue(rv, Vserver.class);
-            }
         } catch(AAIServiceException aaiexc) {
             throw aaiexc;
         } catch (Exception exc) {
-            LOG.warn(Object.class.getClass().getEnclosingMethod().getName(), exc);
+            LOG.warn("deletePhysicalLinkData", exc);
             throw new AAIServiceException(exc);
         }
         return response;
     }
 
+    public boolean deleteAAIEntity(URL url, String caller) throws AAIServiceException {
 
-    @Override
-    public boolean postVServerData(String tenantId, String vserverId, String cloudOwner, String cloudRegionId, Vserver data) throws AAIServiceException {
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("vserver");
-            request.addRequestProperty("cloud-region.cloud-owner", cloudOwner);
-            request.addRequestProperty("cloud-region.cloud-region-id", cloudRegionId);
-            request.addRequestProperty("tenant.tenant-id", tenantId);
-            request.addRequestProperty("vserver.vserver-id", vserverId);
-            request.setRequestObject(data);
-            Object response = executor.post(request);
-            return true;
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("postNetworkComplexData", exc);
-            throw new AAIServiceException(exc);
+        if(url ==  null) {
+            throw new NullPointerException();
         }
-    }
 
-    @Override
-    public boolean deleteVServerData(String tenant_id, String vserver_id, String cloudOwner, String cloudRegionId, String resourceVersion) throws AAIServiceException {
         boolean response = false;
         InputStream inputStream = null;
 
         try {
-            String local_network_complexes_path = network_vserver_path.replace("{tenant-id}", encodeQuery(tenant_id));
-            local_network_complexes_path = local_network_complexes_path.replace("{vserver-id}", encodeQuery(vserver_id));
-            local_network_complexes_path = local_network_complexes_path.replace("{cloud-owner}", encodeQuery(cloudOwner));
-            local_network_complexes_path = local_network_complexes_path.replace("{cloud-region-id}", encodeQuery(cloudRegionId));
-
-            String request_url = target_uri+local_network_complexes_path;
-            if(resourceVersion!=null) {
-                request_url = request_url +"?resource-version="+resourceVersion;
-            }
-            URL http_req_url =    new URL(request_url);
-
-            HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.DELETE);
-
-            LOGwriteFirstTrace(HttpMethod.DELETE, http_req_url.toString());
-            LOGwriteDateTrace("tenant_id", tenant_id);
-            LOGwriteDateTrace("vserver_id", vserver_id);
-            LOGwriteDateTrace("cloud-owner", cloudOwner);
-            LOGwriteDateTrace("cloud-region-id", cloudRegionId);
-
-            // Check for errors
-            int responseCode = con.getResponseCode();
-            if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
-                inputStream = con.getInputStream();
-            } else {
-                inputStream = con.getErrorStream();
-            }
-
-            // Process the response
-            LOG.debug("HttpURLConnection result:" + responseCode);
-            if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8));
-            BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) );
-            String line = null;
-
-            ObjectMapper mapper = getObjectMapper();
-
-            if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
-                StringBuilder stringBuilder = new StringBuilder();
-
-                while( ( line = reader.readLine() ) != null ) {
-                    stringBuilder.append( line );
-                }
-                LOGwriteEndingTrace(responseCode, "SUCCESS", stringBuilder.toString());
-                response = true;
-            } else if(responseCode == HttpURLConnection.HTTP_NOT_FOUND ) {
-                LOGwriteEndingTrace(responseCode, "HTTP_NOT_FOUND", "Entry does not exist.");
-                response = false;
-            } else {
-                ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class);
-                LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse));
-                throw new AAIServiceException(responseCode, errorresponse);
-            }
-
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("deleteVServerData", exc);
-            throw new AAIServiceException(exc);
-        } finally {
-            if(inputStream != null){
-                try {
-                    inputStream.close();
-                } catch(Exception exc) {
-
-                }
-            }
-        }
-        return response;
-    }
-
-
-    /*
-     * (non-Javadoc)
-     * @see org.onap.ccsdk.sli.adaptors.aai.AAIClient#requestCtagPoolData(String)
-     */
-    @Override
-    public CtagPool requestCtagPoolData(String physical_location_id, String target_pe, String availability_zone_name)    throws AAIServiceException {
-        CtagPool response = null;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("ctag-pool");
-
-            request.addRequestProperty("ctag-pool.target-pe", target_pe);
-            request.addRequestProperty("ctag-pool.availability-zone-name", availability_zone_name);
-            request.addRequestProperty("complex.physical-location-id", physical_location_id);
-
-            String rv = executor.get(request);
-            if(rv != null) {
-                ObjectMapper mapper = getObjectMapper();
-                response = mapper.readValue(rv, CtagPool.class);
-            }
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("requestNetworkVceData", exc);
-            throw new AAIServiceException(exc);
-        }
-        return response;
-    }
-
-    //==================== DvsSwitch ======================
-    @Override
-    public DvsSwitch  requestDvsSwitchData(String vnf_id) throws AAIServiceException {
-        DvsSwitch response = null;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("dvs-switch");
-            request.addRequestProperty("dvs-switch.switch-name", vnf_id);
-
-            String rv = executor.get(request);
-            if(rv != null) {
-                ObjectMapper mapper = getObjectMapper();
-                response = mapper.readValue(rv, DvsSwitch.class);
-            }
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("requestDvsSwitchData", exc);
-            throw new AAIServiceException(exc);
-        }
-        return response;
-    }
-
-    @Override
-    public boolean postDvsSwitchData(String switch_name, DvsSwitch data) throws AAIServiceException {
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("dvs-switch");
-            request.addRequestProperty("dvs-switch.switch-name", switch_name);
-            request.setRequestObject(data);
-            Object response = executor.post(request);
-            return true;
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn(Object.class.getClass().getEnclosingMethod().getName(), exc);
-            throw new AAIServiceException(exc);
-        }
-    }
-
-    @Override
-    public boolean deleteDvsSwitchData(String vnf_id, String resourceVersion) throws AAIServiceException {
-        boolean response = false;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("dvs-switch");
-            request.addRequestProperty("dvs-switch.switch-name", vnf_id);
-            response = executor.delete(request, resourceVersion);
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("deleteDvsSwitchData", exc);
-            throw new AAIServiceException(exc);
-        }
-        return response;
-    }
-    //================== End of DvsSwitch =================
-    //==================== PhysicalLink ======================
-    @Override
-    public PhysicalLink  requestPhysicalLinkData(String linkName) throws AAIServiceException {
-        PhysicalLink response = null;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("physical-link");
-            request.addRequestProperty("physical-link.link-name", linkName);
-
-            String rv = executor.get(request);
-            if(rv != null) {
-                ObjectMapper mapper = getObjectMapper();
-                response = mapper.readValue(rv, PhysicalLink.class);
-            }
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("requestPhysicalLinkData", exc);
-            throw new AAIServiceException(exc);
-        }
-        return response;
-    }
-
-    @Override
-    public boolean postPhysicalLinkData(String linkName, PhysicalLink data) throws AAIServiceException {
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("physical-link");
-            request.addRequestProperty("physical-link.link-name", linkName);
-            request.setRequestObject(data);
-            Object response = executor.post(request);
-            return true;
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn(Object.class.getClass().getEnclosingMethod().getName(), exc);
-            throw new AAIServiceException(exc);
-        }
-    }
-
-    @Override
-    public boolean deletePhysicalLinkData(String linkName, String resourceVersion) throws AAIServiceException {
-        boolean response = false;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("physical-link");
-            request.addRequestProperty("physical-link.link-name", linkName);
-            response = executor.delete(request, resourceVersion);
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("deletePhysicalLinkData", exc);
-            throw new AAIServiceException(exc);
-        }
-        return response;
-    }
-    //================== End of PhysicalLink =================
-    //==================== PInterface ======================
-    @Override
-    public PInterface  requestPInterfaceData(String hostname, String interfaceName) throws AAIServiceException {
-        PInterface response = null;
-
-        try {
-            AAIRequest request = new PInterfaceRequest();
-            request.addRequestProperty(PInterfaceRequest.PINTERFACE_INTERFACE_NAME, interfaceName);
-            request.addRequestProperty(PInterfaceRequest.PSERVER_HOSTNAME, hostname);
-            String rv = executor.get(request);
-            if(rv != null) {
-                ObjectMapper mapper = getObjectMapper();
-                response = mapper.readValue(rv, PInterface.class);
-            }
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn(Object.class.getClass().getEnclosingMethod().getName(), exc);
-            throw new AAIServiceException(exc);
-        }
-        return response;
-    }
-
-    @Override
-    public boolean postPInterfaceData(String hostname, String interfaceName, PInterface request) throws AAIServiceException {
-        InputStream inputStream = null;
-
-        try {
-
-            ObjectMapper mapper = getObjectMapper();
-            String json_text = mapper.writeValueAsString(request);
-
-            SSLSocketFactory sockFact = CTX.getSocketFactory();
-
-            String request_url = target_uri+p_interface_path;
-            String encoded_vnf = encodeQuery(hostname);
-            request_url = request_url.replace("{hostname}", encoded_vnf) ;
-            encoded_vnf = encodeQuery(interfaceName);
-            request_url = request_url.replace("{interface-name}", encoded_vnf) ;
-            URL http_req_url =    new URL(request_url);
-
-            HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.PUT);
-
-            OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream());
-            osw.write(json_text);
-            osw.flush();
-            osw.close();
-
-
-            LOGwriteFirstTrace("PUT", request_url);
-            LOGwriteDateTrace("hostname", hostname);
-            LOGwriteDateTrace("interface-name", interfaceName);
-            LOGwriteDateTrace("PInterface", json_text);
-
-            // Check for errors
-            int responseCode = con.getResponseCode();
-            if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
-                inputStream = con.getInputStream();
-            } else {
-                inputStream = con.getErrorStream();
-            }
-
-            // Process the response
-            BufferedReader reader;
-            String line = null;
-            reader = new BufferedReader( new InputStreamReader( inputStream ) );
-
-            if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
-                StringBuilder stringBuilder = new StringBuilder();
-
-                while( ( line = reader.readLine() ) != null ) {
-                    stringBuilder.append( line );
-                }
-                LOGwriteEndingTrace(responseCode, "SUCCESS", (stringBuilder.length() > 0) ? stringBuilder.toString() : "{no-data}");
-                return true;
-            } else {
-                ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class);
-                LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse));
-
-                throw new AAIServiceException(responseCode, errorresponse);
-            }
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("postPInterfaceData", exc);
-            throw new AAIServiceException(exc);
-        } finally {
-            try {
-                if(inputStream != null)
-                inputStream.close();
-            } catch (Exception exc) {
-
-            }
-        }
-    }
-
-    @Override
-    public boolean deletePInterfaceData(String hostname, String interfaceName, String resourceVersion) throws AAIServiceException {
-        boolean response = false;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("p-interface");
-            request.addRequestProperty("p-interface.interface-name", interfaceName);
-            request.addRequestProperty("pserver.hostname", hostname);
-            response = executor.delete(request, resourceVersion);
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("deletePInterfaceData", exc);
-            throw new AAIServiceException(exc);
-        }
-        return response;
-    }
-    //================== End of PInterface =================
-    //==================== SitePairSet ======================
-    @Override
-    public SitePairSet requestSitePairSetData(String sitePairSetId) throws AAIServiceException {
-        SitePairSet response = null;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("site-pair-set");
-            request.addRequestProperty("site-pair-set.site-pair-set-id", sitePairSetId);
-            String rv = executor.get(request);
-            if(rv != null) {
-                ObjectMapper mapper = getObjectMapper();
-                response = mapper.readValue(rv, SitePairSet.class);
-            }
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn(Object.class.getClass().getEnclosingMethod().getName(), exc);
-            throw new AAIServiceException(exc);
-        }
-        return response;
-    }
-
-    @Override
-    public boolean postSitePairSetData(String linkName, SitePairSet request) throws AAIServiceException {
-        InputStream inputStream = null;
-
-        try {
-
-            ObjectMapper mapper = getObjectMapper();
-            String json_text = mapper.writeValueAsString(request);
-
-            SSLSocketFactory sockFact = CTX.getSocketFactory();
-
-            String request_url = target_uri+site_pair_set_path;
-            String encoded_vnf = encodeQuery(linkName);
-            request_url = request_url.replace("{site-pair-set-id}", encoded_vnf) ;
-            URL http_req_url =    new URL(request_url);
-
-            HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.PUT);
-
-            OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream());
-            osw.write(json_text);
-            osw.flush();
-            osw.close();
-
-
-            LOGwriteFirstTrace("PUT", request_url);
-            LOGwriteDateTrace("link-name", linkName);
-            LOGwriteDateTrace("SitePairSet", json_text);
-
-            // Check for errors
-            int responseCode = con.getResponseCode();
-            if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
-                inputStream = con.getInputStream();
-            } else {
-                inputStream = con.getErrorStream();
-            }
-
-            // Process the response
-            BufferedReader reader;
-            String line = null;
-            reader = new BufferedReader( new InputStreamReader( inputStream ) );
-
-            if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
-                StringBuilder stringBuilder = new StringBuilder();
-
-                while( ( line = reader.readLine() ) != null ) {
-                    stringBuilder.append( line );
-                }
-                LOGwriteEndingTrace(responseCode, "SUCCESS", (stringBuilder.length() > 0) ? stringBuilder.toString() : "{no-data}");
-                return true;
-            } else {
-                ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class);
-                LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse));
-
-                throw new AAIServiceException(responseCode, errorresponse);
-            }
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("postSitePairSetData", exc);
-            throw new AAIServiceException(exc);
-        } finally {
-            try {
-                if(inputStream != null)
-                inputStream.close();
-            } catch (Exception exc) {
-
-            }
-        }
-    }
-
-    @Override
-    public boolean deleteSitePairSetData(String linkName, String resourceVersion) throws AAIServiceException {
-        boolean response = false;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("site-pair-set");
-            request.addRequestProperty("site-pair-set.site-pair-set-id", linkName);
-            response = executor.delete(request, resourceVersion);
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("deleteSitePairSetData", exc);
-            throw new AAIServiceException(exc);
-        }
-
-        return response;
-    }
-    //================== End of SitePairSet =================
-    //==================== Service ======================
-    @Override
-    public Service requestServiceData(String serviceId) throws AAIServiceException {
-        Service response = null;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("service");
-            request.addRequestProperty("service.service-id", serviceId);
-
-
-            String rv = executor.get(request);
-            if(rv != null) {
-                ObjectMapper mapper = getObjectMapper();
-                response = mapper.readValue(rv, Service.class);
-            }
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("requestServiceData", exc);
-            throw new AAIServiceException(exc);
-        }
-        return response;
-    }
-
-    @Override
-    public boolean postServiceData(String linkName, Service request) throws AAIServiceException {
-        InputStream inputStream = null;
-
-        try {
-
-            ObjectMapper mapper = getObjectMapper();
-            String json_text = mapper.writeValueAsString(request);
-
-            SSLSocketFactory sockFact = CTX.getSocketFactory();
-
-            String request_url = target_uri+service_path;
-            String encoded_vnf = encodeQuery(linkName);
-            request_url = request_url.replace("{service-id}", encoded_vnf) ;
-            URL http_req_url =    new URL(request_url);
-
-            HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.PUT);
-
-            OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream());
-            osw.write(json_text);
-            osw.flush();
-            osw.close();
-
-
-            LOGwriteFirstTrace("PUT", request_url);
-            LOGwriteDateTrace("service-id", linkName);
-            LOGwriteDateTrace("Service", json_text);
-
-            // Check for errors
-            int responseCode = con.getResponseCode();
-            if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
-                inputStream = con.getInputStream();
-            } else {
-                inputStream = con.getErrorStream();
-            }
-
-            // Process the response
-            BufferedReader reader;
-            String line = null;
-            reader = new BufferedReader( new InputStreamReader( inputStream ) );
-
-            if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
-                StringBuilder stringBuilder = new StringBuilder();
-
-                while( ( line = reader.readLine() ) != null ) {
-                    stringBuilder.append( line );
-                }
-                LOGwriteEndingTrace(responseCode, "SUCCESS", (stringBuilder.length() > 0) ? stringBuilder.toString() : "{no-data}");
-                return true;
-            } else {
-                ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class);
-                LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse));
-
-                throw new AAIServiceException(responseCode, errorresponse);
-            }
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("postServiceData", exc);
-            throw new AAIServiceException(exc);
-        } finally {
-            try {
-                if(inputStream != null)
-                inputStream.close();
-            } catch (Exception exc) {
-
-            }
-        }
-    }
-
-    @Override
-    public boolean deleteServiceData(String service_id, String resourceVersion) throws AAIServiceException {
-        boolean response = false;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("service");
-            request.addRequestProperty("service.service-id", service_id);
-            response = executor.delete(request, resourceVersion);
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("deleteServiceData", exc);
-            throw new AAIServiceException(exc);
-        }
-
-        return response;
-    }
-    //================== End of Service =================
-
-
-
-    // 1507 - Request
-    @Override
-    public VServer dataChangeRequestVServerData(URL url) throws AAIServiceException {
-
-        if(url ==  null) {
-            throw new NullPointerException();
-        }
-
-        return this.getResource(url.toString(), VServer.class);
-    }
-
-    @Override
-    public Pserver dataChangeRequestPServerData(URL url) throws AAIServiceException {
-
-        if(url ==  null) {
-            throw new NullPointerException();
-        }
-
-        return this.getResource(url.toString(), Pserver.class);
-    }
-
-    @Override
-    public CtagPool dataChangeRequestCtagPoolData(URL url) throws AAIServiceException {
-
-        if(url ==  null) {
-            throw new NullPointerException();
-        }
-
-        return this.getResource(url.toString(), CtagPool.class);
-    }
-
-    @Override
-    public VplsPe dataChangeRequestVplsPeData(URL url) throws AAIServiceException {
-
-        if(url ==  null) {
-            throw new NullPointerException();
-        }
-
-        return this.getResource(url.toString(), VplsPe.class);
-    }
-
-    @Override
-    public DvsSwitch dataChangeRequestDvsSwitchData(URL url) throws AAIServiceException {
-
-        if(url ==  null) {
-            throw new NullPointerException();
-        }
-
-        return this.getResource(url.toString(), DvsSwitch.class);
-    }
-
-    @Override
-    public OamNetwork dataChangeRequestOAMNetworkData(URL url) throws AAIServiceException {
-
-        if(url ==  null) {
-            throw new NullPointerException();
-        }
-
-        return this.getResource(url.toString(), OamNetwork.class);
-    }
-
-    @Override
-    public AvailabilityZone dataChangeRequestAvailabilityZoneData(URL url) throws AAIServiceException {
-
-        if(url ==  null) {
-            throw new NullPointerException();
-        }
-
-        return this.getResource(url.toString(), AvailabilityZone.class);
-    }
-
-    @Override
-    public Complex dataChangeRequestComplexData(URL url) throws AAIServiceException {
-
-        if(url ==  null) {
-            throw new NullPointerException();
-        }
-
-        return this.getResource(url.toString(), Complex.class);
-    }
-
-    /* DELETE */
-    @Override
-    public boolean dataChangeDeleteVServerData(URL url) throws AAIServiceException {
-
-        if(url ==  null) {
-            throw new NullPointerException();
-        }
-
-        return deleteAAIEntity(url, Object.class.getClass().getEnclosingMethod()
-                .getName());
-    }
-
-    @Override
-    public boolean dataChangeDeleteCtagPoolData(URL url) throws AAIServiceException {
-
-        if(url ==  null) {
-            throw new NullPointerException();
-        }
-
-        return deleteAAIEntity(url, Object.class.getClass().getEnclosingMethod()
-                .getName());
-    }
-
-    @Override
-    public boolean dataChangeDeleteVplsPeData(URL url) throws AAIServiceException {
-
-        if(url ==  null) {
-            throw new NullPointerException();
-        }
-
-        return deleteAAIEntity(url, Object.class.getClass().getEnclosingMethod()
-                .getName());
-    }
-
-    @Override
-    public boolean dataChangeDeleteVpeData(URL url) throws AAIServiceException {
-
-        if(url ==  null) {
-            throw new NullPointerException();
-        }
-
-        return deleteAAIEntity(url, Object.class.getClass().getEnclosingMethod()
-                .getName());
-    }
-
-    @Override
-    public boolean dataChangeDeleteDvsSwitchData(URL url) throws AAIServiceException {
-
-        if(url ==  null) {
-            throw new NullPointerException();
-        }
-
-        return deleteAAIEntity(url, Object.class.getClass().getEnclosingMethod()
-                .getName());
-    }
-    //OAM-Network:
-    @Override
-    public boolean dataChangeDeleteOAMNetworkData(URL url) throws AAIServiceException {
-
-        if(url ==  null) {
-            throw new NullPointerException();
-        }
-
-        return deleteAAIEntity(url, Object.class.getClass().getEnclosingMethod()
-                .getName());
-    }
-    //Availability-Zone:
-    @Override
-    public boolean dataChangeDeleteAvailabilityZoneData(URL url) throws AAIServiceException {
-
-        if(url ==  null) {
-            throw new NullPointerException();
-        }
-
-        return deleteAAIEntity(url, Object.class.getClass().getEnclosingMethod()
-                .getName());
-    }
-    //Complex:
-    @Override
-    public boolean dataChangeDeleteComplexData(URL url) throws AAIServiceException {
-
-        if(url ==  null) {
-            throw new NullPointerException();
-        }
-
-        return deleteAAIEntity(url, Object.class.getClass().getEnclosingMethod()
-                .getName());
-    }
-
-    private boolean deleteAAIEntity(URL url, String caller) throws AAIServiceException {
-
-        if(url ==  null) {
-            throw new NullPointerException();
-        }
-
-        boolean response = false;
-        InputStream inputStream = null;
-
-        try {
-            URL http_req_url =    url;
-
-            HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.DELETE);
-
-            LOGwriteFirstTrace("DELETE", http_req_url.toString());
-
-
-            // Check for errors
-            int responseCode = con.getResponseCode();
-            if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
-                inputStream = con.getInputStream();
-            } else {
-                inputStream = con.getErrorStream();
-            }
-
-            // Process the response
-            LOG.debug("HttpURLConnection result:" + responseCode);
-            if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8));
-            BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) );
-            String line = null;
-
-            ObjectMapper mapper = getObjectMapper();
-
-            if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
-                StringBuilder stringBuilder = new StringBuilder();
-
-                while( ( line = reader.readLine() ) != null ) {
-                    stringBuilder.append( line );
-                }
-                LOGwriteEndingTrace(responseCode, "SUCCESS", stringBuilder.toString());
-                response = true;
-            } else if(responseCode == HttpURLConnection.HTTP_NOT_FOUND ) {
-                LOGwriteEndingTrace(responseCode, "HTTP_NOT_FOUND", "Entry does not exist.");
-                response = false;
-            } else {
-                ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class);
-                LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse));
-                throw new AAIServiceException(responseCode, errorresponse);
-            }
-
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn(caller, exc);
-            throw new AAIServiceException(exc);
-        } finally {
-            if(inputStream != null){
-                try {
-                    inputStream.close();
-                } catch(Exception exc) {
-
-                }
-            }
-        }
-        return response;
-    }
-
-    /**
-     * Generic method to GET json data from an A&AI callback URL.
-     * Then convert that json to an Object.
-     * If successful the Object is attempted to be cast to the type parameter.
-     *
-     * @param key
-     *            callback url for A&AI
-     * @param type
-     *            the class of object that A&AI will return
-     * @return the object created from json or null if the response code is not 200
-     *
-     * @throws AAIServiceException
-     *             if empty or null key and or type or there's an error with processing
-     */
-    public <T> T dataChangeRequestAaiData(String key, Class<T> type) throws AAIServiceException {
-        if (StringUtils.isEmpty(key) || type == null) {
-            throw new AAIServiceException("Key is empty or null and or type is null");
-        }
-
-        T response = null;
-
-        SvcLogicContext ctx = new SvcLogicContext();
-        if(!key.contains(" = ") && isValidURL(key)) {
-            key = String.format("selflink = '%s'", key);
-        } else
-        if(!key.contains(" = ") && isValidURI(key)) {
-            key = String.format("resource-path = '%s'", key);
-        }
-
-        HashMap<String, String> nameValues = AAIServiceUtils.keyToHashMap(key, ctx);
-
-        SelfLinkRequest request = new SelfLinkRequest(type);
-        request.processRequestPathValues(nameValues);
-        Object obj = this.getExecutor().query(request, type);
-        response = type.cast(obj);
-
-        return response != null ? type.cast(response) : response;
-    }
-
-    @Override
-    public Pserver requestPServerData(String hostname) throws AAIServiceException {
-        Pserver response = null;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("pserver");
-            request.addRequestProperty("pserver.hostname", hostname);
-
-
-            String rv = executor.get(request);
-            if(rv != null) {
-                ObjectMapper mapper = getObjectMapper();
-                response = mapper.readValue(rv, Pserver.class);
-            }
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("requestPServerData", exc);
-            throw new AAIServiceException(exc);
-        }
-        return response;
-    }
-
-    @Override
-    public boolean postPServerData(String hostname, Pserver data) throws AAIServiceException {
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("pserver");
-            request.addRequestProperty("pserver.hostname", hostname);
-            request.setRequestObject(data);
-            Object response = executor.post(request);
-            return true;
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn(Object.class.getClass().getEnclosingMethod().getName(), exc);
-            throw new AAIServiceException(exc);
-        }
-    }
-
-    @Override
-    public boolean deletePServerData(String hostname, String resourceVersion) throws AAIServiceException {
-        boolean response = false;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("pserver");
-            request.addRequestProperty("pserver.hostname", hostname);
-            response = executor.delete(request, resourceVersion);
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("deletePServerData", exc);
-            throw new AAIServiceException(exc);
-        }
-
-        return response;
-    }
-
-
-    @Override
-    public L3Network requestL3NetworkData(String networkId) throws AAIServiceException {
-        L3Network response = null;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("l3-network");
-            request.addRequestProperty("l3-network.network-id", networkId);
-
-            String rv = executor.get(request);
-            if(rv != null) {
-                ObjectMapper mapper = getObjectMapper();
-                response = mapper.readValue(rv, L3Network.class);
-            }
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("requestL3NetworkData", exc);
-            throw new AAIServiceException(exc);
-        }
-        return response;
-    }
-
-    @Override
-    public L3Network requestL3NetworkQueryByName(String networkName) throws AAIServiceException {
-        L3Network response = null;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("l3-network");
-            request.addRequestProperty("l3-network.network-name", networkName);
-
-            String rv = executor.get(request);
-            if(rv != null) {
-                ObjectMapper mapper = getObjectMapper();
-                response = mapper.readValue(rv, L3Network.class);
-            }
-
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("requestL3NetworkQueryByName", exc);
-            throw new AAIServiceException(exc);
-        }
-        return response;
-    }
-
-    @Override
-    public boolean postL3NetworkData(String networkId, L3Network data) throws AAIServiceException {
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("l3-network");
-            request.addRequestProperty("l3-network.network-id", networkId);
-            request.setRequestObject(data);
-            Object response = executor.post(request);
-            return true;
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn(Object.class.getClass().getEnclosingMethod().getName(), exc);
-            throw new AAIServiceException(exc);
-        }
-    }
-
-    @Override
-    public boolean deleteL3NetworkData(String networkId, String resourceVersion) throws AAIServiceException {
-        boolean response = false;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("l3-network");
-            request.addRequestProperty("l3-network.network-id", networkId);
-            response = executor.delete(request, resourceVersion);
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("deleteL3NetworkData", exc);
-            throw new AAIServiceException(exc);
-        }
-
-        return response;
-    }
-
-
-    @Override
-    public VpnBinding requestVpnBindingData(String vpnId) throws AAIServiceException {
-        VpnBinding response = null;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("vpn-binding");
-            request.addRequestProperty("vpn-binding.vpn-id", vpnId);
-
-            String rv = executor.get(request);
-            if(rv != null) {
-                ObjectMapper mapper = getObjectMapper();
-                response = mapper.readValue(rv, VpnBinding.class);
-            }
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("requestVpnBindingData", exc);
-            throw new AAIServiceException(exc);
-        }
-        return response;
-    }
-
-    @Override
-    public boolean deleteVpnBindingData(String vpnId, String resourceVersion) throws AAIServiceException {
-        boolean response = false;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("vpn-binding");
-            request.addRequestProperty("vpn-binding.vpn-id", vpnId);
-            response = executor.delete(request, resourceVersion);
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("deleteVpnBindingData", exc);
-            throw new AAIServiceException(exc);
-        }
-        return response;
-    }
-
-
-    @Override
-    public VnfImage requestVnfImageData(String vnf_image_uuid) throws AAIServiceException {
-        VnfImage response = null;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("vnf-image");
-            request.addRequestProperty("vnf-image.vnf-image-uuid", vnf_image_uuid);
-
-            String rv = executor.get(request);
-            if(rv != null) {
-                ObjectMapper mapper = getObjectMapper();
-                response = mapper.readValue(rv, VnfImage.class);
-            }
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("requestVnfImageData", exc);
-            throw new AAIServiceException(exc);
-        }
-        return response;
-    }
-
-    @Override
-    public VnfImage requestVnfImageDataByVendorModel(String vendor, String model) throws AAIServiceException {
-        return requestVnfImageDataByVendorModelVersion(vendor, model, null);
-    }
-
-    @Override
-    public VnfImage requestVnfImageDataByVendorModelVersion(String vendor, String model, String version) throws AAIServiceException
-    {
-        List<VnfImage> responseList = new ArrayList<VnfImage>();
-        VnfImage response = null;
-        InputStream inputStream = null;
-
-        try {
-            String request_url = target_uri+vnf_image_query_path + (version==null? "": "&application-version={application_version}");
-            request_url = request_url.replace("{application_vendor}", encodeQuery(vendor)) ;
-            request_url = request_url.replace("{application_model}", encodeQuery(model)) ;
-            if(version != null) {
-                request_url = request_url.replace("{application_version}", encodeQuery(version)) ;
-            }
-            URL http_req_url =    new URL(request_url);
+            URL http_req_url =    url;
 
-            HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.GET);
+            HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.DELETE);
+
+            LOGwriteFirstTrace("DELETE", http_req_url.toString());
 
-            LOGwriteFirstTrace(HttpMethod.GET, http_req_url.toString());
-            LOGwriteDateTrace("application_vendor", vendor);
-            LOGwriteDateTrace("application_model", model);
-            if(version != null) {
-                LOGwriteDateTrace("application_version", version);
-            }
 
             // Check for errors
             int responseCode = con.getResponseCode();
-            if (responseCode == HttpURLConnection.HTTP_OK) {
+            if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
                 inputStream = con.getInputStream();
             } else {
                 inputStream = con.getErrorStream();
@@ -1957,23 +701,21 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
             LOG.debug("HttpURLConnection result:" + responseCode);
             if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8));
             BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) );
+            String line = null;
 
             ObjectMapper mapper = getObjectMapper();
 
-            if (responseCode == HttpURLConnection.HTTP_OK) {
-                response = mapper.readValue(reader, VnfImage.class);
-                String original_buffer = mapper.writeValueAsString(response);
-                LOGwriteEndingTrace(HttpURLConnection.HTTP_OK, "SUCCESS", original_buffer);
-                if(response.getApplicationVendor() == null  /*&& response.getAdditionalProperties() != null && !response.getAdditionalProperties().isEmpty()*/){
-                    LOG.warn("A List of multiple VNF-IMAGE entries has been returned");
-                    VnfImages listOfObjects = mapper.readValue(original_buffer, VnfImages.class);
-                    if(!listOfObjects.getVnfImage().isEmpty()) {
-                        response = listOfObjects.getVnfImage().get(0);
-                    }
+            if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
+                StringBuilder stringBuilder = new StringBuilder();
+
+                while( ( line = reader.readLine() ) != null ) {
+                    stringBuilder.append( line );
                 }
+                LOGwriteEndingTrace(responseCode, "SUCCESS", stringBuilder.toString());
+                response = true;
             } else if(responseCode == HttpURLConnection.HTTP_NOT_FOUND ) {
                 LOGwriteEndingTrace(responseCode, "HTTP_NOT_FOUND", "Entry does not exist.");
-                return response;
+                response = false;
             } else {
                 ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class);
                 LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse));
@@ -1983,29 +725,68 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
         } catch(AAIServiceException aaiexc) {
             throw aaiexc;
         } catch (Exception exc) {
-            LOG.warn("requestVnfImageData", exc);
+            LOG.warn(caller, exc);
             throw new AAIServiceException(exc);
         } finally {
             if(inputStream != null){
                 try {
                     inputStream.close();
                 } catch(Exception exc) {
-
+                    LOG.warn("Error closing InputStream", exc);
                 }
             }
         }
         return response;
     }
 
+    /**
+     * Generic method to GET json data from an A&AI callback URL.
+     * Then convert that json to an Object.
+     * If successful the Object is attempted to be cast to the type parameter.
+     *
+     * @param key
+     *            callback url for A&AI
+     * @param type
+     *            the class of object that A&AI will return
+     * @return the object created from json or null if the response code is not 200
+     *
+     * @throws AAIServiceException
+     *             if empty or null key and or type or there's an error with processing
+     */
+    public <T> T dataChangeRequestAaiData(String key, Class<T> type) throws AAIServiceException {
+        if (StringUtils.isEmpty(key) || type == null) {
+            throw new AAIServiceException("Key is empty or null and or type is null");
+        }
+
+        T response = null;
+
+        SvcLogicContext ctx = new SvcLogicContext();
+        if(!key.contains(" = ") && isValidURL(key)) {
+            key = String.format("selflink = '%s'", key);
+        } else
+        if(!key.contains(" = ") && isValidURI(key)) {
+            key = String.format("resource-path = '%s'", key);
+        }
+
+        HashMap<String, String> nameValues = AAIServiceUtils.keyToHashMap(key, ctx);
+
+        SelfLinkRequest request = new SelfLinkRequest(type);
+        request.processRequestPathValues(nameValues);
+        Object obj = this.getExecutor().query(request, type);
+        response = type.cast(obj);
+
+        return response != null ? type.cast(response) : response;
+    }
+
 
     public boolean sendNotify(NotifyEvent event, String serviceInstanceId, String pathCode) throws AAIServiceException {
         InputStream inputStream = null;
 
         try {
 
-            String selfLink = selflink_fqdn;
+            String selfLink = selflinkFqdn;
             if(SELFLINK_AVPN != null && SELFLINK_AVPN.equals(pathCode)) {
-                selfLink = selflink_avpn;
+                selfLink = selflinkAvpn;
             }
             selfLink = selfLink.replace("{service-instance-id}", encodeQuery(serviceInstanceId));
             event.setSelflink(selfLink);
@@ -2015,16 +796,17 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
 
             SSLSocketFactory sockFact = CTX.getSocketFactory();
 
-            String request_url = target_uri+ubb_notify_path;
+            String request_url = targetUri+ubb_notify_path;
             URL http_req_url =    new URL(request_url);
 
             HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.PUT);
 
-            OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream());
-            osw.write(json_text);
-            osw.flush();
-            osw.close();
-
+            if (json_text != null) {
+                OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream());
+                osw.write(json_text);
+                osw.flush();
+                osw.close();
+            }
 
             LOGwriteFirstTrace("PUT", request_url);
             LOGwriteDateTrace("NotifyEvent", json_text);
@@ -2067,7 +849,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
                 if(inputStream != null)
                 inputStream.close();
             } catch (Exception exc) {
-
+                LOG.warn("Error closing Input stream", exc);
             }
         }
     }
@@ -2078,7 +860,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
         InputStream inputStream = null;
 
         try {
-            String request_url = target_uri+query_nodes_path;
+            String request_url = targetUri+queryNodesPath;
             request_url = request_url.replace("{node-type}", encodeQuery(node_type)) ;
             request_url = request_url.replace("{entity-identifier}", entityIdentifier) ;
             request_url = request_url.replace("{entity-name}", encodeQuery(entityName)) ;
@@ -2127,7 +909,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
                 try {
                     inputStream.close();
                 } catch(Exception exc) {
-
+                    LOG.warn("Error closing Input stream", exc);
                 }
             }
         }
@@ -2197,7 +979,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
                 try {
                     inputStream.close();
                 } catch(Exception exc) {
-
+                    LOG.warn("Error closing Input stream", exc);
                 }
             }
         }
@@ -2219,8 +1001,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
 
         try {
             for (ResultData datum : resultDataList) {
-                String data_type = datum.getResourceType();
-                URL url = new URL(datum.getResourceLink());
+                URI url = new URI(datum.getResourceLink());
                 entity = this.getResource(url.toString(), GenericVnf.class);
             }
         }
@@ -2267,7 +1048,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
                 String data_type = datum.getResourceType();
                 String resourceLink = datum.getResourceLink();
                 if(!resourceLink.isEmpty() && !resourceLink.toLowerCase().startsWith("http")) {
-                    resourceLink = (new EchoRequest()).target_uri + resourceLink;
+                    resourceLink = (new EchoRequest()).targetUri + resourceLink;
                 }
                 entity = new URL(resourceLink);
             }
@@ -2277,498 +1058,6 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
         return entity;
     }
 
-    class AAIRequestExecutor implements AAIExecutorInterface {
-
-        @Override
-        public String get(AAIRequest request) throws AAIServiceException {
-            String response = null;
-            InputStream inputStream = null;
-            HttpURLConnection con = null;
-            URL requestUrl = null;
-
-            String requestId = UUID.randomUUID().toString();
-            StringBuilder errorStringBuilder = new StringBuilder();
-
-            try {
-
-                if(request.getRequestObject() != null) {
-                    requestUrl = request.getRequestUrl(HttpMethod.POST, null);
-                    requestUrl = appendDepth(requestUrl, request);
-                    con = getConfiguredConnection(requestUrl, HttpMethod.POST);
-                    String json_text = request.toJSONString();
-                    LOGwriteDateTrace("data", json_text);
-                    logMetricRequest(requestId, "POST "+requestUrl.getPath(), json_text, requestUrl.getPath());
-                    OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream());
-                    osw.write(json_text);
-                    osw.flush();
-                } else {
-                    requestUrl = request.getRequestUrl(HttpMethod.GET, null);
-                    requestUrl = appendDepth(requestUrl, request);
-                    con = getConfiguredConnection(requestUrl, HttpMethod.GET);
-                    logMetricRequest(requestId, "GET "+requestUrl.getPath(), "", requestUrl.getPath());
-                }
-
-                // Check for errors
-                String responseMessage = con.getResponseMessage();
-                int responseCode = con.getResponseCode();
-                if (responseCode == HttpURLConnection.HTTP_OK) {
-                    inputStream = con.getInputStream();
-                } else {
-                    inputStream = con.getErrorStream();
-                }
-
-                // Process the response
-                LOG.debug("HttpURLConnection result:" + responseCode + " : " + responseMessage);
-                logMetricResponse(requestId, responseCode, responseMessage);
-
-                if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8));
-                BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) );
-
-                ObjectMapper mapper = getObjectMapper();
-
-                if (responseCode == HttpURLConnection.HTTP_OK) {
-                    StringBuilder stringBuilder = new StringBuilder();
-                    String line = null;
-                    while( ( line = reader.readLine() ) != null ) {
-                        stringBuilder.append( line );
-                    }
-                    response = stringBuilder.toString();
-                    try {
-                        Object object = mapper.readValue(response, Object.class);
-                        LOGwriteEndingTrace(HttpURLConnection.HTTP_OK, responseMessage, mapper.writeValueAsString(object));
-                    } catch(Exception exc) {
-                        LOGwriteEndingTrace(HttpURLConnection.HTTP_OK, responseMessage, mapper.writeValueAsString(response));
-                    }
-                } else if (responseCode == HttpURLConnection.HTTP_NOT_FOUND) {
-                    LOGwriteEndingTrace(responseCode, responseMessage, "Entry does not exist.");
-                    ErrorResponse errorresponse = null;
-                    try {
-                        errorresponse = mapper.readValue(reader, ErrorResponse.class);
-                    } catch(Exception exc) {
-                        errorresponse = new ErrorResponse();
-                        RequestError requestError = new RequestError();
-                        ServiceException serviceException = new ServiceException();
-                        serviceException.setText("Entry does not exist.");
-                        requestError.setServiceException(serviceException);
-                        errorresponse.setRequestError(requestError );
-                    }
-                    throw new AAIServiceException(responseCode, errorresponse);
-                } else if (responseCode == HttpURLConnection.HTTP_UNAUTHORIZED) {
-                    StringBuilder stringBuilder = new StringBuilder();
-                    String line = null;
-                    while( ( line = reader.readLine() ) != null ) {
-                        stringBuilder.append( line );
-                    }
-                    LOGwriteEndingTrace(responseCode, responseMessage, stringBuilder.toString());
-                    ServiceException serviceException = new ServiceException();
-                    serviceException.setMessageId("HTTP_UNAUTHORIZED");
-                    serviceException.setText(stringBuilder.toString());
-                    RequestError requestError = new RequestError();
-                    requestError.setServiceException(serviceException);
-                    ErrorResponse errorresponse = new ErrorResponse();
-                    errorresponse.setRequestError(requestError);
-                    throw new AAIServiceException(responseCode, errorresponse);
-                } else {
-//                    StringBuilder errorStringBuilder = new StringBuilder();
-                    String line = null;
-                    while( ( line = reader.readLine() ) != null ) {
-                        errorStringBuilder.append("\n").append( line );
-                    }
-
-                    ErrorResponse errorresponse = mapper.readValue(errorStringBuilder.toString(), ErrorResponse.class);
-//                    ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class);
-                    LOGwriteEndingTrace(responseCode, responseMessage, mapper.writeValueAsString(errorresponse));
-                    throw new AAIServiceException(responseCode, errorresponse);
-                }
-
-            } catch(AAIServiceException aaiexc) {
-                throw aaiexc;
-            } catch (Exception exc) {
-                LOG.warn(errorStringBuilder.toString(), exc);
-                throw new AAIServiceException(exc);
-            } finally {
-                if(inputStream != null){
-                    try {
-                        inputStream.close();
-                    } catch(Exception exc) {
-
-                    }
-                }
-            }
-            return response;
-        }
-
-        private URL appendDepth(URL requestUrl, AAIRequest request) throws MalformedURLException {
-
-            String depth = request.requestProperties.getProperty("depth", "1");
-            String path = requestUrl.toString();
-            if(path.contains("?depth=") || path.contains("&depth=")) {
-                return requestUrl;
-            } else {
-                if(path.contains("?")) {
-                    path = String.format("%s&depth=%s", path, depth);
-                } else {
-                    path = String.format("%s?depth=%s", path, depth);
-                }
-                return new URL(path);
-            }
-        }
-
-        @Override
-        public String post(AAIRequest request) throws AAIServiceException {
-            InputStream inputStream = null;
-            String requestId = UUID.randomUUID().toString();
-
-            try {
-                String resourceVersion = null;
-                AAIDatum instance = request.getRequestObject();
-
-                Method getResourceVersionMethod = instance.getClass().getMethod("getResourceVersion");
-                if(getResourceVersionMethod != null){
-                    try {
-                        getResourceVersionMethod.setAccessible(true);
-                        Object object = getResourceVersionMethod.invoke(instance);
-                        if(object != null)
-                            resourceVersion = object.toString();
-                    } catch (InvocationTargetException x) {
-                        Throwable cause = x.getCause();
-                    }
-                }
-
-                URL requestUrl = null;
-                HttpURLConnection con = getConfiguredConnection(requestUrl = request.getRequestUrl(HttpMethod.PUT, resourceVersion), HttpMethod.PUT);
-                ObjectMapper mapper = getObjectMapper();
-                String json_text = request.toJSONString();
-
-                LOGwriteDateTrace("data", json_text);
-                logMetricRequest(requestId, "PUT "+requestUrl.getPath(), json_text, requestUrl.getPath());
-
-                OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream());
-                osw.write(json_text);
-                osw.flush();
-
-                // Check for errors
-                String responseMessage = con.getResponseMessage();
-                int responseCode = con.getResponseCode();
-                if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
-                    inputStream = con.getInputStream();
-                } else {
-                    inputStream = con.getErrorStream();
-                }
-
-                LOG.debug("HttpURLConnection result:" + responseCode + " : " + responseMessage);
-                logMetricResponse(requestId,responseCode, responseMessage);
-
-                // Process the response
-                BufferedReader reader;
-                String line = null;
-                reader = new BufferedReader( new InputStreamReader( inputStream ) );
-                mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-
-                if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
-                    StringBuilder stringBuilder = new StringBuilder();
-
-                    while( ( line = reader.readLine() ) != null ) {
-                        stringBuilder.append( line );
-                    }
-                    LOGwriteEndingTrace(responseCode, responseMessage, (stringBuilder != null) ? stringBuilder.toString() : "{no-data}");
-                    return stringBuilder.toString();
-                } else {
-                    ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class);
-                    LOGwriteEndingTrace(responseCode, responseMessage, mapper.writeValueAsString(errorresponse));
-
-                    throw new AAIServiceException(responseCode, errorresponse);
-                }
-            } catch(AAIServiceException aaiexc) {
-                throw aaiexc;
-            } catch (Exception exc) {
-                LOG.warn("AAIRequestExecutor.post", exc);
-                throw new AAIServiceException(exc);
-            } finally {
-                try {
-                    if(inputStream != null)
-                    inputStream.close();
-                } catch (Exception exc) {
-
-                }
-            }
-        }
-
-        @Override
-        public Boolean delete(AAIRequest request, String resourceVersion) throws AAIServiceException {
-            Boolean response = null;
-            InputStream inputStream = null;
-            String requestId = UUID.randomUUID().toString();
-
-            if(resourceVersion == null) {
-                throw new AAIServiceException("resource-version is required for DELETE request");
-            }
-
-            try {
-                URL requestUrl = null;
-                HttpURLConnection conn = getConfiguredConnection(requestUrl = request.getRequestUrl(HttpMethod.DELETE, resourceVersion), HttpMethod.DELETE);
-                logMetricRequest(requestId, "DELETE "+requestUrl.getPath(), "", requestUrl.getPath());
-                conn.setDoOutput(true);
-
-                // Check for errors
-                String responseMessage = conn.getResponseMessage();
-                int responseCode = conn.getResponseCode();
-                if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
-                    inputStream = conn.getInputStream();
-                } else {
-                    inputStream = conn.getErrorStream();
-                }
-
-                // Process the response
-                LOG.debug("HttpURLConnection result:" + responseCode + " : " + responseMessage);
-                logMetricResponse(requestId,responseCode, responseMessage);
-
-                if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8));
-                BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) );
-                String line = null;
-
-                ObjectMapper mapper = getObjectMapper();
-
-                if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
-                    StringBuilder stringBuilder = new StringBuilder();
-
-                    while( ( line = reader.readLine() ) != null ) {
-                        stringBuilder.append( line );
-                    }
-                    LOGwriteEndingTrace(responseCode, responseMessage, stringBuilder.toString());
-                    response = true;
-                } else if(responseCode == HttpURLConnection.HTTP_NOT_FOUND ) {
-                    LOGwriteEndingTrace(responseCode, responseMessage, "Entry does not exist.");
-                    response = false;
-                } else {
-                    ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class);
-                    LOGwriteEndingTrace(responseCode, responseMessage, mapper.writeValueAsString(errorresponse));
-                    throw new AAIServiceException(responseCode, errorresponse);
-                }
-            } catch(AAIServiceException aaiexc) {
-                throw aaiexc;
-            } catch (Exception exc) {
-                LOG.warn("delete", exc);
-                throw new AAIServiceException(exc);
-            } finally {
-                if(inputStream != null){
-                    try {
-                        inputStream.close();
-                    } catch(Exception exc) {
-
-                    }
-                }
-            }
-            return response;
-        }
-
-        @Override
-        public Object query(AAIRequest request, Class clas) throws AAIServiceException {
-            Object response = null;
-            InputStream inputStream = null;
-            HttpURLConnection con = null;
-            URL requestUrl = null;
-            String requestId = UUID.randomUUID().toString();
-
-            try {
-                requestUrl = request.getRequestQueryUrl(HttpMethod.GET);
-                con = getConfiguredConnection(requestUrl , HttpMethod.GET);
-                logMetricRequest(requestId, "GET "+requestUrl.getPath(), "", requestUrl.getPath());
-
-                // Check for errors
-                String responseMessage = con.getResponseMessage();
-                int responseCode = con.getResponseCode();
-                if (responseCode == HttpURLConnection.HTTP_OK) {
-                    inputStream = con.getInputStream();
-                } else {
-                    inputStream = con.getErrorStream();
-                }
-
-                logMetricResponse(requestId,responseCode, responseMessage);
-                ObjectMapper mapper = getObjectMapper();
-
-                if (responseCode == HttpURLConnection.HTTP_OK) {
-                    // Process the response
-                    BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) );
-                    response = mapper.readValue(reader, clas);
-                    LOGwriteEndingTrace(HttpURLConnection.HTTP_OK, "SUCCESS", mapper.writeValueAsString(response));
-                } else if (responseCode == HttpURLConnection.HTTP_NOT_FOUND) {
-                    LOGwriteEndingTrace(responseCode, "HTTP_NOT_FOUND", "Entry does not exist.");
-                    return response;
-                } else {
-                    BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) );
-                    ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class);
-                    LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse));
-                    throw new AAIServiceException(responseCode, errorresponse);
-                }
-
-            } catch(AAIServiceException aaiexc) {
-                throw aaiexc;
-            } catch (Exception exc) {
-                LOG.warn("GET", exc);
-                throw new AAIServiceException(exc);
-            } finally {
-                if(inputStream != null){
-                    try {
-                        inputStream.close();
-                    } catch(Exception exc) {
-
-                    }
-                }
-                con = null;
-            }
-            return response;
-        }
-
-        @Override
-        public Boolean patch(AAIRequest request, String resourceVersion) throws AAIServiceException {
-            InputStream inputStream = null;
-            String requestId = UUID.randomUUID().toString();
-
-            try {
-                AAIDatum instance = request.getRequestObject();
-                if(instance instanceof ResourceVersion) {
-                    resourceVersion = ((ResourceVersion)instance).getResourceVersion();
-                }
-
-                URL requestUrl = null;
-                HttpURLConnection con = getConfiguredConnection(requestUrl = request.getRequestUrl("PATCH", resourceVersion), "PATCH");
-                ObjectMapper mapper = getObjectMapper();
-                String json_text = request.toJSONString();
-
-                LOGwriteDateTrace("data", json_text);
-                logMetricRequest(requestId, "PATCH "+requestUrl.getPath(), json_text, requestUrl.getPath());
-
-                OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream());
-                osw.write(json_text);
-                osw.flush();
-
-                // Check for errors
-                String responseMessage = con.getResponseMessage();
-                int responseCode = con.getResponseCode();
-                if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
-                    inputStream = con.getInputStream();
-                } else {
-                    inputStream = con.getErrorStream();
-                }
-
-                LOG.info("HttpURLConnection result: " + responseCode + " : " + responseMessage);
-                logMetricResponse(requestId,responseCode, responseMessage);
-
-                // Process the response
-                BufferedReader reader;
-                String line = null;
-                reader = new BufferedReader( new InputStreamReader( inputStream ) );
-                mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-
-                if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
-                    StringBuilder stringBuilder = new StringBuilder();
-
-                    while( ( line = reader.readLine() ) != null ) {
-                        stringBuilder.append( line );
-                    }
-                    LOGwriteEndingTrace(responseCode, responseMessage,
-                                               (stringBuilder.length() > 0) ? stringBuilder.toString() : "{no-data}");
-                    return true;
-                } else {
-                    StringBuilder stringBuilder = new StringBuilder();
-
-                    while( ( line = reader.readLine() ) != null ) {
-                        stringBuilder.append("\n").append( line );
-                    }
-                    LOG.info(stringBuilder.toString());
-
-
-                    ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class);
-                    LOGwriteEndingTrace(responseCode, responseMessage, mapper.writeValueAsString(errorresponse));
-
-                    throw new AAIServiceException(responseCode, errorresponse);
-                }
-            } catch(AAIServiceException aaiexc) {
-                throw aaiexc;
-            } catch (Exception exc) {
-                LOG.warn("AAIRequestExecutor.patch", exc);
-                throw new AAIServiceException(exc);
-            } finally {
-                try {
-                    if(inputStream != null)
-                    inputStream.close();
-                } catch (Exception exc) {
-
-                }
-            }
-        }
-    }
-
-    @Override
-    public Tenant requestTenantData(String tenant_id, String cloudOwner, String cloudRegionId) throws AAIServiceException {
-        Tenant response = null;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("tenant");
-            request.addRequestProperty("tenant.tenant-id", tenant_id);
-            request.addRequestProperty("cloud-region.cloud-owner", cloudOwner);
-            request.addRequestProperty("cloud-region.cloud-region-id", cloudRegionId);
-
-            String rv = executor.get(request);
-            if(rv != null) {
-                ObjectMapper mapper = getObjectMapper();
-                response = mapper.readValue(rv, Tenant.class);
-            }
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("requestTenantData", exc);
-            throw new AAIServiceException(exc);
-        }
-
-        return response;
-    }
-
-    @Override
-    public Tenant requestTenantDataByName(String tenant_name, String cloudOwner, String cloudRegionId) throws AAIServiceException {
-        Tenant response = null;
-
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("tenant");
-            request.addRequestProperty("tenant.tenant-name", tenant_name);
-            request.addRequestProperty("cloud-region.cloud-owner", cloudOwner);
-            request.addRequestProperty("cloud-region.cloud-region-id", cloudRegionId);
-            Object rv = executor.query(request, Tenant.class);
-            if(rv == null)
-                return (Tenant)null;
-            else
-                response = (Tenant)rv;
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("requestTenantDataByName", exc);
-            throw new AAIServiceException(exc);
-        }
-
-        return response;
-    }
-
-
-    @Override
-    public boolean postTenantData(String tenant_id, String cloudOwner, String cloudRegionId, Tenant tenannt) throws AAIServiceException {
-        try {
-            AAIRequest request = AAIRequest.getRequestFromResource("tenant");
-            request.addRequestProperty("tenant.tenant-id", tenant_id);
-            request.addRequestProperty("cloud-region.cloud-owner", cloudOwner);
-            request.addRequestProperty("cloud-region.cloud-region-id", cloudRegionId);
-            request.setRequestObject(tenannt);
-            Object response = executor.post(request);
-            return true;
-        } catch(AAIServiceException aaiexc) {
-            throw aaiexc;
-        } catch (Exception exc) {
-            LOG.warn("postTenantData", exc);
-            throw new AAIServiceException(exc);
-        }
-    }
-
-
     @Override
     public String getTenantIdFromVserverUrl(URL url) {
 
@@ -2813,7 +1102,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
 
     @Override
     public String getVServerIdFromVserverUrl(URL url, String tenantId) {
-        String pattern =  network_vserver_path;
+        String pattern =  networkVserverPath;
         pattern = pattern.replace("{tenant-id}", tenantId);
 
         int end = pattern.indexOf("{vserver-id}");
@@ -2834,7 +1123,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
 
 
     @Override
-    public AAIRequestExecutor getExecutor() {
+    public AAIExecutorInterface getExecutor() {
         return executor;
     }
 
@@ -2922,12 +1211,14 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
             try {
                 u = new URL(url);
             } catch (MalformedURLException e) {
+                LOG.warn("MalformedURLException", e);
                 return false;
             }
 
             try {
                 u.toURI();
             } catch (URISyntaxException e) {
+                LOG.warn("URISyntaxException", e);
                 return false;
             }
 
@@ -2942,6 +1233,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
         try {
             u = new URI(url);
         } catch (URISyntaxException e) {
+            LOG.warn("URISyntaxException", e);
             return false;
         }
 
@@ -2949,7 +1241,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
     }
 
 
-    protected boolean deleteRelationshipList(URL httpReqUrl, String json_text) throws AAIServiceException {
+    protected boolean deleteList(URL httpReqUrl, String jsonText) throws AAIServiceException {
         if(httpReqUrl ==  null) {
             throw new NullPointerException();
         }
@@ -2962,14 +1254,15 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
 
 //            SSLSocketFactory sockFact = CTX.getSocketFactory();
 //            con.setSSLSocketFactory( sockFact );
-            OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream());
-            osw.write(json_text);
-            osw.flush();
-            osw.close();
-
+            if (jsonText != null) {
+                OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream());
+                osw.write(jsonText);
+                osw.flush();
+                osw.close();
+            }
 
             LOGwriteFirstTrace("DELETE", httpReqUrl.toString());
-            LOGwriteDateTrace("data", json_text);
+            LOGwriteDateTrace("data", jsonText);
 
             // Check for errors
             int responseCode = con.getResponseCode();
@@ -3007,7 +1300,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
         } catch(AAIServiceException aaiexc) {
             throw aaiexc;
         } catch (Exception exc) {
-            LOG.warn("deleteRelationshipList", exc);
+            LOG.warn("deleteList", exc);
             throw new AAIServiceException(exc);
         } finally {
             if(inputStream != null){
@@ -3028,6 +1321,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
         mapper.setAnnotationIntrospector(AnnotationIntrospector.pair(introspector, secondary));
         mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
         mapper.setSerializationInclusion(Include.NON_NULL);
+        mapper.setSerializationInclusion(Include.NON_EMPTY);
         return mapper;
     }
 
@@ -3038,13 +1332,11 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
         String targetEntity = "A&AI";
         String targetVirtualEntity = null;
 
-        targetServiceName = "";
-
         ml.logRequest(svcInstanceId, svcName, partnerName, targetEntity, targetServiceName, targetVirtualEntity, msg);
     }
 
     public void logMetricResponse(String requestId, int responseCode, String responseDescription){
-        ml.logResponse(responseCode < 400 ? "SUCCESS" : "FAILURE", Integer.toString(responseCode), responseDescription);
+        ml.logResponse(responseCode < 400 ? "COMPLETE" : "ERROR", Integer.toString(responseCode), responseDescription);
     }
 
     public void logKeyError(String keys){
@@ -3064,7 +1356,6 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
         case "custom-query":
         case "formatted-query":
         case "generic-query":
-        case "named-query":
         case "nodes-query":
         case "linterface":
         case "l2-bridge-sbg":
@@ -3090,9 +1381,9 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
         String normResource = resource.split(":")[0];
 
         switch(normResource){
+        case "custom-query":
         case "formatted-query":
         case "generic-query":
-        case "named-query":
         case "nodes-query":
         case "linterface":
         case "l2-bridge-sbg":
@@ -3118,9 +1409,9 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
         String normResource = resource.split(":")[0];
 
         switch(normResource){
+        case "custom-query":
         case "formatted-query":
         case "generic-query":
-        case "named-query":
         case "nodes-query":
         case "linterface":
         case "l2-bridge-sbg":
@@ -3146,9 +1437,9 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
         String normResource = resource.split(":")[0];
 
         switch(normResource){
+        case "custom-query":
         case "formatted-query":
         case "generic-query":
-        case "named-query":
         case "nodes-query":
         case "linterface":
         case "l2-bridge-sbg":
@@ -3173,13 +1464,8 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
         LOG.info("AAI Deprecation - the format of request key is no longer supported. Please rewrite this key : " + key);
 
         String normResource = resource.split(":")[0];
-        Class<? extends AAIDatum> clazz = null;
-        try {
-            clazz = AAIRequest.getClassFromResource(normResource) ;
-        } catch (ClassNotFoundException e) {
-            LOG.warn("AAIRequest does not support class: " + e.getMessage());
-            return key;
-        }
+        Class<? extends AAIDatum> clazz = AAIRequest.getClassFromResource(normResource) ;
+
         if(clazz == null)
             return key;
 
@@ -3222,7 +1508,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
     }
 
     @Override
-    public boolean isDeprecatedFormat(String resource, HashMap<String, String> nameValues) {
+    public boolean isDeprecatedFormat(String resource, Map<String, String> nameValues) {
         return !AAIServiceUtils.isValidFormat(resource, nameValues);
     }
 
@@ -3231,7 +1517,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.sdnc.sli.aai.haha#query(org.openecomp.sdnc.sli.aai.AAIRequest)
+     * @see org.onap.ccsdk.sli.core.sli.aai.haha#query(org.onap.ccsdk.sli.core.sli.aai.AAIRequest)
      */
     @Override
     public String query(AAIRequest request) throws AAIServiceException {
@@ -3239,7 +1525,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.sdnc.sli.aai.haha#save(org.openecomp.sdnc.sli.aai.AAIRequest)
+     * @see org.onap.ccsdk.sli.core.sli.aai.haha#save(org.onap.ccsdk.sli.core.sli.aai.AAIRequest)
      */
     @Override
     public String save(AAIRequest request) throws AAIServiceException {
@@ -3251,11 +1537,11 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe
     }
 
     /* (non-Javadoc)
-     * @see org.openecomp.sdnc.sli.aai.haha#delete(org.openecomp.sdnc.sli.aai.AAIRequest, java.lang.String)
+     * @see org.onap.ccsdk.sli.core.sli.aai.haha#delete(org.onap.ccsdk.sli.core.sli.aai.AAIRequest, java.lang.String)
      */
     @Override
     public boolean delete(AAIRequest request, String resourceVersion) throws AAIServiceException {
-        return executor.patch(request, resourceVersion);
+        return executor.delete(request, resourceVersion);
     }
 
 }