Update bundle names from openecomp to onap

Change-Id: Ib0cf4edbab87a32c9d83cc9473412feb77b27a0e
Issue-ID: APPC-13
Signed-off-by: Takamune Cho <tc012c@att.com>

2 files changed, 21 insertions, 21 deletions

diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/AbstractRequestValidatorImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/AbstractRequestValidatorImpl.java
index 4f4942b8a..5b9e48615 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/AbstractRequestValidatorImpl.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/AbstractRequestValidatorImpl.java
@@ -127,7 +127,7 @@ public abstract class AbstractRequestValidatorImpl implements RequestValidator {
 
         } else {
             logger.info("AAIService error from bundlecontext");
-            logger.warn("Cannot find service reference for org.openecomp.sdnc.sli.aai.AAIService");
+            logger.warn("Cannot find service reference for org.onap.ccsdk.sli.adaptors.aai.AAIService");
 
         }
     }
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/onap/appc/default.properties b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/onap/appc/default.properties
index e42d7ef74..6d17c3f2b 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/onap/appc/default.properties
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/resources/org/onap/appc/default.properties
@@ -30,45 +30,45 @@ org.onap.appc.bootstrap.path=/opt/onap/appc/data/properties,${user.home},.
 #
 # Certificate keystore and truststore
 #
-#org.openecomp.sdnc.sli.aai.ssl.trust=<jks_FILE_HERE>
-#org.openecomp.sdnc.sli.aai.ssl.trust.psswd=adminadmin
-#org.openecomp.sdnc.sli.aai.ssl.key=<p12_FILE_HERE>
-#org.openecomp.sdnc.sli.aai.ssl.key.psswd=adminadmin
-org.openecomp.sdnc.sli.aai.host.certificate.ignore=true
-org.openecomp.sdnc.sli.aai.certificate.trust.all=true
+#org.onap.ccsdk.sli.adaptors.aai.ssl.trust=<jks_FILE_HERE>
+#org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=adminadmin
+#org.onap.ccsdk.sli.adaptors.aai.ssl.key=<p12_FILE_HERE>
+#org.onap.ccsdk.sli.adaptors.aai.ssl.key.psswd=adminadmin
+org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=true
+org.onap.ccsdk.sli.adaptors.aai.certificate.trust.all=true
 
 #
 # Configuration file for A&AI Adapter
 #
 
 # OPEN SOURCE - EXTERNAL A&AI INSTANCE IN TEST ENVIRONMENT
-org.openecomp.sdnc.sli.aai.uri=https://10.0.1.1:8443
+org.onap.ccsdk.sli.adaptors.aai.uri=https://10.0.1.1:8443
 
-org.openecomp.sdnc.sli.aai.path.query=/aai/v8/search/sdn-zone-query
+org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v8/search/sdn-zone-query
 
 # service instance
-org.openecomp.sdnc.sli.aai.path.svcinst=/aai/v8/business/customers/customer/{customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances
-org.openecomp.sdnc.sli.aai.path.svcinst.query=/aai/v8/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.svcinst=/aai/v8/business/customers/customer/{customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances
+org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query=/aai/v8/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance
 
 # complex
-org.openecomp.sdnc.sli.aai.path.complexes=/aai/v8/cloud-infrastructure/complexes
-org.openecomp.sdnc.sli.aai.path.complex=/aai/v8/cloud-infrastructure/complexes/complex/{physical-location-id}
+org.onap.ccsdk.sli.adaptors.aai.path.complexes=/aai/v8/cloud-infrastructure/complexes
+org.onap.ccsdk.sli.adaptors.aai.path.complex=/aai/v8/cloud-infrastructure/complexes/complex/{physical-location-id}
 
 # vservers
-org.openecomp.sdnc.sli.aai.path.vservers=/aai/v8/cloud-infrastructure/tenants/tenant/{tenant-id}/vservers
-org.openecomp.sdnc.sli.aai.path.vserver =/aai/v8/cloud-infrastructure/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}
+org.onap.ccsdk.sli.adaptors.aai.path.vservers=/aai/v8/cloud-infrastructure/tenants/tenant/{tenant-id}/vservers
+org.onap.ccsdk.sli.adaptors.aai.path.vserver =/aai/v8/cloud-infrastructure/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}
 
 # generic-vnf
-org.openecomp.sdnc.sli.aai.path.generic.vnfs=/aai/v8/network/generic-vnfs/generic-vnf/
-org.openecomp.sdnc.sli.aai.path.generic.vnf=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}
+org.onap.ccsdk.sli.adaptors.aai.path.generic.vnfs=/aai/v8/network/generic-vnfs/generic-vnf/
+org.onap.ccsdk.sli.adaptors.aai.path.generic.vnf=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-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
 
 
 org.onap.appc.logging.path=${user.home},etc,../etc,.