From: Marcus G K Williams Date: Fri, 4 Aug 2017 21:40:55 +0000 (-0700) Subject: Update sli-adaptor/aai-service package names X-Git-Tag: v0.1.0~55 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7aeb6339da8ab2bd346655438b65fa4a413c7405;p=ccsdk%2Fsli%2Fadaptors.git Update sli-adaptor/aai-service package names Update package names from org.openecomp.sdnc.adaptors.* -> onap.ccsdk.sli.adaptors.* Update groupIds from org.openecomp.sdnc.adaptors -> onap.ccsdk.sli.adaptors Issue: CCSDK-19 Change-Id: I3d41c1484479645edaf0d47ad4e8fd87e707cb39 Signed-off-by: Marcus G K Williams --- diff --git a/aai-service/features/src/main/resources/features.xml b/aai-service/features/src/main/resources/features.xml index 23ab9976..c992710a 100644 --- a/aai-service/features/src/main/resources/features.xml +++ b/aai-service/features/src/main/resources/features.xml @@ -1,10 +1,10 @@ - mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features - + odl-mdsal-broker - sdnc-sli - mvn:org.openecomp.sdnc.adaptors/aai-service-provider/${project.version} + ccsdk-sli + mvn:org.onap.ccsdk.sli.adaptors/aai-service-provider/${project.version} mvn:com.sun.jersey/jersey-client/${jersey.client.version} mvn:com.sun.jersey/jersey-core/${jersey.version} mvn:org.apache.httpcomponents/httpcore-osgi/${apache.httpcomponents.version} diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIClient.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIClient.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIClient.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIClient.java index 05921203..ba5ef587 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIClient.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIClient.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.IOException; import java.net.URL; @@ -52,8 +52,8 @@ import org.openecomp.aai.inventory.v10.Vpe; import org.openecomp.aai.inventory.v10.VplsPe; import org.openecomp.aai.inventory.v10.VpnBinding; import org.openecomp.aai.inventory.v10.Vserver; -import org.openecomp.sdnc.sli.aai.data.notify.NotifyEvent; -import org.openecomp.sdnc.sli.aai.data.v1507.VServer; +import org.onap.ccsdk.sli.adaptors.aai.data.notify.NotifyEvent; +import org.onap.ccsdk.sli.adaptors.aai.data.v1507.VServer; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIDeclarations.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIDeclarations.java similarity index 95% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIDeclarations.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIDeclarations.java index cee0847b..3ba453d3 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIDeclarations.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIDeclarations.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -65,15 +65,15 @@ import org.openecomp.aai.inventory.v10.ServiceInstance; import org.openecomp.aai.inventory.v10.Vlan; import org.openecomp.aai.inventory.v10.Vlans; import org.openecomp.aai.inventory.v10.Vserver; -import org.openecomp.sdnc.sli.aai.AAIService.AAIRequestExecutor; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; -import org.openecomp.sdnc.sli.aai.query.FormattedQueryResultList; -import org.openecomp.sdnc.sli.aai.query.InstanceFilter; -import org.openecomp.sdnc.sli.aai.query.InstanceFilters; -import org.openecomp.sdnc.sli.aai.query.NamedQuery; -import org.openecomp.sdnc.sli.aai.query.NamedQueryData; -import org.openecomp.sdnc.sli.aai.query.QueryParameters; -import org.openecomp.sdnc.sli.aai.query.Results; +import org.onap.ccsdk.sli.adaptors.aai.AAIService.AAIRequestExecutor; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; +import org.onap.ccsdk.sli.adaptors.aai.query.FormattedQueryResultList; +import org.onap.ccsdk.sli.adaptors.aai.query.InstanceFilter; +import org.onap.ccsdk.sli.adaptors.aai.query.InstanceFilters; +import org.onap.ccsdk.sli.adaptors.aai.query.NamedQuery; +import org.onap.ccsdk.sli.adaptors.aai.query.NamedQueryData; +import org.onap.ccsdk.sli.adaptors.aai.query.QueryParameters; +import org.onap.ccsdk.sli.adaptors.aai.query.Results; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -84,56 +84,56 @@ import com.fasterxml.jackson.databind.ObjectMapper; public abstract class AAIDeclarations implements AAIClient { - public static final String TRUSTSTORE_PATH = "org.openecomp.sdnc.sli.aai.ssl.trust"; - public static final String TRUSTSTORE_PSSWD = "org.openecomp.sdnc.sli.aai.ssl.trust.psswd"; - public static final String KEYSTORE_PATH = "org.openecomp.sdnc.sli.aai.ssl.key"; - public static final String KEYSTORE_PSSWD = "org.openecomp.sdnc.sli.aai.ssl.key.psswd"; + public static final String TRUSTSTORE_PATH = "org.onap.ccsdk.sli.adaptors.aai.ssl.trust"; + public static final String TRUSTSTORE_PSSWD = "org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd"; + public static final String KEYSTORE_PATH = "org.onap.ccsdk.sli.adaptors.aai.ssl.key"; + public static final String KEYSTORE_PSSWD = "org.onap.ccsdk.sli.adaptors.aai.ssl.key.psswd"; - public static final String APPLICATION_ID = "org.openecomp.sdnc.sli.aai.application"; + public static final String APPLICATION_ID = "org.onap.ccsdk.sli.adaptors.aai.application"; - public static final String CLIENT_NAME = "org.openecomp.sdnc.sli.aai.client.name"; - public static final String CLIENT_PWWD = "org.openecomp.sdnc.sli.aai.client.psswd"; + public static final String CLIENT_NAME = "org.onap.ccsdk.sli.adaptors.aai.client.name"; + public static final String CLIENT_PWWD = "org.onap.ccsdk.sli.adaptors.aai.client.psswd"; public static final String CONNECTION_TIMEOUT = "connection.timeout"; public static final String READ_TIMEOUT = "read.timeout"; - public static final String TARGET_URI = "org.openecomp.sdnc.sli.aai.uri"; + public static final String TARGET_URI = "org.onap.ccsdk.sli.adaptors.aai.uri"; // Availability zones query - public static final String QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.query"; + public static final String QUERY_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.query"; // Update - public static final String UPDATE_PATH = "org.openecomp.sdnc.sli.aai.update"; + public static final String UPDATE_PATH = "org.onap.ccsdk.sli.adaptors.aai.update"; // Service instance - public static final String SVC_INSTANCE_PATH = "org.openecomp.sdnc.sli.aai.path.svcinst"; - public static final String SVC_INST_QRY_PATH = "org.openecomp.sdnc.sli.aai.path.svcinst.query"; + public static final String SVC_INSTANCE_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.svcinst"; + public static final String SVC_INST_QRY_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query"; // VServer - public static final String NETWORK_VSERVER_PATH = "org.openecomp.sdnc.sli.aai.path.vserver"; + public static final String NETWORK_VSERVER_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.vserver"; - public static final String VNF_IMAGE_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.vnf.image.query"; + public static final String VNF_IMAGE_QUERY_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query"; - public static final String PARAM_SERVICE_TYPE = "org.openecomp.sdnc.sli.aai.param.service.type"; - public static final String CERTIFICATE_HOST_ERROR = "org.openecomp.sdnc.sli.aai.host.certificate.ignore"; + public static final String PARAM_SERVICE_TYPE = "org.onap.ccsdk.sli.adaptors.aai.param.service.type"; + public static final String CERTIFICATE_HOST_ERROR = "org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore"; // UBB Notify - public static final String UBB_NOTIFY_PATH = "org.openecomp.sdnc.sli.aai.path.notify"; - public static final String SELFLINK_AVPN = "org.openecomp.sdnc.sli.aai.notify.selflink.avpn"; - public static final String SELFLINK_FQDN = "org.openecomp.sdnc.sli.aai.notify.selflink.fqdn"; + public static final String UBB_NOTIFY_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.notify"; + public static final String SELFLINK_AVPN = "org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn"; + public static final String SELFLINK_FQDN = "org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn"; //Service - public static final String SERVICE_PATH = "org.openecomp.sdnc.sli.aai.path.service"; + public static final String SERVICE_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.service"; // P-Interfaces - public static final String P_INTERFACE_PATH = "org.openecomp.sdnc.sli.aai.path.pserver.pinterface"; + public static final String P_INTERFACE_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface"; // site-pair-sets - public static final String SITE_PAIR_SET_PATH = "org.openecomp.sdnc.sli.aai.path.site.pair.set"; + public static final String SITE_PAIR_SET_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.site.pair.set"; // node query (1602) - public static final String QUERY_NODES_PATH = "org.openecomp.sdnc.sli.aai.query.nodes"; + public static final String QUERY_NODES_PATH = "org.onap.ccsdk.sli.adaptors.aai.query.nodes"; protected abstract Logger getLogger(); diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIExecutorInterface.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIExecutorInterface.java similarity index 97% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIExecutorInterface.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIExecutorInterface.java index 5b94f258..d315bad1 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIExecutorInterface.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIExecutorInterface.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; public interface AAIExecutorInterface { public Object get(AAIRequest request) throws AAIServiceException; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIRequest.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIRequest.java index f806ef4e..4f2181f6 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIRequest.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.IOException; import java.io.InputStream; @@ -44,7 +44,7 @@ import java.util.TreeSet; import org.apache.commons.lang.StringUtils; import org.openecomp.aai.inventory.v10.GenericVnf; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; @@ -59,7 +59,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; public abstract class AAIRequest { protected static final Logger LOG = LoggerFactory.getLogger(AAIRequest.class); - protected static final String TARGET_URI = "org.openecomp.sdnc.sli.aai.uri"; + protected static final String TARGET_URI = "org.onap.ccsdk.sli.adaptors.aai.uri"; protected static final String MASTER_REQUEST = "master-request"; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIService.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIService.java similarity index 99% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIService.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIService.java index 3f62374a..c50178bc 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIService.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIService.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.BufferedReader; @@ -98,13 +98,13 @@ import org.openecomp.aai.inventory.v10.Vpe; import org.openecomp.aai.inventory.v10.VplsPe; import org.openecomp.aai.inventory.v10.VpnBinding; import org.openecomp.aai.inventory.v10.Vserver; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; -import org.openecomp.sdnc.sli.aai.data.ErrorResponse; -import org.openecomp.sdnc.sli.aai.data.RequestError; -import org.openecomp.sdnc.sli.aai.data.ResourceVersion; -import org.openecomp.sdnc.sli.aai.data.ServiceException; -import org.openecomp.sdnc.sli.aai.data.notify.NotifyEvent; -import org.openecomp.sdnc.sli.aai.data.v1507.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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -455,7 +455,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe } /* (non-Javadoc) - * @see org.openecomp.sdnc.sli.resource.aic.AnAIClient#requestSdnZoneQuery(java.lang.String, java.lang.String, java.lang.String) + * @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 { @@ -480,7 +480,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe /* (non-Javadoc) - * @see org.openecomp.sdnc.sli.resource.aic.AnAIClient#requestSdnZoneQuery(java.lang.String, java.lang.String, java.lang.String) + * @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 { @@ -500,7 +500,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe } /* (non-Javadoc) - * @see org.openecomp.sdnc.sli.resource.aic.AnAIClient#postNetworkVceData(java.lang.String, org.openecomp.sdnc.sli.resource.aic.aai.VCERequest) + * @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 { @@ -1026,7 +1026,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe /* * (non-Javadoc) - * @see org.openecomp.sdnc.sli.aai.AAIClient#requestCtagPoolData(String) + * @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 { diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceActivator.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIServiceActivator.java similarity index 99% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceActivator.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIServiceActivator.java index 28887738..45c3d3d2 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceActivator.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIServiceActivator.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.File; import java.io.FileInputStream; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceException.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIServiceException.java similarity index 95% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceException.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIServiceException.java index cda60a8c..8d57db43 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceException.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAIServiceException.java @@ -19,9 +19,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; -import org.openecomp.sdnc.sli.aai.data.ErrorResponse; +import org.onap.ccsdk.sli.adaptors.aai.data.ErrorResponse; public class AAIServiceException extends Exception { diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAITrinityService.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAITrinityService.java similarity index 97% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAITrinityService.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAITrinityService.java index ed5295cf..6fffc6e8 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAITrinityService.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/AAITrinityService.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.net.URL; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CloudRegionRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/CloudRegionRequest.java similarity index 95% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CloudRegionRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/CloudRegionRequest.java index 08c86a27..0de0d2bd 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CloudRegionRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/CloudRegionRequest.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; @@ -28,8 +28,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.openecomp.aai.inventory.v10.CloudRegion; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -37,7 +37,7 @@ import com.google.common.base.Joiner; public class CloudRegionRequest extends AAIRequest { - public static final String CLOUD_REGION_PATH = "org.openecomp.sdnc.sli.aai.path.cloud.region"; + public static final String CLOUD_REGION_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.cloud.region"; private final String cloud_region_path; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CustomQueryRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/CustomQueryRequest.java similarity index 91% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CustomQueryRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/CustomQueryRequest.java index d61a4ea8..994f1b6b 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CustomQueryRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/CustomQueryRequest.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -27,9 +27,9 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Properties; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; -import org.openecomp.sdnc.sli.aai.query.FormattedQueryRequestData; -import org.openecomp.sdnc.sli.aai.query.FormattedQueryResultList; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; +import org.onap.ccsdk.sli.adaptors.aai.query.FormattedQueryRequestData; +import org.onap.ccsdk.sli.adaptors.aai.query.FormattedQueryResultList; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonProcessingException; @@ -39,7 +39,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class CustomQueryRequest extends AAIRequest { - public static final String GENERIC_SEARCH_PATH = "org.openecomp.sdnc.sli.aai.query.generic"; + public static final String GENERIC_SEARCH_PATH = "org.onap.ccsdk.sli.adaptors.aai.query.generic"; private final String generic_search_path; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/EchoRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/EchoRequest.java similarity index 94% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/EchoRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/EchoRequest.java index 7352c402..86e2d5f5 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/EchoRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/EchoRequest.java @@ -19,14 +19,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; -import org.openecomp.sdnc.sli.aai.data.EchoResponse; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; +import org.onap.ccsdk.sli.adaptors.aai.data.EchoResponse; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericQueryRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/GenericQueryRequest.java similarity index 95% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericQueryRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/GenericQueryRequest.java index 0f1dda0e..476aed94 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericQueryRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/GenericQueryRequest.java @@ -19,22 +19,22 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; import java.util.Properties; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.openecomp.aai.inventory.v10.ResultData; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; public class GenericQueryRequest extends AAIRequest { - public static final String GENERIC_SEARCH_PATH = "org.openecomp.sdnc.sli.aai.query.generic"; + public static final String GENERIC_SEARCH_PATH = "org.onap.ccsdk.sli.adaptors.aai.query.generic"; private final String generic_search_path; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/GenericRequest.java similarity index 99% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/GenericRequest.java index 0da40abe..427ea7e3 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/GenericRequest.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.lang.reflect.Field; @@ -31,9 +31,9 @@ import java.util.Set; import javax.xml.bind.annotation.XmlElement; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.openecomp.aai.inventory.v10.L3Network; import org.openecomp.aai.inventory.v10.L3Networks; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericVnfRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/GenericVnfRequest.java similarity index 93% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericVnfRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/GenericVnfRequest.java index f8c9a18b..3915940f 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericVnfRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/GenericVnfRequest.java @@ -19,15 +19,15 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; import java.util.Properties; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.openecomp.aai.inventory.v10.GenericVnf; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -35,8 +35,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class GenericVnfRequest extends AAIRequest { // tenant (1602) - public static final String GENERIC_VNF_PATH = "org.openecomp.sdnc.sli.aai.path.generic.vnf"; - public static final String GENERIC_VNF_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.generic.vnf.query"; + public static final String GENERIC_VNF_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.generic.vnf"; + public static final String GENERIC_VNF_QUERY_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.generic.vnf.query"; private final String generic_vnf_path; private final String generic_vnf_query_path; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv4AddressListRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/L3InterfaceIpv4AddressListRequest.java similarity index 97% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv4AddressListRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/L3InterfaceIpv4AddressListRequest.java index 762d43bb..e1431bea 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv4AddressListRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/L3InterfaceIpv4AddressListRequest.java @@ -19,15 +19,15 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; import java.util.Properties; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.openecomp.aai.inventory.v10.L3InterfaceIpv4AddressList; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -60,8 +60,8 @@ public class L3InterfaceIpv4AddressListRequest extends AAIRequest { * aaiv7:inventory/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} */ - public static final String L3_INTERFACE_IPV4_ADDRESS_LIST_PATH = "org.openecomp.sdnc.sli.aai.path.l3.interface.ipv4.address.list"; - public static final String VLAN_L3_INTERFACE_IPV4_ADDRESS_LIST_PATH = "org.openecomp.sdnc.sli.aai.path.vlan.l3.interface.ipv4.address.list"; + public static final String L3_INTERFACE_IPV4_ADDRESS_LIST_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.l3.interface.ipv4.address.list"; + public static final String VLAN_L3_INTERFACE_IPV4_ADDRESS_LIST_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.vlan.l3.interface.ipv4.address.list"; private final String l3_interface_ipv4_address_list_path; private final String vlan_l3_interface_ipv4_address_list_path; @@ -178,7 +178,7 @@ public class L3InterfaceIpv4AddressListRequest extends AAIRequest { /* * (non-Javadoc) - * @see org.openecomp.sdnc.sli.aai.PathConfigurator#configurePath(java.lang.String) + * @see org.onap.ccsdk.sli.adaptors.aai.PathConfigurator#configurePath(java.lang.String) */ // @Override // public void processRequestPathValues(Map nameValues) { diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv6AddressListRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/L3InterfaceIpv6AddressListRequest.java similarity index 97% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv6AddressListRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/L3InterfaceIpv6AddressListRequest.java index b87f4079..5cdc0de6 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv6AddressListRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/L3InterfaceIpv6AddressListRequest.java @@ -19,15 +19,15 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; import java.util.Properties; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.openecomp.aai.inventory.v10.L3InterfaceIpv6AddressList; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -60,8 +60,8 @@ public class L3InterfaceIpv6AddressListRequest extends AAIRequest { * aaiv7:inventory/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{interface-name}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address} */ - public static final String L3_INTERFACE_IPV6_ADDRESS_LIST_PATH = "org.openecomp.sdnc.sli.aai.path.l3.interface.ipv6.address.list"; - public static final String VLAN_L3_INTERFACE_IPV6_ADDRESS_LIST_PATH = "org.openecomp.sdnc.sli.aai.path.vlan.l3.interface.ipv6.address.list"; + public static final String L3_INTERFACE_IPV6_ADDRESS_LIST_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.l3.interface.ipv6.address.list"; + public static final String VLAN_L3_INTERFACE_IPV6_ADDRESS_LIST_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.vlan.l3.interface.ipv6.address.list"; private final String l3_interface_ipv6_address_list_path; private final String vlan_l3_interface_ipv6_address_list_path; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LInterfaceRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/LInterfaceRequest.java similarity index 94% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LInterfaceRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/LInterfaceRequest.java index 2553037d..a9da4e45 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LInterfaceRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/LInterfaceRequest.java @@ -19,15 +19,15 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; import java.util.Properties; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.openecomp.aai.inventory.v10.LInterface; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -35,14 +35,14 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class LInterfaceRequest extends AAIRequest { // tenant (1602) - public static final String LAGINTERFACE_LINTERFACE_PATH = "org.openecomp.sdnc.sli.aai.path.lag.interface.l.interface"; - public static final String LAGINTERFACE_LINTERFACE_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.lag.interface.l.interface.query"; + public static final String LAGINTERFACE_LINTERFACE_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.lag.interface.l.interface"; + public static final String LAGINTERFACE_LINTERFACE_QUERY_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.lag.interface.l.interface.query"; - public static final String P_INTERFACE_LINTERFACE_PATH = "org.openecomp.sdnc.sli.aai.path.p.interface.l.interface"; - public static final String P_INTERFACE_LINTERFACE_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.p.interface.l.interface.query"; + public static final String P_INTERFACE_LINTERFACE_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.p.interface.l.interface"; + public static final String P_INTERFACE_LINTERFACE_QUERY_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.p.interface.l.interface.query"; - public static final String LAGINTERFACE_LINTERFACE_PNF_PATH = "org.openecomp.sdnc.sli.aai.path.lag.interface.l.interface.pnf"; - public static final String P_INTERFACE_LINTERFACE_PNF_PATH = "org.openecomp.sdnc.sli.aai.path.p.interface.l.interface.pnf"; + public static final String LAGINTERFACE_LINTERFACE_PNF_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.lag.interface.l.interface.pnf"; + public static final String P_INTERFACE_LINTERFACE_PNF_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.p.interface.l.interface.pnf"; private final String laginterface_linterface_path; private final String laginterface_linterface_query_path; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LagInterfacePnfRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/LagInterfacePnfRequest.java similarity index 86% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LagInterfacePnfRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/LagInterfacePnfRequest.java index 2c103623..5f84553d 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LagInterfacePnfRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/LagInterfacePnfRequest.java @@ -19,15 +19,15 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; import java.util.Properties; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.openecomp.aai.inventory.v10.LagInterface; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; import org.slf4j.LoggerFactory; import com.fasterxml.jackson.core.JsonProcessingException; @@ -36,9 +36,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class LagInterfacePnfRequest extends AAIRequest { // tenant (1602) - public static final String LAG_INTERFACE_PATH = "org.openecomp.sdnc.sli.aai.path.pserver.pinterface"; - public static final String LAG_INTERFACE_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.pserver.pinterface.query"; - public static final String PNF_PATH = "org.openecomp.sdnc.sli.aai.path.pnf"; + public static final String LAG_INTERFACE_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface"; + public static final String LAG_INTERFACE_QUERY_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface.query"; + public static final String PNF_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.pnf"; private final String lag_interface_path; private final String lag_interface_query_path; @@ -52,10 +52,10 @@ public class LagInterfacePnfRequest extends AAIRequest { public LagInterfacePnfRequest() { lag_interface_path = configProperties.getProperty(PNF_PATH) + "/lag-interfaces/lag-interface/{interface-name}"; lag_interface_query_path = configProperties.getProperty(LAG_INTERFACE_QUERY_PATH); - LoggerFactory.getLogger(LagInterfacePnfRequest.class).debug("org.openecomp.sdnc.sli.aai.path.pserver.pinterface=\t" + lag_interface_path); - LoggerFactory.getLogger(LagInterfacePnfRequest.class).debug("org.openecomp.sdnc.sli.aai.path.pserver.pinterface.query=\t" + lag_interface_query_path); + LoggerFactory.getLogger(LagInterfacePnfRequest.class).debug("org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface=\t" + lag_interface_path); + LoggerFactory.getLogger(LagInterfacePnfRequest.class).debug("org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface.query=\t" + lag_interface_query_path); if(lag_interface_path == null) { - LoggerFactory.getLogger(LagInterfacePnfRequest.class).warn("org.openecomp.sdnc.sli.aai.path.pserver.pinterface PATH not found in aaiclient.properties"); + LoggerFactory.getLogger(LagInterfacePnfRequest.class).warn("org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface PATH not found in aaiclient.properties"); } } diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NamedQueryRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/NamedQueryRequest.java similarity index 97% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NamedQueryRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/NamedQueryRequest.java index 4ee51745..e1528a61 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NamedQueryRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/NamedQueryRequest.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; @@ -29,8 +29,8 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.openecomp.aai.inventory.v10.InventoryResponseItems; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonProcessingException; @@ -45,7 +45,7 @@ import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector; public class NamedQueryRequest extends AAIRequest { - public static final String NAMED_SEARCH_PATH = "org.openecomp.sdnc.sli.aai.query.named"; + public static final String NAMED_SEARCH_PATH = "org.onap.ccsdk.sli.adaptors.aai.query.named"; private final String named_search_path; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/NodesQueryRequest.java similarity index 95% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/NodesQueryRequest.java index c4141876..ba4da3d7 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/NodesQueryRequest.java @@ -19,22 +19,22 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; import java.util.Properties; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.openecomp.aai.inventory.v10.SearchResults; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; public class NodesQueryRequest extends AAIRequest { - public static final String NODES_SEARCH_PATH = "org.openecomp.sdnc.sli.aai.query.nodes"; + public static final String NODES_SEARCH_PATH = "org.onap.ccsdk.sli.adaptors.aai.query.nodes"; private final String nodes_search_path; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfacePnfRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PInterfacePnfRequest.java similarity index 87% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfacePnfRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PInterfacePnfRequest.java index 99bce9d1..ea669f23 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfacePnfRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PInterfacePnfRequest.java @@ -19,15 +19,15 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; import java.util.Properties; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.openecomp.aai.inventory.v10.PInterface; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; import org.slf4j.LoggerFactory; import com.fasterxml.jackson.core.JsonProcessingException; @@ -36,9 +36,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class PInterfacePnfRequest extends AAIRequest { // tenant (1602) - public static final String PINTERFACE_PATH = "org.openecomp.sdnc.sli.aai.path.pserver.pinterface"; - public static final String PINTERFACE_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.pserver.pinterface.query"; - public static final String PNF_PATH = "org.openecomp.sdnc.sli.aai.path.pnf"; + public static final String PINTERFACE_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface"; + public static final String PINTERFACE_QUERY_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface.query"; + public static final String PNF_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.pnf"; private final String pinterface_path; private final String pinterface_query_path; @@ -52,10 +52,10 @@ public class PInterfacePnfRequest extends AAIRequest { public PInterfacePnfRequest() { pinterface_path = configProperties.getProperty(PNF_PATH) + "/p-interfaces/p-interface/{interface-name}"; pinterface_query_path = configProperties.getProperty(PINTERFACE_QUERY_PATH); - LoggerFactory.getLogger(PInterfacePnfRequest.class).debug("org.openecomp.sdnc.sli.aai.path.pserver.pinterface=\t" + pinterface_path); - LoggerFactory.getLogger(PInterfacePnfRequest.class).debug("org.openecomp.sdnc.sli.aai.path.pserver.pinterface.query=\t" + pinterface_query_path); + LoggerFactory.getLogger(PInterfacePnfRequest.class).debug("org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface=\t" + pinterface_path); + LoggerFactory.getLogger(PInterfacePnfRequest.class).debug("org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface.query=\t" + pinterface_query_path); if(pinterface_path == null) { - LoggerFactory.getLogger(PInterfacePnfRequest.class).warn("org.openecomp.sdnc.sli.aai.path.pserver.pinterface PATH not found in aaiclient.properties"); + LoggerFactory.getLogger(PInterfacePnfRequest.class).warn("org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface PATH not found in aaiclient.properties"); } } diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfaceRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PInterfaceRequest.java similarity index 84% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfaceRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PInterfaceRequest.java index a08a3929..378e125d 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfaceRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PInterfaceRequest.java @@ -19,14 +19,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.openecomp.aai.inventory.v10.PInterface; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; import org.slf4j.LoggerFactory; import com.fasterxml.jackson.core.JsonProcessingException; @@ -35,8 +35,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class PInterfaceRequest extends AAIRequest { // tenant (1602) - public static final String PINTERFACE_PATH = "org.openecomp.sdnc.sli.aai.path.pserver.pinterface"; - public static final String PINTERFACE_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.pserver.pinterface.query"; + public static final String PINTERFACE_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface"; + public static final String PINTERFACE_QUERY_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface.query"; private final String pinterface_path; private final String pinterface_query_path; @@ -50,10 +50,10 @@ public class PInterfaceRequest extends AAIRequest { public PInterfaceRequest() { pinterface_path = configProperties.getProperty(PINTERFACE_PATH); pinterface_query_path = configProperties.getProperty(PINTERFACE_QUERY_PATH); - LoggerFactory.getLogger(PInterfaceRequest.class).debug("org.openecomp.sdnc.sli.aai.path.pserver.pinterface=\t" + pinterface_path); - LoggerFactory.getLogger(PInterfaceRequest.class).debug("org.openecomp.sdnc.sli.aai.path.pserver.pinterface.query=\t" + pinterface_query_path); + LoggerFactory.getLogger(PInterfaceRequest.class).debug("org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface=\t" + pinterface_path); + LoggerFactory.getLogger(PInterfaceRequest.class).debug("org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface.query=\t" + pinterface_query_path); if(pinterface_path == null) { - LoggerFactory.getLogger(PInterfaceRequest.class).warn("org.openecomp.sdnc.sli.aai.path.pserver.pinterface PATH not found in aaiclient.properties"); + LoggerFactory.getLogger(PInterfaceRequest.class).warn("org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface PATH not found in aaiclient.properties"); } } diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PathRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PathRequest.java similarity index 96% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PathRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PathRequest.java index 0e110a11..a42e045b 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PathRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PathRequest.java @@ -19,13 +19,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PhysicalLinkRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PhysicalLinkRequest.java similarity index 91% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PhysicalLinkRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PhysicalLinkRequest.java index a03298ae..4db95df1 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PhysicalLinkRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/PhysicalLinkRequest.java @@ -19,14 +19,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.openecomp.aai.inventory.v10.PhysicalLink; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -34,8 +34,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class PhysicalLinkRequest extends AAIRequest { // physical link - public static final String PHYSICAL_LINK_PATH = "org.openecomp.sdnc.sli.aai.path.physical.link"; - public static final String PHYSICAL_LINK_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.physical.link.query"; + public static final String PHYSICAL_LINK_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.physical.link"; + public static final String PHYSICAL_LINK_QUERY_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.physical.link.query"; private final String physical_link_path; private final String physical_link_query_path; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/RelationshipRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/RelationshipRequest.java similarity index 93% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/RelationshipRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/RelationshipRequest.java index f15cbb59..8c3d107c 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/RelationshipRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/RelationshipRequest.java @@ -19,14 +19,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.openecomp.aai.inventory.v10.RelationshipList; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -34,8 +34,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class RelationshipRequest extends AAIRequest { // tenant (1602) - public static final String RELATIONSHIP_LIST_PATH = "org.openecomp.sdnc.sli.aai.path.relationship.list"; - public static final String RELATIONSHIP_LIST_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.relationship.list.query"; + public static final String RELATIONSHIP_LIST_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.relationship.list"; + public static final String RELATIONSHIP_LIST_QUERY_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.relationship.list.query"; private final String relationship_path; private final String relationship_query_path; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SelfLinkRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/SelfLinkRequest.java similarity index 96% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SelfLinkRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/SelfLinkRequest.java index 7c307652..e4fd3d93 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SelfLinkRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/SelfLinkRequest.java @@ -19,13 +19,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubInterfaceRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/SubInterfaceRequest.java similarity index 94% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubInterfaceRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/SubInterfaceRequest.java index 1220ee9a..3cbe187c 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubInterfaceRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/SubInterfaceRequest.java @@ -19,15 +19,15 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; import java.util.Properties; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.openecomp.aai.inventory.v10.LInterface; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -35,11 +35,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class SubInterfaceRequest extends AAIRequest { // tenant (1602) - public static final String PNF_LAGINTERFACE_SUBINTERFACE_PATH = "org.openecomp.sdnc.sli.aai.path.pnf.lag.interface.subinterface"; - public static final String PNF_LAGINTERFACE_SUBINTERFACE_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.pnf.lag.interface.subinterface.query"; + public static final String PNF_LAGINTERFACE_SUBINTERFACE_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.pnf.lag.interface.subinterface"; + public static final String PNF_LAGINTERFACE_SUBINTERFACE_QUERY_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.pnf.lag.interface.subinterface.query"; - public static final String PNF_P_INTERFACE_SUBINTERFACE_PATH = "org.openecomp.sdnc.sli.aai.path.pnf.p.interface.l.interface"; - public static final String PNF_P_INTERFACE_SUBINTERFACE_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.pnf.p.interface.l.interface.query"; + public static final String PNF_P_INTERFACE_SUBINTERFACE_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.pnf.p.interface.l.interface"; + public static final String PNF_P_INTERFACE_SUBINTERFACE_QUERY_PATH = "org.onap.ccsdk.sli.adaptors.aai.path.pnf.p.interface.l.interface.query"; private final String pnf_laginterface_subinterface_path; private final String pnf_laginterface_subinterface_query_path; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/UpdateRequest.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/UpdateRequest.java similarity index 97% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/UpdateRequest.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/UpdateRequest.java index 696f30bd..705f53d2 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/UpdateRequest.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/UpdateRequest.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai; +package org.onap.ccsdk.sli.adaptors.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; @@ -27,7 +27,7 @@ import java.net.URL; import java.util.Map; import java.util.Properties; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/AAIDatum.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/AAIDatum.java similarity index 95% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/AAIDatum.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/AAIDatum.java index fe238026..84323176 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/AAIDatum.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/AAIDatum.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data; +package org.onap.ccsdk.sli.adaptors.aai.data; public interface AAIDatum { diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/EchoResponse.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/EchoResponse.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/EchoResponse.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/EchoResponse.java index 1b9cb8d4..576c1570 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/EchoResponse.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/EchoResponse.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data; +package org.onap.ccsdk.sli.adaptors.aai.data; import java.util.HashMap; import java.util.Map; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ErrorResponse.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ErrorResponse.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ErrorResponse.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ErrorResponse.java index be5368d1..6a255fcf 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ErrorResponse.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ErrorResponse.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data; +package org.onap.ccsdk.sli.adaptors.aai.data; import java.util.HashMap; import java.util.Map; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/RequestError.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/RequestError.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/RequestError.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/RequestError.java index df875f8c..9bbca18f 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/RequestError.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/RequestError.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data; +package org.onap.ccsdk.sli.adaptors.aai.data; import java.util.HashMap; import java.util.Map; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResourceVersion.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ResourceVersion.java similarity index 96% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResourceVersion.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ResourceVersion.java index 5ac06e6b..f5901a8b 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResourceVersion.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ResourceVersion.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data; +package org.onap.ccsdk.sli.adaptors.aai.data; public interface ResourceVersion { diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResponseMessage.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ResponseMessage.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResponseMessage.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ResponseMessage.java index c1f9582a..db377879 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResponseMessage.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ResponseMessage.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data; +package org.onap.ccsdk.sli.adaptors.aai.data; import java.util.HashMap; import java.util.Map; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResponseMessages.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ResponseMessages.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResponseMessages.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ResponseMessages.java index 5af83aae..a2387808 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResponseMessages.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ResponseMessages.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data; +package org.onap.ccsdk.sli.adaptors.aai.data; import java.util.ArrayList; import java.util.HashMap; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ServiceException.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ServiceException.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ServiceException.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ServiceException.java index b02b448e..b98d3d8f 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ServiceException.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/ServiceException.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data; +package org.onap.ccsdk.sli.adaptors.aai.data; import java.util.ArrayList; import java.util.HashMap; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/SubInterface.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/SubInterface.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/SubInterface.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/SubInterface.java index a85e0219..f1550780 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/SubInterface.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/SubInterface.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data; +package org.onap.ccsdk.sli.adaptors.aai.data; import java.util.HashMap; import java.util.Map; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/Variables.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/Variables.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/Variables.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/Variables.java index 99c42aa3..3b03ba47 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/Variables.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/Variables.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data; +package org.onap.ccsdk.sli.adaptors.aai.data; import java.util.ArrayList; import java.util.HashMap; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/notify/KeyDatum.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/notify/KeyDatum.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/notify/KeyDatum.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/notify/KeyDatum.java index 80e633dd..641a8abd 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/notify/KeyDatum.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/notify/KeyDatum.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data.notify; +package org.onap.ccsdk.sli.adaptors.aai.data.notify; import java.util.HashMap; import java.util.Map; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/notify/NotifyEvent.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/notify/NotifyEvent.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/notify/NotifyEvent.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/notify/NotifyEvent.java index 1be171e0..d97b3523 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/notify/NotifyEvent.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/notify/NotifyEvent.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data.notify; +package org.onap.ccsdk.sli.adaptors.aai.data.notify; import java.util.ArrayList; import java.util.HashMap; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Flavor.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Flavor.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Flavor.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Flavor.java index 69288c11..6ffc30c4 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Flavor.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Flavor.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data.v1507; +package org.onap.ccsdk.sli.adaptors.aai.data.v1507; import java.util.HashMap; import java.util.Map; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Host.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Host.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Host.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Host.java index e4a5720a..7c171ebd 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Host.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Host.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data.v1507; +package org.onap.ccsdk.sli.adaptors.aai.data.v1507; import java.util.HashMap; import java.util.Map; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Image.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Image.java similarity index 99% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Image.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Image.java index 19ae8749..0e27c541 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Image.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Image.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data.v1507; +package org.onap.ccsdk.sli.adaptors.aai.data.v1507; import java.util.HashMap; import java.util.Map; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/IpAddress.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/IpAddress.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/IpAddress.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/IpAddress.java index 1d29857a..19a9bf6a 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/IpAddress.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/IpAddress.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data.v1507; +package org.onap.ccsdk.sli.adaptors.aai.data.v1507; import java.util.HashMap; import java.util.Map; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Relationship.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Relationship.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Relationship.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Relationship.java index 623bd722..8e04e35f 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Relationship.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/Relationship.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data.v1507; +package org.onap.ccsdk.sli.adaptors.aai.data.v1507; import java.util.ArrayList; import java.util.HashMap; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/RelationshipDatum.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/RelationshipDatum.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/RelationshipDatum.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/RelationshipDatum.java index 9f44c1fa..1ac21640 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/RelationshipDatum.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/RelationshipDatum.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data.v1507; +package org.onap.ccsdk.sli.adaptors.aai.data.v1507; import java.util.ArrayList; import java.util.HashMap; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/RelationshipList.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/RelationshipList.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/RelationshipList.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/RelationshipList.java index 242b0911..3c46d21b 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/RelationshipList.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/RelationshipList.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data.v1507; +package org.onap.ccsdk.sli.adaptors.aai.data.v1507; import java.util.ArrayList; import java.util.HashMap; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/VServer.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/VServer.java similarity index 99% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/VServer.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/VServer.java index 6c975604..45d72553 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/VServer.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/data/v1507/VServer.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.data.v1507; +package org.onap.ccsdk.sli.adaptors.aai.data.v1507; import java.util.ArrayList; import java.util.HashMap; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/FormattedQueryRequestData.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/FormattedQueryRequestData.java similarity index 95% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/FormattedQueryRequestData.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/FormattedQueryRequestData.java index 78d890aa..e533a164 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/FormattedQueryRequestData.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/FormattedQueryRequestData.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.query; +package org.onap.ccsdk.sli.adaptors.aai.query; import java.util.List; @@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/FormattedQueryResultList.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/FormattedQueryResultList.java similarity index 94% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/FormattedQueryResultList.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/FormattedQueryResultList.java index 48b2a60b..248cd959 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/FormattedQueryResultList.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/FormattedQueryResultList.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.query; +package org.onap.ccsdk.sli.adaptors.aai.query; import java.util.List; @@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilter.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/InstanceFilter.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilter.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/InstanceFilter.java index 33f1fec2..ccd63729 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilter.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/InstanceFilter.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.query; +package org.onap.ccsdk.sli.adaptors.aai.query; import java.util.HashMap; import java.util.Map; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilters.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/InstanceFilters.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilters.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/InstanceFilters.java index d38beed0..265c1866 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilters.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/InstanceFilters.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.query; +package org.onap.ccsdk.sli.adaptors.aai.query; import java.util.ArrayList; import java.util.HashMap; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQuery.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/NamedQuery.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQuery.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/NamedQuery.java index 5b20903d..65350c23 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQuery.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/NamedQuery.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.query; +package org.onap.ccsdk.sli.adaptors.aai.query; import java.util.HashMap; import java.util.Map; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQueryData.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/NamedQueryData.java similarity index 96% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQueryData.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/NamedQueryData.java index e8a77529..8188acf2 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQueryData.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/NamedQueryData.java @@ -19,13 +19,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.query; +package org.onap.ccsdk.sli.adaptors.aai.query; import java.util.HashMap; import java.util.Map; import javax.annotation.Generated; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; + import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/QueryParameters.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/QueryParameters.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/QueryParameters.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/QueryParameters.java index bb4498cf..c6ddbcbc 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/QueryParameters.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/QueryParameters.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.query; +package org.onap.ccsdk.sli.adaptors.aai.query; import java.util.HashMap; import java.util.Map; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/Results.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/Results.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/Results.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/Results.java index 2931a7e1..ff2269a4 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/Results.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/query/Results.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.query; +package org.onap.ccsdk.sli.adaptors.aai.query; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/Action.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/Action.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/Action.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/Action.java index 296a3713..f3d50998 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/Action.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/Action.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.update; +package org.onap.ccsdk.sli.adaptors.aai.update; import java.util.ArrayList; import java.util.HashMap; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/ActionDatum.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/ActionDatum.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/ActionDatum.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/ActionDatum.java index 3dfb9c37..0cd70012 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/ActionDatum.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/ActionDatum.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.update; +package org.onap.ccsdk.sli.adaptors.aai.update; import java.util.HashMap; import java.util.Map; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/Update.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/Update.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/Update.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/Update.java index a092b6b9..43f912df 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/Update.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/Update.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.update; +package org.onap.ccsdk.sli.adaptors.aai.update; import java.util.ArrayList; import java.util.HashMap; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/UpdateNodeKey.java b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/UpdateNodeKey.java similarity index 98% rename from aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/UpdateNodeKey.java rename to aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/UpdateNodeKey.java index ffc5cc0d..caa1de45 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/UpdateNodeKey.java +++ b/aai-service/provider/src/main/java/org/onap/sli/adaptors/aai/update/UpdateNodeKey.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.update; +package org.onap.ccsdk.sli.adaptors.aai.update; import java.util.HashMap; import java.util.Map; diff --git a/aai-service/provider/src/main/resources/aai-schema-bindings.xjb b/aai-service/provider/src/main/resources/aai-schema-bindings.xjb index e6292fa1..47d1bc2d 100755 --- a/aai-service/provider/src/main/resources/aai-schema-bindings.xjb +++ b/aai-service/provider/src/main/resources/aai-schema-bindings.xjb @@ -5,7 +5,7 @@ jxb:extensionBindingPrefixes="xjc"> - + diff --git a/aai-service/provider/src/test/java/org/openecomp/sdnc/sli/aai/r1607/R1607AutoGeneratedTest.java b/aai-service/provider/src/test/java/org/onap/sli/adaptors/aai/r1607/R1607AutoGeneratedTest.java similarity index 97% rename from aai-service/provider/src/test/java/org/openecomp/sdnc/sli/aai/r1607/R1607AutoGeneratedTest.java rename to aai-service/provider/src/test/java/org/onap/sli/adaptors/aai/r1607/R1607AutoGeneratedTest.java index 15a7647e..8bd2b664 100644 --- a/aai-service/provider/src/test/java/org/openecomp/sdnc/sli/aai/r1607/R1607AutoGeneratedTest.java +++ b/aai-service/provider/src/test/java/org/onap/sli/adaptors/aai/r1607/R1607AutoGeneratedTest.java @@ -19,7 +19,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.sli.aai.r1607; +package org.onap.ccsdk.sli.adaptors.aai.r1607; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; @@ -51,13 +51,13 @@ import org.junit.FixMethodOrder; import org.junit.runners.MethodSorters; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus; +import org.onap.ccsdk.sli.adaptors.aai.AAIClient; +import org.onap.ccsdk.sli.adaptors.aai.AAIDeclarations; +import org.onap.ccsdk.sli.adaptors.aai.AAIRequest; +import org.onap.ccsdk.sli.adaptors.aai.AAIService; +import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum; import org.openecomp.aai.inventory.v10.GenericVnf; import org.openecomp.aai.inventory.v10.InventoryResponseItems; -import org.openecomp.sdnc.sli.aai.AAIClient; -import org.openecomp.sdnc.sli.aai.AAIDeclarations; -import org.openecomp.sdnc.sli.aai.AAIRequest; -import org.openecomp.sdnc.sli.aai.AAIService; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/aai-service/provider/src/test/resources/aaiclient.properties b/aai-service/provider/src/test/resources/aaiclient.properties index 260b5162..d1bd26fd 100644 --- a/aai-service/provider/src/test/resources/aaiclient.properties +++ b/aai-service/provider/src/test/resources/aaiclient.properties @@ -26,112 +26,112 @@ # # Certificate keystore and truststore # -org.openecomp.sdnc.sli.aai.ssl.trust=/opt/bvc/tls-client/truststore.client.jks -org.openecomp.sdnc.sli.aai.ssl.trust.psswd={truststore-password} -org.openecomp.sdnc.sli.aai.ssl.key=/opt/bvc/tls-client/keystore.client.jks -org.openecomp.sdnc.sli.aai.ssl.key.psswd={keystore-password} -org.openecomp.sdnc.sli.aai.host.certificate.ignore=true +org.onap.ccsdk.sli.adaptors.aai.ssl.trust=/opt/bvc/tls-client/truststore.client.jks +org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd={truststore-password} +org.onap.ccsdk.sli.adaptors.aai.ssl.key=/opt/bvc/tls-client/keystore.client.jks +org.onap.ccsdk.sli.adaptors.aai.ssl.key.psswd={keystore-password} +org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=true -org.openecomp.sdnc.sli.aai.client.name=SDNC -org.openecomp.sdnc.sli.aai.client.psswd=SDNC +org.onap.ccsdk.sli.adaptors.aai.client.name=SDNC +org.onap.ccsdk.sli.adaptors.aai.client.psswd=SDNC -org.openecomp.sdnc.sli.aai.application=openECOMP +org.onap.ccsdk.sli.adaptors.aai.application=openECOMP # # Configuration file for A&AI Client # -org.openecomp.sdnc.sli.aai.uri=https://localhost:8443 +org.onap.ccsdk.sli.adaptors.aai.uri=https://localhost:8443 # query -org.openecomp.sdnc.sli.aai.path.query=/aai/v10/search/sdn-zone-query -org.openecomp.sdnc.sli.aai.query.nodes=/aai/v10/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name} -org.openecomp.sdnc.sli.aai.query.generic=/aai/v10/search/generic-query?key={identifier}:{value}&start-node-type={start-node-type}&include=complex&depth=3 +org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v10/search/sdn-zone-query +org.onap.ccsdk.sli.adaptors.aai.query.nodes=/aai/v10/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name} +org.onap.ccsdk.sli.adaptors.aai.query.generic=/aai/v10/search/generic-query?key={identifier}:{value}&start-node-type={start-node-type}&include=complex&depth=3 # named query -org.openecomp.sdnc.sli.aai.query.named=/aai/search/named-query +org.onap.ccsdk.sli.adaptors.aai.query.named=/aai/search/named-query #update -org.openecomp.sdnc.sli.aai.update=/aai/v10/actions/update +org.onap.ccsdk.sli.adaptors.aai.update=/aai/v10/actions/update # vce -org.openecomp.sdnc.sli.aai.path.vce =/aai/v10/network/vces/vce/ -org.openecomp.sdnc.sli.aai.path.vces=/aai/v10/network/vces/ +org.onap.ccsdk.sli.adaptors.aai.path.vce =/aai/v10/network/vces/vce/ +org.onap.ccsdk.sli.adaptors.aai.path.vces=/aai/v10/network/vces/ # customer -org.openecomp.sdnc.sli.aai.path.customer=/aai/v10/business/customers/customer/{customer-id} +org.onap.ccsdk.sli.adaptors.aai.path.customer=/aai/v10/business/customers/customer/{customer-id} # service subscription -org.openecomp.sdnc.sli.aai.path.service.subscription=/aai/v10/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type} +org.onap.ccsdk.sli.adaptors.aai.path.service.subscription=/aai/v10/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type} # service instance -org.openecomp.sdnc.sli.aai.path.svcinst=/aai/v10/business/customers/customer/{customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances -org.openecomp.sdnc.sli.aai.path.svcinst.query=/aai/v10/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance -org.openecomp.sdnc.sli.aai.path.service.instance=/aai/v10/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id} +org.onap.ccsdk.sli.adaptors.aai.path.svcinst=/aai/v10/business/customers/customer/{customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances +org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query=/aai/v10/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance +org.onap.ccsdk.sli.adaptors.aai.path.service.instance=/aai/v10/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id} # tenant -org.openecomp.sdnc.sli.aai.path.tenant=/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id} -org.openecomp.sdnc.sli.aai.path.tenant.query=/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant?tenant-name={tenant-name} +org.onap.ccsdk.sli.adaptors.aai.path.tenant=/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id} +org.onap.ccsdk.sli.adaptors.aai.path.tenant.query=/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant?tenant-name={tenant-name} # vservers -org.openecomp.sdnc.sli.aai.path.vservers=/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/ -org.openecomp.sdnc.sli.aai.path.vserver=/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id} +org.onap.ccsdk.sli.adaptors.aai.path.vservers=/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/ +org.onap.ccsdk.sli.adaptors.aai.path.vserver=/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id} # vpls-pe -org.openecomp.sdnc.sli.aai.path.vpls.pes=/aai/v10/network/vpls-pes/ -org.openecomp.sdnc.sli.aai.path.vpls.pe =/aai/v10/network/vpls-pes/vpls-pe/ +org.onap.ccsdk.sli.adaptors.aai.path.vpls.pes=/aai/v10/network/vpls-pes/ +org.onap.ccsdk.sli.adaptors.aai.path.vpls.pe =/aai/v10/network/vpls-pes/vpls-pe/ # ctag-pool -org.openecomp.sdnc.sli.aai.path.ctag.pools=/aai/v10/cloud-infrastructure/complexes/complex/{physical-location-id}/ctag-pools -org.openecomp.sdnc.sli.aai.path.ctag.pool=/aai/v10/cloud-infrastructure/complexes/complex/{physical-location-id}/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name} +org.onap.ccsdk.sli.adaptors.aai.path.ctag.pools=/aai/v10/cloud-infrastructure/complexes/complex/{physical-location-id}/ctag-pools +org.onap.ccsdk.sli.adaptors.aai.path.ctag.pool=/aai/v10/cloud-infrastructure/complexes/complex/{physical-location-id}/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name} # #-------------- 1510 ---------------------- # # pservers -org.openecomp.sdnc.sli.aai.path.pservers=/aai/v10/cloud-infrastructure/pservers -org.openecomp.sdnc.sli.aai.path.pserver=/aai/v10/cloud-infrastructure/pservers/pserver/{hostname} +org.onap.ccsdk.sli.adaptors.aai.path.pservers=/aai/v10/cloud-infrastructure/pservers +org.onap.ccsdk.sli.adaptors.aai.path.pserver=/aai/v10/cloud-infrastructure/pservers/pserver/{hostname} # generic-vnf -#org.openecomp.sdnc.sli.aai.path.generic.vnfs=/aai/v10/network/generic-vnfs -#org.openecomp.sdnc.sli.aai.path.generic.vnf=/aai/v10/network/generic-vnfs/generic-vnf/{vnf-id} +#org.onap.ccsdk.sli.adaptors.aai.path.generic.vnfs=/aai/v10/network/generic-vnfs +#org.onap.ccsdk.sli.adaptors.aai.path.generic.vnf=/aai/v10/network/generic-vnfs/generic-vnf/{vnf-id} # dvs-switch -org.openecomp.sdnc.sli.aai.path.dvsswitches=/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches -org.openecomp.sdnc.sli.aai.path.dvsswitch=/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches/dvs-switch/{switch-name} +org.onap.ccsdk.sli.adaptors.aai.path.dvsswitches=/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches +org.onap.ccsdk.sli.adaptors.aai.path.dvsswitch=/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches/dvs-switch/{switch-name} # L3 Networks -org.openecomp.sdnc.sli.aai.path.l3networks=/aai/v10/network/l3-networks -org.openecomp.sdnc.sli.aai.path.l3network=/aai/v10/network/l3-networks/l3-network/{network-id} -org.openecomp.sdnc.sli.aai.path.l3network.query.name=/aai/v10/network/l3-networks/l3-network?network-name={network-name} +org.onap.ccsdk.sli.adaptors.aai.path.l3networks=/aai/v10/network/l3-networks +org.onap.ccsdk.sli.adaptors.aai.path.l3network=/aai/v10/network/l3-networks/l3-network/{network-id} +org.onap.ccsdk.sli.adaptors.aai.path.l3network.query.name=/aai/v10/network/l3-networks/l3-network?network-name={network-name} # P-Interfaces -org.openecomp.sdnc.sli.aai.path.pserver.pinterfaces=/aai/v10/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces -org.openecomp.sdnc.sli.aai.path.pserver.pinterface=/aai/v10/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name} +org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterfaces=/aai/v10/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces +org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface=/aai/v10/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name} # Physical Link -org.openecomp.sdnc.sli.aai.path.physical.links=/aai/v10/network/physical-links -org.openecomp.sdnc.sli.aai.path.physical.link=/aai/v10/network/physical-links/physical-link/{link-name} +org.onap.ccsdk.sli.adaptors.aai.path.physical.links=/aai/v10/network/physical-links +org.onap.ccsdk.sli.adaptors.aai.path.physical.link=/aai/v10/network/physical-links/physical-link/{link-name} # VPN Bindings -org.openecomp.sdnc.sli.aai.path.vpn.bindings=/aai/v10/network/vpn-bindings/ -org.openecomp.sdnc.sli.aai.path.vpn.binding=/aai/v10/network/vpn-bindings/vpn-binding/{vpn-id} +org.onap.ccsdk.sli.adaptors.aai.path.vpn.bindings=/aai/v10/network/vpn-bindings/ +org.onap.ccsdk.sli.adaptors.aai.path.vpn.binding=/aai/v10/network/vpn-bindings/vpn-binding/{vpn-id} # VNF IMAGES -org.openecomp.sdnc.sli.aai.path.vnf.images=/aai/v10/service-design-and-creation/vnf-images -org.openecomp.sdnc.sli.aai.path.vnf.image=/aai/v10/service-design-and-creation/vnf-images/vnf-image/{att-uuid} -org.openecomp.sdnc.sli.aai.path.vnf.image.query=/aai/v10/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor} +org.onap.ccsdk.sli.adaptors.aai.path.vnf.images=/aai/v10/service-design-and-creation/vnf-images +org.onap.ccsdk.sli.adaptors.aai.path.vnf.image=/aai/v10/service-design-and-creation/vnf-images/vnf-image/{att-uuid} +org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v10/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor} # UBB Notify -org.openecomp.sdnc.sli.aai.path.notify=/aai/v10/actions/notify -org.openecomp.sdnc.sli.aai.notify.selflink.fqdn=https://sdncodl.it.us.aic.cip.att.com:8443/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id} -org.openecomp.sdnc.sli.aai.notify.selflink.avpn=https://sdncodl-conexus.it.us.02.aic.cip.att.com:8543/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information +org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v10/actions/notify +org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=https://sdncodl.it.us.aic.cip.att.com:8443/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id} +org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=https://sdncodl-conexus.it.us.02.aic.cip.att.com:8543/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information # Service -org.openecomp.sdnc.sli.aai.path.service=/aai/v10/service-design-and-creation/services/service/{service-id} -org.openecomp.sdnc.sli.aai.path.services=/aai/v10/service-design-and-creation/services +org.onap.ccsdk.sli.adaptors.aai.path.service=/aai/v10/service-design-and-creation/services/service/{service-id} +org.onap.ccsdk.sli.adaptors.aai.path.services=/aai/v10/service-design-and-creation/services # @@ -139,99 +139,99 @@ org.openecomp.sdnc.sli.aai.path.services=/aai/v10/service-design-and-creation/se # # VNFC -org.openecomp.sdnc.sli.aai.path.vnfc=/aai/v10/network/vnfcs/vnfc/{vnfc-name} +org.onap.ccsdk.sli.adaptors.aai.path.vnfc=/aai/v10/network/vnfcs/vnfc/{vnfc-name} # site-pair -org.openecomp.sdnc.sli.aai.path.site.pair=/aai/v10/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id} +org.onap.ccsdk.sli.adaptors.aai.path.site.pair=/aai/v10/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id} # routing-instance -org.openecomp.sdnc.sli.aai.path.routing.instance=/aai/v10/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id} +org.onap.ccsdk.sli.adaptors.aai.path.routing.instance=/aai/v10/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id} # site-pair-set -org.openecomp.sdnc.sli.aai.path.site.pair.set=/aai/v10/network/site-pair-sets/site-pair-set/{site-pair-set-id} +org.onap.ccsdk.sli.adaptors.aai.path.site.pair.set=/aai/v10/network/site-pair-sets/site-pair-set/{site-pair-set-id} # license key resource -org.openecomp.sdnc.sli.aai.path.license.acquire=/aai/v10/actions/assignment/license-management/assignment-group-uuid/{assignment-group-uuid} -org.openecomp.sdnc.sli.aai.path.license=/aai/v10/license-management/license-key-resources/license-key-resource/{att-uuid} +org.onap.ccsdk.sli.adaptors.aai.path.license.acquire=/aai/v10/actions/assignment/license-management/assignment-group-uuid/{assignment-group-uuid} +org.onap.ccsdk.sli.adaptors.aai.path.license=/aai/v10/license-management/license-key-resources/license-key-resource/{att-uuid} # logical-link -org.openecomp.sdnc.sli.aai.path.logical.link =/aai/v10/network/logical-links/logical-link/{link-name} +org.onap.ccsdk.sli.adaptors.aai.path.logical.link =/aai/v10/network/logical-links/logical-link/{link-name} # virtual-data-center -org.openecomp.sdnc.sli.aai.path.virtual.data.center=/aai/v10/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id} +org.onap.ccsdk.sli.adaptors.aai.path.virtual.data.center=/aai/v10/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id} # wan-connector -org.openecomp.sdnc.sli.aai.path.wan.connector=/aai/v10/business/connectors/connector/{resource-instance-id} +org.onap.ccsdk.sli.adaptors.aai.path.wan.connector=/aai/v10/business/connectors/connector/{resource-instance-id} # l-interface -org.openecomp.sdnc.sli.aai.path.lag.interface.l.interface=/aai/v10/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name} -org.openecomp.sdnc.sli.aai.path.p.interface.l.interface=/aai/v10/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name} +org.onap.ccsdk.sli.adaptors.aai.path.lag.interface.l.interface=/aai/v10/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name} +org.onap.ccsdk.sli.adaptors.aai.path.p.interface.l.interface=/aai/v10/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name} # l-interface pnf -org.openecomp.sdnc.sli.aai.path.lag.interface.l.interface.pnf=/aai/v10/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name} -org.openecomp.sdnc.sli.aai.path.p.interface.l.interface.pnf=/aai/v10/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name} +org.onap.ccsdk.sli.adaptors.aai.path.lag.interface.l.interface.pnf=/aai/v10/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name} +org.onap.ccsdk.sli.adaptors.aai.path.p.interface.l.interface.pnf=/aai/v10/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name} # subinterface -org.openecomp.sdnc.sli.aai.path.pnf.lag.interface.subinterface=/aai/v10/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name} -org.openecomp.sdnc.sli.aai.path.pnf.p.interface.l.interface=/aai/v10/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name} +org.onap.ccsdk.sli.adaptors.aai.path.pnf.lag.interface.subinterface=/aai/v10/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name} +org.onap.ccsdk.sli.adaptors.aai.path.pnf.p.interface.l.interface=/aai/v10/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name} # l3-interface-ipv4-address-list -org.openecomp.sdnc.sli.aai.path.l3.interface.ipv4.address.list=/aai/v10/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} -org.openecomp.sdnc.sli.aai.path.vlan.l3.interface.ipv4.address.list=/aai/v10/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} +org.onap.ccsdk.sli.adaptors.aai.path.l3.interface.ipv4.address.list=/aai/v10/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} +org.onap.ccsdk.sli.adaptors.aai.path.vlan.l3.interface.ipv4.address.list=/aai/v10/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} # l3-interface-ipv6-address-list -org.openecomp.sdnc.sli.aai.path.l3.interface.ipv6.address.list=/aai/v10/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address} -org.openecomp.sdnc.sli.aai.path.vlan.l3.interface.ipv6.address.list=/aai/v10/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address} +org.onap.ccsdk.sli.adaptors.aai.path.l3.interface.ipv6.address.list=/aai/v10/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address} +org.onap.ccsdk.sli.adaptors.aai.path.vlan.l3.interface.ipv6.address.list=/aai/v10/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address} # ipsec-configuration -org.openecomp.sdnc.sli.aai.path.ipsec.configuration=/aai/v10/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id} +org.onap.ccsdk.sli.adaptors.aai.path.ipsec.configuration=/aai/v10/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id} # vig server -org.openecomp.sdnc.sli.aai.path.vig.server=/aai/v10/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}/vig-servers/vig-server/{vig-address-type} +org.onap.ccsdk.sli.adaptors.aai.path.vig.server=/aai/v10/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}/vig-servers/vig-server/{vig-address-type} # l3-network -org.openecomp.sdnc.sli.aai.path.l3.network=/aai/v10/network/l3-networks/l3-network/{network-id} +org.onap.ccsdk.sli.adaptors.aai.path.l3.network=/aai/v10/network/l3-networks/l3-network/{network-id} # subnet -org.openecomp.sdnc.sli.aai.path.subnet=/aai/v10/network/l3-networks/l3-network/{network-id}/subnets/subnet/{subnet-id} +org.onap.ccsdk.sli.adaptors.aai.path.subnet=/aai/v10/network/l3-networks/l3-network/{network-id}/subnets/subnet/{subnet-id} # multicast-configuration -org.openecomp.sdnc.sli.aai.path.multicast.configuration=/aai/v10/network/multicast-configurations/multicast-configuration/{multicast-configuration-id} +org.onap.ccsdk.sli.adaptors.aai.path.multicast.configuration=/aai/v10/network/multicast-configurations/multicast-configuration/{multicast-configuration-id} -# org.openecomp.sdnc.sli.aai.path.l.interface.ipv4.address.list -org.openecomp.sdnc.sli.aai.path.l3-interface.ipv4.address.list=/aai/v10/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} +# org.onap.ccsdk.sli.adaptors.aai.path.l.interface.ipv4.address.list +org.onap.ccsdk.sli.adaptors.aai.path.l3-interface.ipv4.address.list=/aai/v10/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} -# org.openecomp.sdnc.sli.aai.path.l.interface.vlan.ipv4.address.list -org.openecomp.sdnc.sli.aai.path.l3-interface.vlan.ipv4.address.list=/aai/v10/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} +# org.onap.ccsdk.sli.adaptors.aai.path.l.interface.vlan.ipv4.address.list +org.onap.ccsdk.sli.adaptors.aai.path.l3-interface.vlan.ipv4.address.list=/aai/v10/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} -# org.openecomp.sdnc.sli.aai.path.l.interface.ipv6.address.list -org.openecomp.sdnc.sli.aai.path.l3-interface.ipv6.address.list=/aai/v10/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address} +# org.onap.ccsdk.sli.adaptors.aai.path.l.interface.ipv6.address.list +org.onap.ccsdk.sli.adaptors.aai.path.l3-interface.ipv6.address.list=/aai/v10/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address} # volume.group -org.openecomp.sdnc.sli.aai.path.volume.group=/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/volume-groups/volume-group/{volume-group-id} +org.onap.ccsdk.sli.adaptors.aai.path.volume.group=/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/volume-groups/volume-group/{volume-group-id} #cloud region -org.openecomp.sdnc.sli.aai.path.cloud.region=/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id} +org.onap.ccsdk.sli.adaptors.aai.path.cloud.region=/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id} # vf-module -org.openecomp.sdnc.sli.aai.path.vf.module=/aai/v10/network/generic-vnfs/generic-vnf/{vnf-id}/vf-modules/vf-module/{vf-module-id} +org.onap.ccsdk.sli.adaptors.aai.path.vf.module=/aai/v10/network/generic-vnfs/generic-vnf/{vnf-id}/vf-modules/vf-module/{vf-module-id} # network-policy -org.openecomp.sdnc.sli.aai.path.network.policy=/aai/v10/network/network-policies/network-policy/{network-policy-id} +org.onap.ccsdk.sli.adaptors.aai.path.network.policy=/aai/v10/network/network-policies/network-policy/{network-policy-id} # pnf -org.openecomp.sdnc.sli.aai.path.pnf=/aai/v10/network/pnfs/pnf/{pnf-name} +org.onap.ccsdk.sli.adaptors.aai.path.pnf=/aai/v10/network/pnfs/pnf/{pnf-name} # oam-network -org.openecomp.sdnc.sli.aai.path.oam.network=/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/oam-networks/oam-network/{network-uuid} +org.onap.ccsdk.sli.adaptors.aai.path.oam.network=/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/oam-networks/oam-network/{network-uuid} # route-table-reference -org.openecomp.sdnc.sli.aai.path.route.table.reference=/aai/v10/network/route-table-references/route-table-reference/{route-table-reference-id} +org.onap.ccsdk.sli.adaptors.aai.path.route.table.reference=/aai/v10/network/route-table-references/route-table-reference/{route-table-reference-id} # # Formatting # -org.openecomp.sdnc.sli.aai.param.format=filter=%s:%s -org.openecomp.sdnc.sli.aai.param.vnf_type=vnf-type -org.openecomp.sdnc.sli.aai.param.physical.location.id=physical-location-id -org.openecomp.sdnc.sli.aai.param.service.type=service-type +org.onap.ccsdk.sli.adaptors.aai.param.format=filter=%s:%s +org.onap.ccsdk.sli.adaptors.aai.param.vnf_type=vnf-type +org.onap.ccsdk.sli.adaptors.aai.param.physical.location.id=physical-location-id +org.onap.ccsdk.sli.adaptors.aai.param.service.type=service-type