Update sli-adaptor/resource-assignment pack. 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-Id: CCSDK-19 Change-Id: I71c794c46bad7f7f6064c4e0538890c9f76d5f16 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
author: Marcus G K Williams <marcus.williams@intel.com> 2017-08-17 10:29:11 -0700
committer: Marcus G K Williams <marcus.williams@intel.com> 2017-08-17 10:37:11 -0700
commit: 1ac8baaba4a08c8cc6d18bcd7b45054d79c9b133 (patch)
tree: 21d60bac801f68c22ac4691cf9d0d1d8db32a0ac /resource-assignment/provider
parent: 448566611416c33d58dbd73d40f9bdc1acf40404 (diff)
141 files changed, 674 insertions, 674 deletions
diff --git a/resource-assignment/provider/pom.xml b/resource-assignment/provider/pom.xml
index b36753ab5..1b98c628a 100755
--- a/resource-assignment/provider/pom.xml
+++ b/resource-assignment/provider/pom.xml
@@ -92,9 +92,9 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>org.openecomp.sdnc.ra</Bundle-SymbolicName>
-                        <Export-Package>org.openecomp.sdnc.ra</Export-Package>
-                        <Import-Package>*,org.openecomp.sdnc.sli.resource.dblib,org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*,com.mysql.jdbc.*</Import-Package>
+                        <Bundle-SymbolicName>org.onap.ccsdk.sli.adaptors.ra</Bundle-SymbolicName>
+                        <Export-Package>org.onap.ccsdk.sli.adaptors.ra</Export-Package>
+                        <Import-Package>*,org.onap.ccsdk.sli.adaptors.resource.dblib,org.onap.ccsdk.sli.adaptors.*,org.osgi.framework.*,org.slf4j.*,com.mysql.jdbc.*</Import-Package>
                         <!--Import-Package>*</Import-Package-->
                         <Embed-Transitive>true</Embed-Transitive>
                     </instructions>
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/lock/comp/LockHelper.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/comp/LockHelper.java
index 6eb8156f8..d33703df0 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/lock/comp/LockHelper.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/comp/LockHelper.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.lock.comp;
+package org.onap.ccsdk.sli.adaptors.lock.comp;
 
 import java.util.Collection;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/lock/comp/LockHelperImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/comp/LockHelperImpl.java
index 2c7726790..4d9bb27de 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/lock/comp/LockHelperImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/comp/LockHelperImpl.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.lock.comp;
+package org.onap.ccsdk.sli.adaptors.lock.comp;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -27,8 +27,8 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-import org.openecomp.sdnc.lock.dao.ResourceLockDao;
-import org.openecomp.sdnc.lock.data.ResourceLock;
+import org.onap.ccsdk.sli.adaptors.lock.dao.ResourceLockDao;
+import org.onap.ccsdk.sli.adaptors.lock.data.ResourceLock;
 
 public class LockHelperImpl implements LockHelper {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/lock/comp/ResourceLockedException.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/comp/ResourceLockedException.java
index a1ac2fd3a..4b90b265e 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/lock/comp/ResourceLockedException.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/comp/ResourceLockedException.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.lock.comp;
+package org.onap.ccsdk.sli.adaptors.lock.comp;
 
 public class ResourceLockedException extends RuntimeException {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/lock/comp/SynchronizedFunction.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/comp/SynchronizedFunction.java
index df0ecd1c0..f4df81b8b 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/lock/comp/SynchronizedFunction.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/comp/SynchronizedFunction.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.lock.comp;
+package org.onap.ccsdk.sli.adaptors.lock.comp;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/lock/dao/ResourceLockDao.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/dao/ResourceLockDao.java
index c256dc27e..bcabb36d1 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/lock/dao/ResourceLockDao.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/dao/ResourceLockDao.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.lock.dao;
+package org.onap.ccsdk.sli.adaptors.lock.dao;
 
 import java.util.Date;
 
-import org.openecomp.sdnc.lock.data.ResourceLock;
+import org.onap.ccsdk.sli.adaptors.lock.data.ResourceLock;
 
 public interface ResourceLockDao {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/lock/dao/ResourceLockDaoImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/dao/ResourceLockDaoImpl.java
index fda097ebc..d68317fb7 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/lock/dao/ResourceLockDaoImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/dao/ResourceLockDaoImpl.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,15 +19,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.lock.dao;
+package org.onap.ccsdk.sli.adaptors.lock.dao;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Date;
 import java.util.List;
 
-import org.openecomp.sdnc.lock.data.ResourceLock;
-import org.openecomp.sdnc.util.db.CachedDataSourceWrap;
+import org.onap.ccsdk.sli.adaptors.lock.data.ResourceLock;
+import org.onap.ccsdk.sli.adaptors.util.db.CachedDataSourceWrap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/lock/data/ResourceLock.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/data/ResourceLock.java
index fbcee05e7..cb434e142 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/lock/data/ResourceLock.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/lock/data/ResourceLock.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.lock.data;
+package org.onap.ccsdk.sli.adaptors.lock.data;
 
 import java.util.Date;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/ReleaseRequestType.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/ReleaseRequestType.java
index 9c60a38f2..d3df91c2d 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/ReleaseRequestType.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/ReleaseRequestType.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra;
+package org.onap.ccsdk.sli.adaptors.ra;
 
 public enum ReleaseRequestType {
     Cancel, Activate, Disconnect;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/ReserveRequestType.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/ReserveRequestType.java
index ddbbeabdc..b46b7dede 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/ReserveRequestType.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/ReserveRequestType.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra;
+package org.onap.ccsdk.sli.adaptors.ra;
 
 public enum ReserveRequestType {
     New, Change;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/ResourceAllocator.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/ResourceAllocator.java
index 6fcaf1792..d1913b33d 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/ResourceAllocator.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/ResourceAllocator.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra;
+package org.onap.ccsdk.sli.adaptors.ra;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,37 +32,37 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
-import org.openecomp.sdnc.ra.comp.EndPointAllocator;
-import org.openecomp.sdnc.ra.comp.EndPointData;
-import org.openecomp.sdnc.ra.comp.ServiceData;
-import org.openecomp.sdnc.ra.equip.dao.ServerDao;
-import org.openecomp.sdnc.ra.equip.dao.VpePortDao;
-import org.openecomp.sdnc.ra.equip.dao.VplspePortDao;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentLevel;
-import org.openecomp.sdnc.ra.rule.comp.AllocationRequestBuilder;
-import org.openecomp.sdnc.ra.rule.dao.MaxPortSpeedDao;
-import org.openecomp.sdnc.ra.rule.dao.MaxServerSpeedDao;
-import org.openecomp.sdnc.ra.rule.dao.ParameterDao;
-import org.openecomp.sdnc.ra.rule.data.ThresholdStatus;
-import org.openecomp.sdnc.ra.service.dao.ServiceResourceDao;
-import org.openecomp.sdnc.ra.service.data.ServiceResource;
-import org.openecomp.sdnc.ra.service.data.ServiceStatus;
-import org.openecomp.sdnc.rm.comp.ResourceManager;
-import org.openecomp.sdnc.rm.data.AllocationAction;
-import org.openecomp.sdnc.rm.data.AllocationItem;
-import org.openecomp.sdnc.rm.data.AllocationOutcome;
-import org.openecomp.sdnc.rm.data.AllocationRequest;
-import org.openecomp.sdnc.rm.data.AllocationStatus;
-import org.openecomp.sdnc.rm.data.LimitAllocationOutcome;
-import org.openecomp.sdnc.rm.data.LimitAllocationRequest;
-import org.openecomp.sdnc.rm.data.LimitResource;
-import org.openecomp.sdnc.rm.data.MultiResourceAllocationOutcome;
-import org.openecomp.sdnc.rm.data.RangeAllocationItem;
-import org.openecomp.sdnc.rm.data.RangeResource;
-import org.openecomp.sdnc.rm.data.Resource;
-import org.openecomp.sdnc.util.speed.SpeedUtil;
-import org.openecomp.sdnc.util.str.StrUtil;
+import org.onap.ccsdk.sli.adaptors.ra.comp.EndPointAllocator;
+import org.onap.ccsdk.sli.adaptors.ra.comp.EndPointData;
+import org.onap.ccsdk.sli.adaptors.ra.comp.ServiceData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.dao.ServerDao;
+import org.onap.ccsdk.sli.adaptors.ra.equip.dao.VpePortDao;
+import org.onap.ccsdk.sli.adaptors.ra.equip.dao.VplspePortDao;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentLevel;
+import org.onap.ccsdk.sli.adaptors.ra.rule.comp.AllocationRequestBuilder;
+import org.onap.ccsdk.sli.adaptors.ra.rule.dao.MaxPortSpeedDao;
+import org.onap.ccsdk.sli.adaptors.ra.rule.dao.MaxServerSpeedDao;
+import org.onap.ccsdk.sli.adaptors.ra.rule.dao.ParameterDao;
+import org.onap.ccsdk.sli.adaptors.ra.rule.data.ThresholdStatus;
+import org.onap.ccsdk.sli.adaptors.ra.service.dao.ServiceResourceDao;
+import org.onap.ccsdk.sli.adaptors.ra.service.data.ServiceResource;
+import org.onap.ccsdk.sli.adaptors.ra.service.data.ServiceStatus;
+import org.onap.ccsdk.sli.adaptors.rm.comp.ResourceManager;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationAction;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationOutcome;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationStatus;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitAllocationOutcome;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitAllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitResource;
+import org.onap.ccsdk.sli.adaptors.rm.data.MultiResourceAllocationOutcome;
+import org.onap.ccsdk.sli.adaptors.rm.data.RangeAllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.RangeResource;
+import org.onap.ccsdk.sli.adaptors.rm.data.Resource;
+import org.onap.ccsdk.sli.adaptors.util.speed.SpeedUtil;
+import org.onap.ccsdk.sli.adaptors.util.str.StrUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/alloc/AffinityAllocationRule.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/alloc/AffinityAllocationRule.java
index 2ada6356c..0da7acb79 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/alloc/AffinityAllocationRule.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/alloc/AffinityAllocationRule.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,14 +19,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.alloc;
+package org.onap.ccsdk.sli.adaptors.ra.alloc;
 
-import org.openecomp.sdnc.ra.comp.AllocationRule;
-import org.openecomp.sdnc.ra.comp.ServiceData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
-import org.openecomp.sdnc.rm.data.AllocationAction;
-import org.openecomp.sdnc.rm.data.AllocationRequest;
-import org.openecomp.sdnc.rm.data.LimitAllocationRequest;
+import org.onap.ccsdk.sli.adaptors.ra.comp.AllocationRule;
+import org.onap.ccsdk.sli.adaptors.ra.comp.ServiceData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationAction;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitAllocationRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/alloc/DbAllocationRule.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/alloc/DbAllocationRule.java
index 4db6a7307..a0b698d73 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/alloc/DbAllocationRule.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/alloc/DbAllocationRule.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,26 +19,26 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.alloc;
+package org.onap.ccsdk.sli.adaptors.ra.alloc;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.openecomp.sdnc.ra.comp.AllocationRule;
-import org.openecomp.sdnc.ra.comp.ServiceData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
-import org.openecomp.sdnc.ra.rule.dao.RangeRuleDao;
-import org.openecomp.sdnc.ra.rule.dao.ResourceRuleDao;
-import org.openecomp.sdnc.ra.rule.data.RangeRule;
-import org.openecomp.sdnc.ra.rule.data.ResourceRule;
-import org.openecomp.sdnc.rm.data.AllocationAction;
-import org.openecomp.sdnc.rm.data.AllocationRequest;
-import org.openecomp.sdnc.rm.data.LimitAllocationRequest;
-import org.openecomp.sdnc.rm.data.MultiResourceAllocationRequest;
-import org.openecomp.sdnc.rm.data.RangeAllocationRequest;
-import org.openecomp.sdnc.util.expr.ExpressionEvaluator;
-import org.openecomp.sdnc.util.str.StrUtil;
+import org.onap.ccsdk.sli.adaptors.ra.comp.AllocationRule;
+import org.onap.ccsdk.sli.adaptors.ra.comp.ServiceData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.ra.rule.dao.RangeRuleDao;
+import org.onap.ccsdk.sli.adaptors.ra.rule.dao.ResourceRuleDao;
+import org.onap.ccsdk.sli.adaptors.ra.rule.data.RangeRule;
+import org.onap.ccsdk.sli.adaptors.ra.rule.data.ResourceRule;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationAction;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitAllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.MultiResourceAllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.RangeAllocationRequest;
+import org.onap.ccsdk.sli.adaptors.util.expr.ExpressionEvaluator;
+import org.onap.ccsdk.sli.adaptors.util.str.StrUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/alloc/ServingSiteAllocationRule.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/alloc/ServingSiteAllocationRule.java
index f2c0f76d0..b1c4ac449 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/alloc/ServingSiteAllocationRule.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/alloc/ServingSiteAllocationRule.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,16 +19,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.alloc;
+package org.onap.ccsdk.sli.adaptors.ra.alloc;
 
-import org.openecomp.sdnc.ra.comp.AllocationRule;
-import org.openecomp.sdnc.ra.comp.ServiceData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
-import org.openecomp.sdnc.rm.data.AllocationAction;
-import org.openecomp.sdnc.rm.data.AllocationRequest;
-import org.openecomp.sdnc.rm.data.LimitAllocationRequest;
-import org.openecomp.sdnc.util.vrf.VpnParam;
-import org.openecomp.sdnc.util.vrf.VrfUtil;
+import org.onap.ccsdk.sli.adaptors.ra.comp.AllocationRule;
+import org.onap.ccsdk.sli.adaptors.ra.comp.ServiceData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationAction;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitAllocationRequest;
+import org.onap.ccsdk.sli.adaptors.util.vrf.VpnParam;
+import org.onap.ccsdk.sli.adaptors.util.vrf.VrfUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/alloc/VrfAllocationRule.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/alloc/VrfAllocationRule.java
index 109960dcb..74bfe6634 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/alloc/VrfAllocationRule.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/alloc/VrfAllocationRule.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,19 +19,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.alloc;
+package org.onap.ccsdk.sli.adaptors.ra.alloc;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.openecomp.sdnc.ra.comp.AllocationRule;
-import org.openecomp.sdnc.ra.comp.ServiceData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
-import org.openecomp.sdnc.rm.data.AllocationAction;
-import org.openecomp.sdnc.rm.data.AllocationRequest;
-import org.openecomp.sdnc.rm.data.LimitAllocationRequest;
-import org.openecomp.sdnc.rm.data.MultiResourceAllocationRequest;
+import org.onap.ccsdk.sli.adaptors.ra.comp.AllocationRule;
+import org.onap.ccsdk.sli.adaptors.ra.comp.ServiceData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationAction;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitAllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.MultiResourceAllocationRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/check/AnyVrfPresentCheck.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/check/AnyVrfPresentCheck.java
index 103555195..6f4de2693 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/check/AnyVrfPresentCheck.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/check/AnyVrfPresentCheck.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,16 +19,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.check;
+package org.onap.ccsdk.sli.adaptors.ra.check;
 
 import java.util.Map;
 
-import org.openecomp.sdnc.ra.comp.EquipmentCheck;
-import org.openecomp.sdnc.ra.comp.ServiceData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
-import org.openecomp.sdnc.rm.comp.ResourceManager;
-import org.openecomp.sdnc.rm.data.AllocationItem;
-import org.openecomp.sdnc.rm.data.Resource;
+import org.onap.ccsdk.sli.adaptors.ra.comp.EquipmentCheck;
+import org.onap.ccsdk.sli.adaptors.ra.comp.ServiceData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.rm.comp.ResourceManager;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/check/ExcludeVpeCheck.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/check/ExcludeVpeCheck.java
index 0feb2c75c..020c165ab 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/check/ExcludeVpeCheck.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/check/ExcludeVpeCheck.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,13 +19,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.check;
+package org.onap.ccsdk.sli.adaptors.ra.check;
 
 import java.util.Map;
 
-import org.openecomp.sdnc.ra.comp.EquipmentCheck;
-import org.openecomp.sdnc.ra.comp.ServiceData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.ra.comp.EquipmentCheck;
+import org.onap.ccsdk.sli.adaptors.ra.comp.ServiceData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/check/HubWithRgCheck.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/check/HubWithRgCheck.java
index 01e2695da..22fdeca33 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/check/HubWithRgCheck.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/check/HubWithRgCheck.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,18 +19,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.check;
+package org.onap.ccsdk.sli.adaptors.ra.check;
 
 import java.util.Map;
 
-import org.openecomp.sdnc.ra.comp.EquipmentCheck;
-import org.openecomp.sdnc.ra.comp.ServiceData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
-import org.openecomp.sdnc.rm.comp.ResourceManager;
-import org.openecomp.sdnc.rm.data.AllocationItem;
-import org.openecomp.sdnc.rm.data.Resource;
-import org.openecomp.sdnc.util.vrf.VpnParam;
-import org.openecomp.sdnc.util.vrf.VrfUtil;
+import org.onap.ccsdk.sli.adaptors.ra.comp.EquipmentCheck;
+import org.onap.ccsdk.sli.adaptors.ra.comp.ServiceData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.rm.comp.ResourceManager;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.Resource;
+import org.onap.ccsdk.sli.adaptors.util.vrf.VpnParam;
+import org.onap.ccsdk.sli.adaptors.util.vrf.VrfUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/check/OneMVrfCheck.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/check/OneMVrfCheck.java
index 64a6c2719..e54d89cb1 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/check/OneMVrfCheck.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/check/OneMVrfCheck.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,18 +19,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.check;
+package org.onap.ccsdk.sli.adaptors.ra.check;
 
 import java.util.Map;
 
-import org.openecomp.sdnc.ra.comp.EquipmentCheck;
-import org.openecomp.sdnc.ra.comp.ServiceData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
-import org.openecomp.sdnc.rm.comp.ResourceManager;
-import org.openecomp.sdnc.rm.data.AllocationItem;
-import org.openecomp.sdnc.rm.data.Resource;
-import org.openecomp.sdnc.util.vrf.VpnParam;
-import org.openecomp.sdnc.util.vrf.VrfUtil;
+import org.onap.ccsdk.sli.adaptors.ra.comp.EquipmentCheck;
+import org.onap.ccsdk.sli.adaptors.ra.comp.ServiceData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.rm.comp.ResourceManager;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.Resource;
+import org.onap.ccsdk.sli.adaptors.util.vrf.VpnParam;
+import org.onap.ccsdk.sli.adaptors.util.vrf.VrfUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/check/ProvStatusCheck.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/check/ProvStatusCheck.java
index 07e0718c4..f851b53b6 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/check/ProvStatusCheck.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/check/ProvStatusCheck.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,13 +19,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.check;
+package org.onap.ccsdk.sli.adaptors.ra.check;
 
 import java.util.Map;
 
-import org.openecomp.sdnc.ra.comp.EquipmentCheck;
-import org.openecomp.sdnc.ra.comp.ServiceData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.ra.comp.EquipmentCheck;
+import org.onap.ccsdk.sli.adaptors.ra.comp.ServiceData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/check/VlanSpeedCheck.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/check/VlanSpeedCheck.java
index c6e9b758d..28e6278de 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/check/VlanSpeedCheck.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/check/VlanSpeedCheck.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,13 +19,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.check;
+package org.onap.ccsdk.sli.adaptors.ra.check;
 
 import java.util.Map;
 
-import org.openecomp.sdnc.ra.comp.EquipmentCheck;
-import org.openecomp.sdnc.ra.comp.ServiceData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.ra.comp.EquipmentCheck;
+import org.onap.ccsdk.sli.adaptors.ra.comp.ServiceData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/check/VpeLockCheck.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/check/VpeLockCheck.java
index a55bca31d..503e1ffc2 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/check/VpeLockCheck.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/check/VpeLockCheck.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,17 +19,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.check;
+package org.onap.ccsdk.sli.adaptors.ra.check;
 
 import java.util.Map;
 
-import org.openecomp.sdnc.ra.comp.EquipmentCheck;
-import org.openecomp.sdnc.ra.comp.ServiceData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
-import org.openecomp.sdnc.ra.rule.dao.VpeLockDao;
-import org.openecomp.sdnc.rm.comp.ResourceManager;
-import org.openecomp.sdnc.rm.data.AllocationItem;
-import org.openecomp.sdnc.rm.data.Resource;
+import org.onap.ccsdk.sli.adaptors.ra.comp.EquipmentCheck;
+import org.onap.ccsdk.sli.adaptors.ra.comp.ServiceData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.ra.rule.dao.VpeLockDao;
+import org.onap.ccsdk.sli.adaptors.rm.comp.ResourceManager;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/comp/AllocationRule.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/AllocationRule.java
index 76f7e3e6b..831cac0c3 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/comp/AllocationRule.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/AllocationRule.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.comp;
+package org.onap.ccsdk.sli.adaptors.ra.comp;
 
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
-import org.openecomp.sdnc.rm.data.AllocationRequest;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationRequest;
 
 public interface AllocationRule {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/comp/EndPointAllocationDefinition.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/EndPointAllocationDefinition.java
index 7c4593d09..589fafcd6 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/comp/EndPointAllocationDefinition.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/EndPointAllocationDefinition.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.comp;
+package org.onap.ccsdk.sli.adaptors.ra.comp;
 
 import java.util.List;
 
-import org.openecomp.sdnc.ra.equip.comp.EquipmentReader;
+import org.onap.ccsdk.sli.adaptors.ra.equip.comp.EquipmentReader;
 
 public class EndPointAllocationDefinition {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/comp/EndPointAllocator.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/EndPointAllocator.java
index 325972c9a..08713cd76 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/comp/EndPointAllocator.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/EndPointAllocator.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.comp;
+package org.onap.ccsdk.sli.adaptors.ra.comp;
 
 import java.util.List;
 import java.util.Map;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/comp/EndPointAllocatorImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/EndPointAllocatorImpl.java
index e149a94be..0f488bc67 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/comp/EndPointAllocatorImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/EndPointAllocatorImpl.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.comp;
+package org.onap.ccsdk.sli.adaptors.ra.comp;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,17 +28,17 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.NotImplementedException;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
-import org.openecomp.sdnc.rm.comp.ResourceManager;
-import org.openecomp.sdnc.rm.data.AllocationItem;
-import org.openecomp.sdnc.rm.data.AllocationOutcome;
-import org.openecomp.sdnc.rm.data.AllocationRequest;
-import org.openecomp.sdnc.rm.data.AllocationStatus;
-import org.openecomp.sdnc.rm.data.LimitAllocationItem;
-import org.openecomp.sdnc.rm.data.LimitResource;
-import org.openecomp.sdnc.rm.data.RangeAllocationItem;
-import org.openecomp.sdnc.rm.data.RangeResource;
-import org.openecomp.sdnc.rm.data.Resource;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.rm.comp.ResourceManager;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationOutcome;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationStatus;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitAllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitResource;
+import org.onap.ccsdk.sli.adaptors.rm.data.RangeAllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.RangeResource;
+import org.onap.ccsdk.sli.adaptors.rm.data.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/comp/EndPointData.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/EndPointData.java
index eb4ee950c..dc1cb0a63 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/comp/EndPointData.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/EndPointData.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.comp;
+package org.onap.ccsdk.sli.adaptors.ra.comp;
 
 import java.util.Map;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/comp/EquipmentCheck.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/EquipmentCheck.java
index e637f116e..70f2abde8 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/comp/EquipmentCheck.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/EquipmentCheck.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.comp;
+package org.onap.ccsdk.sli.adaptors.ra.comp;
 
 import java.util.Map;
 
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
 
 public interface EquipmentCheck {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/comp/PreferenceRule.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/PreferenceRule.java
index 52d8961a2..ca8a37191 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/comp/PreferenceRule.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/PreferenceRule.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.comp;
+package org.onap.ccsdk.sli.adaptors.ra.comp;
 
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
 
 public interface PreferenceRule {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/comp/ServiceData.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/ServiceData.java
index 80aca0b02..238ea1d13 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/comp/ServiceData.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/comp/ServiceData.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.comp;
+package org.onap.ccsdk.sli.adaptors.ra.comp;
 
 import java.util.Map;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/equip/comp/EquipmentReader.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/equip/comp/EquipmentReader.java
index b2424acb5..03f96e272 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/equip/comp/EquipmentReader.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/equip/comp/EquipmentReader.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.equip.comp;
+package org.onap.ccsdk.sli.adaptors.ra.equip.comp;
 
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
 
 public interface EquipmentReader {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/equip/dao/ServerDao.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/equip/dao/ServerDao.java
index 4126d1533..f9f7ee3d9 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/equip/dao/ServerDao.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/equip/dao/ServerDao.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.equip.dao;
+package org.onap.ccsdk.sli.adaptors.ra.equip.dao;
 
 import java.util.List;
 import java.util.Map;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/equip/dao/ServerDaoImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/equip/dao/ServerDaoImpl.java
index 7847d5b54..f51dc1402 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/equip/dao/ServerDaoImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/equip/dao/ServerDaoImpl.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.equip.dao;
+package org.onap.ccsdk.sli.adaptors.ra.equip.dao;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/equip/dao/VpePortDao.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/equip/dao/VpePortDao.java
index b795533d7..1a86c6f80 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/equip/dao/VpePortDao.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/equip/dao/VpePortDao.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.equip.dao;
+package org.onap.ccsdk.sli.adaptors.ra.equip.dao;
 
 import java.util.List;
 import java.util.Map;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/equip/dao/VpePortDaoImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/equip/dao/VpePortDaoImpl.java
index 90cd6c5a1..05d2e76d7 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/equip/dao/VpePortDaoImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/equip/dao/VpePortDaoImpl.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.equip.dao;
+package org.onap.ccsdk.sli.adaptors.ra.equip.dao;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/equip/dao/VplspePortDao.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/equip/dao/VplspePortDao.java
index 974e48bbd..20cb83ff2 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/equip/dao/VplspePortDao.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/equip/dao/VplspePortDao.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.equip.dao;
+package org.onap.ccsdk.sli.adaptors.ra.equip.dao;
 
 import java.util.List;
 import java.util.Map;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/equip/dao/VplspePortDaoImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/equip/dao/VplspePortDaoImpl.java
index 3344355d1..6c3d368b2 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/equip/dao/VplspePortDaoImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/equip/dao/VplspePortDaoImpl.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.equip.dao;
+package org.onap.ccsdk.sli.adaptors.ra.equip.dao;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/equip/data/EquipmentData.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/equip/data/EquipmentData.java
index b3f20800e..15342a697 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/equip/data/EquipmentData.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/equip/data/EquipmentData.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.equip.data;
+package org.onap.ccsdk.sli.adaptors.ra.equip.data;
 
 import java.util.Map;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/equip/data/EquipmentLevel.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/equip/data/EquipmentLevel.java
index 399862bf6..c77e36851 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/equip/data/EquipmentLevel.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/equip/data/EquipmentLevel.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.equip.data;
+package org.onap.ccsdk.sli.adaptors.ra.equip.data;
 
 public enum EquipmentLevel {
     Port, Device, Server, Site
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/pref/AffinityLinkPref.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/pref/AffinityLinkPref.java
index 24cd39970..0e510ac1a 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/pref/AffinityLinkPref.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/pref/AffinityLinkPref.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,17 +19,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.pref;
+package org.onap.ccsdk.sli.adaptors.ra.pref;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.sdnc.ra.comp.PreferenceRule;
-import org.openecomp.sdnc.ra.comp.ServiceData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
-import org.openecomp.sdnc.rm.comp.ResourceManager;
-import org.openecomp.sdnc.rm.data.LimitResource;
-import org.openecomp.sdnc.rm.data.Resource;
+import org.onap.ccsdk.sli.adaptors.ra.comp.PreferenceRule;
+import org.onap.ccsdk.sli.adaptors.ra.comp.ServiceData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.rm.comp.ResourceManager;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitResource;
+import org.onap.ccsdk.sli.adaptors.rm.data.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/pref/EvcExistingVrfPref.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/pref/EvcExistingVrfPref.java
index befb8b7ef..559f79689 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/pref/EvcExistingVrfPref.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/pref/EvcExistingVrfPref.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,14 +19,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.pref;
+package org.onap.ccsdk.sli.adaptors.ra.pref;
 
-import org.openecomp.sdnc.ra.comp.PreferenceRule;
-import org.openecomp.sdnc.ra.comp.ServiceData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
-import org.openecomp.sdnc.rm.comp.ResourceManager;
-import org.openecomp.sdnc.rm.data.AllocationItem;
-import org.openecomp.sdnc.rm.data.Resource;
+import org.onap.ccsdk.sli.adaptors.ra.comp.PreferenceRule;
+import org.onap.ccsdk.sli.adaptors.ra.comp.ServiceData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.rm.comp.ResourceManager;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/reader/AicSiteReader.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/reader/AicSiteReader.java
index b9b136a82..1faf254f4 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/reader/AicSiteReader.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/reader/AicSiteReader.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,16 +19,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.reader;
+package org.onap.ccsdk.sli.adaptors.ra.reader;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.sdnc.ra.equip.comp.EquipmentReader;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentLevel;
+import org.onap.ccsdk.sli.adaptors.ra.equip.comp.EquipmentReader;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentLevel;
 
 public class AicSiteReader implements EquipmentReader {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/reader/UplinkCircuitReader.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/reader/UplinkCircuitReader.java
index b2caffcf2..4943c506b 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/reader/UplinkCircuitReader.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/reader/UplinkCircuitReader.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,15 +19,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.reader;
+package org.onap.ccsdk.sli.adaptors.ra.reader;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.sdnc.ra.equip.comp.EquipmentReader;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentLevel;
+import org.onap.ccsdk.sli.adaptors.ra.equip.comp.EquipmentReader;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentLevel;
 
 public class UplinkCircuitReader implements EquipmentReader {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/reader/VnfReader.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/reader/VnfReader.java
index cffd6b11b..d5d3d005f 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/reader/VnfReader.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/reader/VnfReader.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,16 +19,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.reader;
+package org.onap.ccsdk.sli.adaptors.ra.reader;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.sdnc.ra.equip.comp.EquipmentReader;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentLevel;
+import org.onap.ccsdk.sli.adaptors.ra.equip.comp.EquipmentReader;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentLevel;
 
 public class VnfReader implements EquipmentReader {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/reader/VpePortReader.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/reader/VpePortReader.java
index ad6fbb79e..59328f976 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/reader/VpePortReader.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/reader/VpePortReader.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,16 +19,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.reader;
+package org.onap.ccsdk.sli.adaptors.ra.reader;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.sdnc.ra.equip.comp.EquipmentReader;
-import org.openecomp.sdnc.ra.equip.dao.VpePortDao;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentLevel;
+import org.onap.ccsdk.sli.adaptors.ra.equip.comp.EquipmentReader;
+import org.onap.ccsdk.sli.adaptors.ra.equip.dao.VpePortDao;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentLevel;
 
 public class VpePortReader implements EquipmentReader {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/comp/AllocationRequestBuilder.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/comp/AllocationRequestBuilder.java
index 2bac62efc..e4361f1d9 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/comp/AllocationRequestBuilder.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/comp/AllocationRequestBuilder.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,13 +19,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.rule.comp;
+package org.onap.ccsdk.sli.adaptors.ra.rule.comp;
 
-import org.openecomp.sdnc.ra.comp.ServiceData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
-import org.openecomp.sdnc.ra.rule.data.ThresholdStatus;
-import org.openecomp.sdnc.rm.data.AllocationRequest;
-import org.openecomp.sdnc.rm.data.LimitAllocationOutcome;
+import org.onap.ccsdk.sli.adaptors.ra.comp.ServiceData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.ra.rule.data.ThresholdStatus;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitAllocationOutcome;
 
 public interface AllocationRequestBuilder {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/comp/AllocationRequestBuilderImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/comp/AllocationRequestBuilderImpl.java
index 204f7eb3d..ab0ef3b67 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/comp/AllocationRequestBuilderImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/comp/AllocationRequestBuilderImpl.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,27 +19,27 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.rule.comp;
+package org.onap.ccsdk.sli.adaptors.ra.rule.comp;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.sdnc.ra.comp.ServiceData;
-import org.openecomp.sdnc.ra.equip.data.EquipmentData;
-import org.openecomp.sdnc.ra.rule.dao.RangeRuleDao;
-import org.openecomp.sdnc.ra.rule.dao.ResourceRuleDao;
-import org.openecomp.sdnc.ra.rule.data.RangeRule;
-import org.openecomp.sdnc.ra.rule.data.ResourceRule;
-import org.openecomp.sdnc.ra.rule.data.ResourceThreshold;
-import org.openecomp.sdnc.ra.rule.data.ThresholdStatus;
-import org.openecomp.sdnc.rm.data.AllocationAction;
-import org.openecomp.sdnc.rm.data.AllocationRequest;
-import org.openecomp.sdnc.rm.data.LimitAllocationOutcome;
-import org.openecomp.sdnc.rm.data.LimitAllocationRequest;
-import org.openecomp.sdnc.rm.data.MultiResourceAllocationRequest;
-import org.openecomp.sdnc.rm.data.RangeAllocationRequest;
-import org.openecomp.sdnc.util.expr.ExpressionEvaluator;
-import org.openecomp.sdnc.util.str.StrUtil;
+import org.onap.ccsdk.sli.adaptors.ra.comp.ServiceData;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentData;
+import org.onap.ccsdk.sli.adaptors.ra.rule.dao.RangeRuleDao;
+import org.onap.ccsdk.sli.adaptors.ra.rule.dao.ResourceRuleDao;
+import org.onap.ccsdk.sli.adaptors.ra.rule.data.RangeRule;
+import org.onap.ccsdk.sli.adaptors.ra.rule.data.ResourceRule;
+import org.onap.ccsdk.sli.adaptors.ra.rule.data.ResourceThreshold;
+import org.onap.ccsdk.sli.adaptors.ra.rule.data.ThresholdStatus;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationAction;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitAllocationOutcome;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitAllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.MultiResourceAllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.RangeAllocationRequest;
+import org.onap.ccsdk.sli.adaptors.util.expr.ExpressionEvaluator;
+import org.onap.ccsdk.sli.adaptors.util.str.StrUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/MaxPortSpeedDao.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/MaxPortSpeedDao.java
index cac4ce5d4..8adf25113 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/MaxPortSpeedDao.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/MaxPortSpeedDao.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.rule.dao;
+package org.onap.ccsdk.sli.adaptors.ra.rule.dao;
 
 public interface MaxPortSpeedDao {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/MaxPortSpeedDaoImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/MaxPortSpeedDaoImpl.java
index 805bfa9c6..481c6f45f 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/MaxPortSpeedDaoImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/MaxPortSpeedDaoImpl.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,13 +19,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.rule.dao;
+package org.onap.ccsdk.sli.adaptors.ra.rule.dao;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.openecomp.sdnc.util.speed.SpeedUtil;
+import org.onap.ccsdk.sli.adaptors.util.speed.SpeedUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/MaxServerSpeedDao.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/MaxServerSpeedDao.java
index fcec72f71..607cc0a3b 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/MaxServerSpeedDao.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/MaxServerSpeedDao.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.rule.dao;
+package org.onap.ccsdk.sli.adaptors.ra.rule.dao;
 
 public interface MaxServerSpeedDao {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/MaxServerSpeedDaoImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/MaxServerSpeedDaoImpl.java
index 9bc18e63d..445166bb6 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/MaxServerSpeedDaoImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/MaxServerSpeedDaoImpl.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,13 +19,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.rule.dao;
+package org.onap.ccsdk.sli.adaptors.ra.rule.dao;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.openecomp.sdnc.util.speed.SpeedUtil;
+import org.onap.ccsdk.sli.adaptors.util.speed.SpeedUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/ParameterDao.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/ParameterDao.java
index 72de3bdb2..724ee199c 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/ParameterDao.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/ParameterDao.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.rule.dao;
+package org.onap.ccsdk.sli.adaptors.ra.rule.dao;
 
 public interface ParameterDao {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/ParameterDaoImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/ParameterDaoImpl.java
index 3f0692dba..eb061f99b 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/ParameterDaoImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/ParameterDaoImpl.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.rule.dao;
+package org.onap.ccsdk.sli.adaptors.ra.rule.dao;
 
 import java.util.List;
 import java.util.Map;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/RangeRuleDao.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/RangeRuleDao.java
index 268c4d634..ad1498d06 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/RangeRuleDao.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/RangeRuleDao.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.rule.dao;
+package org.onap.ccsdk.sli.adaptors.ra.rule.dao;
 
 import java.util.List;
 
-import org.openecomp.sdnc.ra.equip.data.EquipmentLevel;
-import org.openecomp.sdnc.ra.rule.data.RangeRule;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentLevel;
+import org.onap.ccsdk.sli.adaptors.ra.rule.data.RangeRule;
 
 public interface RangeRuleDao {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/RangeRuleDaoImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/RangeRuleDaoImpl.java
index bc335aa30..29a4aea28 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/RangeRuleDaoImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/RangeRuleDaoImpl.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,14 +19,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.rule.dao;
+package org.onap.ccsdk.sli.adaptors.ra.rule.dao;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.openecomp.sdnc.ra.equip.data.EquipmentLevel;
-import org.openecomp.sdnc.ra.rule.data.RangeRule;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentLevel;
+import org.onap.ccsdk.sli.adaptors.ra.rule.data.RangeRule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/ResourceRuleDao.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/ResourceRuleDao.java
index 5cb9f376d..9d879fbe6 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/ResourceRuleDao.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/ResourceRuleDao.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.rule.dao;
+package org.onap.ccsdk.sli.adaptors.ra.rule.dao;
 
 import java.util.List;
 
-import org.openecomp.sdnc.ra.equip.data.EquipmentLevel;
-import org.openecomp.sdnc.ra.rule.data.ResourceRule;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentLevel;
+import org.onap.ccsdk.sli.adaptors.ra.rule.data.ResourceRule;
 
 public interface ResourceRuleDao {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/ResourceRuleDaoImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/ResourceRuleDaoImpl.java
index be3ac5704..0e765f385 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/ResourceRuleDaoImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/ResourceRuleDaoImpl.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,15 +19,15 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.rule.dao;
+package org.onap.ccsdk.sli.adaptors.ra.rule.dao;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.openecomp.sdnc.ra.equip.data.EquipmentLevel;
-import org.openecomp.sdnc.ra.rule.data.ResourceRule;
-import org.openecomp.sdnc.ra.rule.data.ResourceThreshold;
+import org.onap.ccsdk.sli.adaptors.ra.equip.data.EquipmentLevel;
+import org.onap.ccsdk.sli.adaptors.ra.rule.data.ResourceRule;
+import org.onap.ccsdk.sli.adaptors.ra.rule.data.ResourceThreshold;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/VpeLockDao.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/VpeLockDao.java
index d7cb10251..b51cb2e8c 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/VpeLockDao.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/VpeLockDao.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.rule.dao;
+package org.onap.ccsdk.sli.adaptors.ra.rule.dao;
 
 public interface VpeLockDao {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/VpeLockDaoImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/VpeLockDaoImpl.java
index fa57dcdd7..443f50666 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/dao/VpeLockDaoImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/dao/VpeLockDaoImpl.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.rule.dao;
+package org.onap.ccsdk.sli.adaptors.ra.rule.dao;
 
 import java.util.List;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/data/RangeRule.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/data/RangeRule.java
index 780c62ad4..383c28308 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/data/RangeRule.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/data/RangeRule.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.rule.data;
+package org.onap.ccsdk.sli.adaptors.ra.rule.data;
 
 public class RangeRule {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/data/ResourceRule.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/data/ResourceRule.java
index 40b942213..17e0196b2 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/data/ResourceRule.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/data/ResourceRule.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.rule.data;
+package org.onap.ccsdk.sli.adaptors.ra.rule.data;
 
 import java.util.List;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/data/ResourceThreshold.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/data/ResourceThreshold.java
index 656c7755c..3f07d9f6b 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/data/ResourceThreshold.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/data/ResourceThreshold.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.rule.data;
+package org.onap.ccsdk.sli.adaptors.ra.rule.data;
 
 public class ResourceThreshold {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/data/ThresholdStatus.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/data/ThresholdStatus.java
index 5203a4de0..5bc8d3450 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/rule/data/ThresholdStatus.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/rule/data/ThresholdStatus.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.rule.data;
+package org.onap.ccsdk.sli.adaptors.ra.rule.data;
 
 public class ThresholdStatus {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/service/dao/ServiceResourceDao.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/service/dao/ServiceResourceDao.java
index dea147bd7..9f923a5c7 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/service/dao/ServiceResourceDao.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/service/dao/ServiceResourceDao.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.service.dao;
+package org.onap.ccsdk.sli.adaptors.ra.service.dao;
 
-import org.openecomp.sdnc.ra.service.data.ServiceResource;
-import org.openecomp.sdnc.ra.service.data.ServiceStatus;
+import org.onap.ccsdk.sli.adaptors.ra.service.data.ServiceResource;
+import org.onap.ccsdk.sli.adaptors.ra.service.data.ServiceStatus;
 
 public interface ServiceResourceDao {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/service/dao/ServiceResourceDaoImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/service/dao/ServiceResourceDaoImpl.java
index 903dc825c..b0e2046f8 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/service/dao/ServiceResourceDaoImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/service/dao/ServiceResourceDaoImpl.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,14 +19,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.service.dao;
+package org.onap.ccsdk.sli.adaptors.ra.service.dao;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.openecomp.sdnc.ra.service.data.ServiceResource;
-import org.openecomp.sdnc.ra.service.data.ServiceStatus;
+import org.onap.ccsdk.sli.adaptors.ra.service.data.ServiceResource;
+import org.onap.ccsdk.sli.adaptors.ra.service.data.ServiceStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/service/data/ServiceResource.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/service/data/ServiceResource.java
index 45021ac27..519e79194 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/service/data/ServiceResource.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/service/data/ServiceResource.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.service.data;
+package org.onap.ccsdk.sli.adaptors.ra.service.data;
 
 public class ServiceResource {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/service/data/ServiceStatus.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/service/data/ServiceStatus.java
index adac5207f..9fd1b37f8 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/service/data/ServiceStatus.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/service/data/ServiceStatus.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.ra.service.data;
+package org.onap.ccsdk.sli.adaptors.ra.service.data;
 
 public enum ServiceStatus {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/comp/AllocationFunction.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/comp/AllocationFunction.java
index 9aac5542a..bda496a11 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/comp/AllocationFunction.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/comp/AllocationFunction.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.comp;
+package org.onap.ccsdk.sli.adaptors.rm.comp;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -30,32 +30,32 @@ import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.openecomp.sdnc.lock.comp.LockHelper;
-import org.openecomp.sdnc.lock.comp.ResourceLockedException;
-import org.openecomp.sdnc.lock.comp.SynchronizedFunction;
-import org.openecomp.sdnc.rm.dao.ResourceDao;
-import org.openecomp.sdnc.rm.data.AllocationOutcome;
-import org.openecomp.sdnc.rm.data.AllocationRequest;
-import org.openecomp.sdnc.rm.data.AllocationStatus;
-import org.openecomp.sdnc.rm.data.LabelAllocationOutcome;
-import org.openecomp.sdnc.rm.data.LabelAllocationRequest;
-import org.openecomp.sdnc.rm.data.LabelResource;
-import org.openecomp.sdnc.rm.data.LimitAllocationOutcome;
-import org.openecomp.sdnc.rm.data.LimitAllocationRequest;
-import org.openecomp.sdnc.rm.data.LimitResource;
-import org.openecomp.sdnc.rm.data.MultiAssetAllocationOutcome;
-import org.openecomp.sdnc.rm.data.MultiAssetAllocationRequest;
-import org.openecomp.sdnc.rm.data.MultiResourceAllocationOutcome;
-import org.openecomp.sdnc.rm.data.MultiResourceAllocationRequest;
-import org.openecomp.sdnc.rm.data.RangeAllocationOutcome;
-import org.openecomp.sdnc.rm.data.RangeAllocationRequest;
-import org.openecomp.sdnc.rm.data.RangeResource;
-import org.openecomp.sdnc.rm.data.Resource;
-import org.openecomp.sdnc.rm.data.ResourceKey;
-import org.openecomp.sdnc.rm.data.ResourceType;
-import org.openecomp.sdnc.rm.util.LabelUtil;
-import org.openecomp.sdnc.rm.util.LimitUtil;
-import org.openecomp.sdnc.rm.util.RangeUtil;
+import org.onap.ccsdk.sli.adaptors.lock.comp.LockHelper;
+import org.onap.ccsdk.sli.adaptors.lock.comp.ResourceLockedException;
+import org.onap.ccsdk.sli.adaptors.lock.comp.SynchronizedFunction;
+import org.onap.ccsdk.sli.adaptors.rm.dao.ResourceDao;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationOutcome;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationStatus;
+import org.onap.ccsdk.sli.adaptors.rm.data.LabelAllocationOutcome;
+import org.onap.ccsdk.sli.adaptors.rm.data.LabelAllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.LabelResource;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitAllocationOutcome;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitAllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitResource;
+import org.onap.ccsdk.sli.adaptors.rm.data.MultiAssetAllocationOutcome;
+import org.onap.ccsdk.sli.adaptors.rm.data.MultiAssetAllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.MultiResourceAllocationOutcome;
+import org.onap.ccsdk.sli.adaptors.rm.data.MultiResourceAllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.RangeAllocationOutcome;
+import org.onap.ccsdk.sli.adaptors.rm.data.RangeAllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.RangeResource;
+import org.onap.ccsdk.sli.adaptors.rm.data.Resource;
+import org.onap.ccsdk.sli.adaptors.rm.data.ResourceKey;
+import org.onap.ccsdk.sli.adaptors.rm.data.ResourceType;
+import org.onap.ccsdk.sli.adaptors.rm.util.LabelUtil;
+import org.onap.ccsdk.sli.adaptors.rm.util.LimitUtil;
+import org.onap.ccsdk.sli.adaptors.rm.util.RangeUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/comp/ReleaseFunction.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/comp/ReleaseFunction.java
index ab6ee3686..c0dec8bb7 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/comp/ReleaseFunction.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/comp/ReleaseFunction.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,19 +19,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.comp;
+package org.onap.ccsdk.sli.adaptors.rm.comp;
 
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import org.openecomp.sdnc.lock.comp.LockHelper;
-import org.openecomp.sdnc.lock.comp.ResourceLockedException;
-import org.openecomp.sdnc.lock.comp.SynchronizedFunction;
-import org.openecomp.sdnc.rm.dao.ResourceDao;
-import org.openecomp.sdnc.rm.data.AllocationItem;
-import org.openecomp.sdnc.rm.data.Resource;
-import org.openecomp.sdnc.rm.util.ResourceUtil;
+import org.onap.ccsdk.sli.adaptors.lock.comp.LockHelper;
+import org.onap.ccsdk.sli.adaptors.lock.comp.ResourceLockedException;
+import org.onap.ccsdk.sli.adaptors.lock.comp.SynchronizedFunction;
+import org.onap.ccsdk.sli.adaptors.rm.dao.ResourceDao;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.Resource;
+import org.onap.ccsdk.sli.adaptors.rm.util.ResourceUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/comp/ResourceLoader.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/comp/ResourceLoader.java
index d1f567ff0..2d4df68b5 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/comp/ResourceLoader.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/comp/ResourceLoader.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.comp;
+package org.onap.ccsdk.sli.adaptors.rm.comp;
 
 import java.util.Collection;
 
-import org.openecomp.sdnc.rm.data.Resource;
+import org.onap.ccsdk.sli.adaptors.rm.data.Resource;
 
 public interface ResourceLoader {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/comp/ResourceManager.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/comp/ResourceManager.java
index 3f751cb7e..8aaa28687 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/comp/ResourceManager.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/comp/ResourceManager.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,13 +19,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.comp;
+package org.onap.ccsdk.sli.adaptors.rm.comp;
 
 import java.util.List;
 
-import org.openecomp.sdnc.rm.data.AllocationOutcome;
-import org.openecomp.sdnc.rm.data.AllocationRequest;
-import org.openecomp.sdnc.rm.data.Resource;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationOutcome;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.Resource;
 
 public interface ResourceManager {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/comp/ResourceManagerImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/comp/ResourceManagerImpl.java
index 17c994144..2884e989f 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/comp/ResourceManagerImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/comp/ResourceManagerImpl.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,19 +19,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.comp;
+package org.onap.ccsdk.sli.adaptors.rm.comp;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.openecomp.sdnc.lock.comp.LockHelper;
-import org.openecomp.sdnc.rm.dao.ResourceDao;
-import org.openecomp.sdnc.rm.data.AllocationOutcome;
-import org.openecomp.sdnc.rm.data.AllocationRequest;
-import org.openecomp.sdnc.rm.data.Resource;
-import org.openecomp.sdnc.rm.util.ResourceUtil;
-import org.openecomp.sdnc.util.str.StrUtil;
+import org.onap.ccsdk.sli.adaptors.lock.comp.LockHelper;
+import org.onap.ccsdk.sli.adaptors.rm.dao.ResourceDao;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationOutcome;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.Resource;
+import org.onap.ccsdk.sli.adaptors.rm.util.ResourceUtil;
+import org.onap.ccsdk.sli.adaptors.util.str.StrUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/ResourceDao.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/ResourceDao.java
index e02b40418..18d6d45c7 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/ResourceDao.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/ResourceDao.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,11 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.dao;
+package org.onap.ccsdk.sli.adaptors.rm.dao;
 
 import java.util.List;
 
-import org.openecomp.sdnc.rm.data.Resource;
+import org.onap.ccsdk.sli.adaptors.rm.data.Resource;
 
 public interface ResourceDao {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/AllocationItem.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/AllocationItem.java
index 2b576ba8b..25d8bf97e 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/AllocationItem.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/AllocationItem.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.dao.jdbc;
+package org.onap.ccsdk.sli.adaptors.rm.dao.jdbc;
 
 import java.util.Date;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/AllocationItemJdbcDao.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/AllocationItemJdbcDao.java
index 0cf97d6aa..fab61b39a 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/AllocationItemJdbcDao.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/AllocationItemJdbcDao.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.dao.jdbc;
+package org.onap.ccsdk.sli.adaptors.rm.dao.jdbc;
 
 import java.util.List;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/AllocationItemJdbcDaoImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/AllocationItemJdbcDaoImpl.java
index 38e4f1787..354dd4e0b 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/AllocationItemJdbcDaoImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/AllocationItemJdbcDaoImpl.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.dao.jdbc;
+package org.onap.ccsdk.sli.adaptors.rm.dao.jdbc;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/Resource.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/Resource.java
index d91daae99..4b0c82f92 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/Resource.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/Resource.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.dao.jdbc;
+package org.onap.ccsdk.sli.adaptors.rm.dao.jdbc;
 
 public class Resource {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/ResourceDaoImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/ResourceDaoImpl.java
index 0838c35d2..9ee3cc188 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/ResourceDaoImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/ResourceDaoImpl.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,22 +19,22 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.dao.jdbc;
+package org.onap.ccsdk.sli.adaptors.rm.dao.jdbc;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 
-import org.openecomp.sdnc.rm.dao.ResourceDao;
-import org.openecomp.sdnc.rm.data.LabelAllocationItem;
-import org.openecomp.sdnc.rm.data.LabelResource;
-import org.openecomp.sdnc.rm.data.LimitAllocationItem;
-import org.openecomp.sdnc.rm.data.LimitResource;
-import org.openecomp.sdnc.rm.data.RangeAllocationItem;
-import org.openecomp.sdnc.rm.data.RangeResource;
-import org.openecomp.sdnc.rm.data.ResourceKey;
-import org.openecomp.sdnc.rm.data.ResourceType;
-import org.openecomp.sdnc.util.str.StrUtil;
+import org.onap.ccsdk.sli.adaptors.rm.dao.ResourceDao;
+import org.onap.ccsdk.sli.adaptors.rm.data.LabelAllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.LabelResource;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitAllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitResource;
+import org.onap.ccsdk.sli.adaptors.rm.data.RangeAllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.RangeResource;
+import org.onap.ccsdk.sli.adaptors.rm.data.ResourceKey;
+import org.onap.ccsdk.sli.adaptors.rm.data.ResourceType;
+import org.onap.ccsdk.sli.adaptors.util.str.StrUtil;
 
 public class ResourceDaoImpl implements ResourceDao {
 
@@ -43,22 +43,22 @@ public class ResourceDaoImpl implements ResourceDao {
     private AllocationItemJdbcDao allocationItemJdbcDao;
 
     @Override
-    public org.openecomp.sdnc.rm.data.Resource getResource(String assetId, String resourceName) {
+    public org.onap.ccsdk.sli.adaptors.rm.data.Resource getResource(String assetId, String resourceName) {
         Resource rEntity = resourceJdbcDao.getResource(assetId, resourceName);
-        org.openecomp.sdnc.rm.data.Resource r = createResource(rEntity);
+        org.onap.ccsdk.sli.adaptors.rm.data.Resource r = createResource(rEntity);
 
         if (r != null) {
             List<AllocationItem> aiEntityList = allocationItemJdbcDao.getAllocationItems(rEntity.id);
-            r.allocationItems = new ArrayList<org.openecomp.sdnc.rm.data.AllocationItem>();
+            r.allocationItems = new ArrayList<org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem>();
             for (AllocationItem aiEntity : aiEntityList) {
-                org.openecomp.sdnc.rm.data.AllocationItem ai = createAllocationItem(r, aiEntity);
+                org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem ai = createAllocationItem(r, aiEntity);
                 r.allocationItems.add(ai);
             }
 
             List<ResourceLoad> rlEntityList = resourceLoadJdbcDao.getResourceLoads(rEntity.id);
-            r.resourceLoadList = new ArrayList<org.openecomp.sdnc.rm.data.ResourceLoad>();
+            r.resourceLoadList = new ArrayList<org.onap.ccsdk.sli.adaptors.rm.data.ResourceLoad>();
             for (ResourceLoad rlEntity : rlEntityList) {
-                org.openecomp.sdnc.rm.data.ResourceLoad rl = createResourceLoad(r, rlEntity);
+                org.onap.ccsdk.sli.adaptors.rm.data.ResourceLoad rl = createResourceLoad(r, rlEntity);
                 r.resourceLoadList.add(rl);
             }
         }
@@ -67,22 +67,22 @@ public class ResourceDaoImpl implements ResourceDao {
     }
 
     @Override
-    public void saveResource(org.openecomp.sdnc.rm.data.Resource resource) {
+    public void saveResource(org.onap.ccsdk.sli.adaptors.rm.data.Resource resource) {
         if (resource == null)
             return;
 
-        org.openecomp.sdnc.rm.dao.jdbc.Resource resourceEntity =
+        org.onap.ccsdk.sli.adaptors.rm.dao.jdbc.Resource resourceEntity =
                 resourceJdbcDao.getResource(resource.resourceKey.assetId, resource.resourceKey.resourceName);
         if (resourceEntity == null) {
             resourceEntity = createResourceEntity(resource);
             resourceJdbcDao.add(resourceEntity);
             if (resource.allocationItems != null)
-                for (org.openecomp.sdnc.rm.data.AllocationItem ai : resource.allocationItems) {
+                for (org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem ai : resource.allocationItems) {
                     AllocationItem aiEntity = createAllocationItemEntity(resourceEntity.id, ai);
                     allocationItemJdbcDao.add(aiEntity);
                 }
             if (resource.resourceLoadList != null)
-                for (org.openecomp.sdnc.rm.data.ResourceLoad rl : resource.resourceLoadList) {
+                for (org.onap.ccsdk.sli.adaptors.rm.data.ResourceLoad rl : resource.resourceLoadList) {
                     ResourceLoad rlEntity = createResourceLoadEntity(resourceEntity.id, rl);
                     resourceLoadJdbcDao.add(rlEntity);
                 }
@@ -92,7 +92,7 @@ public class ResourceDaoImpl implements ResourceDao {
 
             List<AllocationItem> oldAiEntityList = allocationItemJdbcDao.getAllocationItems(resourceEntity.id);
             if (resource.allocationItems != null)
-                for (org.openecomp.sdnc.rm.data.AllocationItem newai : resource.allocationItems) {
+                for (org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem newai : resource.allocationItems) {
                     AllocationItem foundAiEntity = null;
                     for (AllocationItem oldAiEntity : oldAiEntityList)
                         if (oldAiEntity.resourceSetId.equals(newai.resourceSetId)) {
@@ -110,7 +110,7 @@ public class ResourceDaoImpl implements ResourceDao {
             for (AllocationItem oldAiEntity : oldAiEntityList) {
                 boolean found = false;
                 if (resource.allocationItems != null)
-                    for (org.openecomp.sdnc.rm.data.AllocationItem newai : resource.allocationItems)
+                    for (org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem newai : resource.allocationItems)
                         if (oldAiEntity.resourceSetId.equals(newai.resourceSetId)) {
                             found = true;
                             break;
@@ -121,7 +121,7 @@ public class ResourceDaoImpl implements ResourceDao {
 
             List<ResourceLoad> oldRlEntityList = resourceLoadJdbcDao.getResourceLoads(resourceEntity.id);
             if (resource.resourceLoadList != null)
-                for (org.openecomp.sdnc.rm.data.ResourceLoad newrl : resource.resourceLoadList) {
+                for (org.onap.ccsdk.sli.adaptors.rm.data.ResourceLoad newrl : resource.resourceLoadList) {
                     ResourceLoad foundRlEntity = null;
                     for (ResourceLoad oldRlEntity : oldRlEntityList)
                         if (oldRlEntity.applicationId.equals(newrl.applicationId)) {
@@ -139,7 +139,7 @@ public class ResourceDaoImpl implements ResourceDao {
             for (ResourceLoad oldRlEntity : oldRlEntityList) {
                 boolean found = false;
                 if (resource.resourceLoadList != null)
-                    for (org.openecomp.sdnc.rm.data.ResourceLoad newrl : resource.resourceLoadList)
+                    for (org.onap.ccsdk.sli.adaptors.rm.data.ResourceLoad newrl : resource.resourceLoadList)
                         if (oldRlEntity.applicationId.equals(newrl.applicationId)) {
                             found = true;
                             break;
@@ -152,30 +152,30 @@ public class ResourceDaoImpl implements ResourceDao {
 
     @Override
     public void deleteResource(String assetId, String resourceName) {
-        org.openecomp.sdnc.rm.dao.jdbc.Resource resourceEntity = resourceJdbcDao.getResource(assetId, resourceName);
+        org.onap.ccsdk.sli.adaptors.rm.dao.jdbc.Resource resourceEntity = resourceJdbcDao.getResource(assetId, resourceName);
         if (resourceEntity != null)
             resourceJdbcDao.delete(resourceEntity.id);
     }
 
     @Override
-    public List<org.openecomp.sdnc.rm.data.Resource> getResourceSet(String resourceSetId) {
+    public List<org.onap.ccsdk.sli.adaptors.rm.data.Resource> getResourceSet(String resourceSetId) {
         List<Resource> rEntityList = resourceJdbcDao.getResourceSet(resourceSetId);
-        List<org.openecomp.sdnc.rm.data.Resource> rlist = new ArrayList<org.openecomp.sdnc.rm.data.Resource>();
+        List<org.onap.ccsdk.sli.adaptors.rm.data.Resource> rlist = new ArrayList<org.onap.ccsdk.sli.adaptors.rm.data.Resource>();
         for (Resource rEntity : rEntityList) {
-            org.openecomp.sdnc.rm.data.Resource r = createResource(rEntity);
+            org.onap.ccsdk.sli.adaptors.rm.data.Resource r = createResource(rEntity);
             rlist.add(r);
 
             List<AllocationItem> aiEntityList = allocationItemJdbcDao.getAllocationItems(rEntity.id);
-            r.allocationItems = new ArrayList<org.openecomp.sdnc.rm.data.AllocationItem>();
+            r.allocationItems = new ArrayList<org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem>();
             for (AllocationItem aiEntity : aiEntityList) {
-                org.openecomp.sdnc.rm.data.AllocationItem ai = createAllocationItem(r, aiEntity);
+                org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem ai = createAllocationItem(r, aiEntity);
                 r.allocationItems.add(ai);
             }
 
             List<ResourceLoad> rlEntityList = resourceLoadJdbcDao.getResourceLoads(rEntity.id);
-            r.resourceLoadList = new ArrayList<org.openecomp.sdnc.rm.data.ResourceLoad>();
+            r.resourceLoadList = new ArrayList<org.onap.ccsdk.sli.adaptors.rm.data.ResourceLoad>();
             for (ResourceLoad rlEntity : rlEntityList) {
-                org.openecomp.sdnc.rm.data.ResourceLoad rl = createResourceLoad(r, rlEntity);
+                org.onap.ccsdk.sli.adaptors.rm.data.ResourceLoad rl = createResourceLoad(r, rlEntity);
                 r.resourceLoadList.add(rl);
             }
         }
@@ -183,31 +183,31 @@ public class ResourceDaoImpl implements ResourceDao {
     }
 
     @Override
-    public List<org.openecomp.sdnc.rm.data.Resource> getResourceUnion(String resourceUnionId) {
+    public List<org.onap.ccsdk.sli.adaptors.rm.data.Resource> getResourceUnion(String resourceUnionId) {
         List<Resource> rEntityList = resourceJdbcDao.getResourceUnion(resourceUnionId);
-        List<org.openecomp.sdnc.rm.data.Resource> rlist = new ArrayList<org.openecomp.sdnc.rm.data.Resource>();
+        List<org.onap.ccsdk.sli.adaptors.rm.data.Resource> rlist = new ArrayList<org.onap.ccsdk.sli.adaptors.rm.data.Resource>();
         for (Resource rEntity : rEntityList) {
-            org.openecomp.sdnc.rm.data.Resource r = createResource(rEntity);
+            org.onap.ccsdk.sli.adaptors.rm.data.Resource r = createResource(rEntity);
             rlist.add(r);
 
             List<AllocationItem> aiEntityList = allocationItemJdbcDao.getAllocationItems(rEntity.id);
-            r.allocationItems = new ArrayList<org.openecomp.sdnc.rm.data.AllocationItem>();
+            r.allocationItems = new ArrayList<org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem>();
             for (AllocationItem aiEntity : aiEntityList) {
-                org.openecomp.sdnc.rm.data.AllocationItem ai = createAllocationItem(r, aiEntity);
+                org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem ai = createAllocationItem(r, aiEntity);
                 r.allocationItems.add(ai);
             }
 
             List<ResourceLoad> rlEntityList = resourceLoadJdbcDao.getResourceLoads(rEntity.id);
-            r.resourceLoadList = new ArrayList<org.openecomp.sdnc.rm.data.ResourceLoad>();
+            r.resourceLoadList = new ArrayList<org.onap.ccsdk.sli.adaptors.rm.data.ResourceLoad>();
             for (ResourceLoad rlEntity : rlEntityList) {
-                org.openecomp.sdnc.rm.data.ResourceLoad rl = createResourceLoad(r, rlEntity);
+                org.onap.ccsdk.sli.adaptors.rm.data.ResourceLoad rl = createResourceLoad(r, rlEntity);
                 r.resourceLoadList.add(rl);
             }
         }
         return rlist;
     }
 
-    private Resource createResourceEntity(org.openecomp.sdnc.rm.data.Resource resource) {
+    private Resource createResourceEntity(org.onap.ccsdk.sli.adaptors.rm.data.Resource resource) {
         Resource resourceEntity = new Resource();
         resourceEntity.assetId = resource.resourceKey.assetId;
         resourceEntity.name = resource.resourceKey.resourceName;
@@ -223,7 +223,7 @@ public class ResourceDaoImpl implements ResourceDao {
         return resourceEntity;
     }
 
-    private ResourceLoad createResourceLoadEntity(long resourceId, org.openecomp.sdnc.rm.data.ResourceLoad rl) {
+    private ResourceLoad createResourceLoadEntity(long resourceId, org.onap.ccsdk.sli.adaptors.rm.data.ResourceLoad rl) {
         ResourceLoad rlEntity = new ResourceLoad();
         rlEntity.resourceId = resourceId;
         rlEntity.applicationId = rl.applicationId;
@@ -232,12 +232,12 @@ public class ResourceDaoImpl implements ResourceDao {
         return rlEntity;
     }
 
-    private void updateResourceLoadEntity(ResourceLoad rlEntity, org.openecomp.sdnc.rm.data.ResourceLoad rl) {
+    private void updateResourceLoadEntity(ResourceLoad rlEntity, org.onap.ccsdk.sli.adaptors.rm.data.ResourceLoad rl) {
         rlEntity.loadTime = rl.resourceLoadTime;
         rlEntity.expirationTime = rl.resourceExpirationTime;
     }
 
-    private AllocationItem createAllocationItemEntity(long resourceId, org.openecomp.sdnc.rm.data.AllocationItem ai) {
+    private AllocationItem createAllocationItemEntity(long resourceId, org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem ai) {
         AllocationItem aiEntity = new AllocationItem();
         aiEntity.resourceId = resourceId;
         aiEntity.resourceSetId = ai.resourceSetId;
@@ -254,7 +254,7 @@ public class ResourceDaoImpl implements ResourceDao {
         return aiEntity;
     }
 
-    private void updateAllocationItemEntity(AllocationItem aiEntity, org.openecomp.sdnc.rm.data.AllocationItem ai) {
+    private void updateAllocationItemEntity(AllocationItem aiEntity, org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem ai) {
         aiEntity.resourceShareGroupList = StrUtil.listStr(ai.resourceShareGroupList);
         aiEntity.allocationTime = ai.allocationTime;
         if (ai.resourceType == ResourceType.Limit)
@@ -265,7 +265,7 @@ public class ResourceDaoImpl implements ResourceDao {
             aiEntity.rrUsed = StrUtil.listInt(((RangeAllocationItem) ai).used);
     }
 
-    private void updateResourceEntity(Resource resourceEntity, org.openecomp.sdnc.rm.data.Resource resource) {
+    private void updateResourceEntity(Resource resourceEntity, org.onap.ccsdk.sli.adaptors.rm.data.Resource resource) {
         if (resource.resourceType == ResourceType.Limit)
             resourceEntity.ltUsed = ((LimitResource) resource).used;
         else if (resource.resourceType == ResourceType.Label) {
@@ -275,11 +275,11 @@ public class ResourceDaoImpl implements ResourceDao {
             resourceEntity.rrUsed = StrUtil.listInt(((RangeResource) resource).used);
     }
 
-    private org.openecomp.sdnc.rm.data.Resource createResource(Resource resourceEntity) {
+    private org.onap.ccsdk.sli.adaptors.rm.data.Resource createResource(Resource resourceEntity) {
         if (resourceEntity == null)
             return null;
 
-        org.openecomp.sdnc.rm.data.Resource r = null;
+        org.onap.ccsdk.sli.adaptors.rm.data.Resource r = null;
         ResourceType type = ResourceType.valueOf(resourceEntity.type);
         if (type == ResourceType.Limit) {
             LimitResource l = new LimitResource();
@@ -306,13 +306,13 @@ public class ResourceDaoImpl implements ResourceDao {
         return r;
     }
 
-    private org.openecomp.sdnc.rm.data.AllocationItem createAllocationItem(
-            org.openecomp.sdnc.rm.data.Resource r,
+    private org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem createAllocationItem(
+            org.onap.ccsdk.sli.adaptors.rm.data.Resource r,
             AllocationItem aiEntity) {
         if (r == null || aiEntity == null)
             return null;
 
-        org.openecomp.sdnc.rm.data.AllocationItem ai = null;
+        org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem ai = null;
         if (r.resourceType == ResourceType.Limit) {
             LimitAllocationItem lai = new LimitAllocationItem();
             lai.used = aiEntity.ltUsed;
@@ -341,13 +341,13 @@ public class ResourceDaoImpl implements ResourceDao {
         return ai;
     }
 
-    private org.openecomp.sdnc.rm.data.ResourceLoad createResourceLoad(
-            org.openecomp.sdnc.rm.data.Resource r,
+    private org.onap.ccsdk.sli.adaptors.rm.data.ResourceLoad createResourceLoad(
+            org.onap.ccsdk.sli.adaptors.rm.data.Resource r,
             ResourceLoad rlEntity) {
         if (rlEntity == null)
             return null;
 
-        org.openecomp.sdnc.rm.data.ResourceLoad rl = new org.openecomp.sdnc.rm.data.ResourceLoad();
+        org.onap.ccsdk.sli.adaptors.rm.data.ResourceLoad rl = new org.onap.ccsdk.sli.adaptors.rm.data.ResourceLoad();
         rl.resourceKey = r.resourceKey;
         rl.applicationId = rlEntity.applicationId;
         rl.resourceLoadTime = rlEntity.loadTime;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/ResourceJdbcDao.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/ResourceJdbcDao.java
index d7e90bf64..b32f34082 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/ResourceJdbcDao.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/ResourceJdbcDao.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.dao.jdbc;
+package org.onap.ccsdk.sli.adaptors.rm.dao.jdbc;
 
 import java.util.List;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/ResourceJdbcDaoImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/ResourceJdbcDaoImpl.java
index 69f23e95b..6d4455e7e 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/ResourceJdbcDaoImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/ResourceJdbcDaoImpl.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.dao.jdbc;
+package org.onap.ccsdk.sli.adaptors.rm.dao.jdbc;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/ResourceLoad.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/ResourceLoad.java
index a3d5cce98..0f45bbfcb 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/ResourceLoad.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/ResourceLoad.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.dao.jdbc;
+package org.onap.ccsdk.sli.adaptors.rm.dao.jdbc;
 
 import java.util.Date;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/ResourceLoadJdbcDao.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/ResourceLoadJdbcDao.java
index 9630fd3ef..789670c4b 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/ResourceLoadJdbcDao.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/ResourceLoadJdbcDao.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.dao.jdbc;
+package org.onap.ccsdk.sli.adaptors.rm.dao.jdbc;
 
 import java.util.List;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/ResourceLoadJdbcDaoImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/ResourceLoadJdbcDaoImpl.java
index b697053c3..632a5fbec 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/dao/jdbc/ResourceLoadJdbcDaoImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/ResourceLoadJdbcDaoImpl.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.dao.jdbc;
+package org.onap.ccsdk.sli.adaptors.rm.dao.jdbc;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/AllocationAction.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/AllocationAction.java
index be6e69487..edc1916b5 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/AllocationAction.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/AllocationAction.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 public enum AllocationAction {
     Fail, Succeed_DoNothing, Succeed_Allocate
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/AllocationItem.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/AllocationItem.java
index 522a9bd38..f8e6a75a1 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/AllocationItem.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/AllocationItem.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 import java.util.Date;
 import java.util.Set;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/AllocationOutcome.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/AllocationOutcome.java
index 4e78a99f7..048f4f4ac 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/AllocationOutcome.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/AllocationOutcome.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 public class AllocationOutcome {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/AllocationRequest.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/AllocationRequest.java
index b6fef4b95..25a4fbba9 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/AllocationRequest.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/AllocationRequest.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 import java.util.Set;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/AllocationStatus.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/AllocationStatus.java
index ffdfb2248..bef9a1114 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/AllocationStatus.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/AllocationStatus.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 public enum AllocationStatus {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/InitAction.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/InitAction.java
index ccf843547..f6fc7c9b3 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/InitAction.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/InitAction.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 public enum InitAction {
     CheckInit("Initialize if needed"), ForceInit("Always Initialize"), NoInit("No initialization");
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/LabelAllocationItem.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/LabelAllocationItem.java
index 61c8f141e..d41bfd62a 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/LabelAllocationItem.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/LabelAllocationItem.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 public class LabelAllocationItem extends AllocationItem {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/LabelAllocationOutcome.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/LabelAllocationOutcome.java
index da21cd22d..9c9f9145d 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/LabelAllocationOutcome.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/LabelAllocationOutcome.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 public class LabelAllocationOutcome extends AllocationOutcome {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/LabelAllocationRequest.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/LabelAllocationRequest.java
index b5f079005..97751fc01 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/LabelAllocationRequest.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/LabelAllocationRequest.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 public class LabelAllocationRequest extends AllocationRequest {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/LabelResource.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/LabelResource.java
index 2e7a7979d..d09dba267 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/LabelResource.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/LabelResource.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 public class LabelResource extends Resource {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/LimitAllocationItem.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/LimitAllocationItem.java
index 5c2ffc0b4..ad1674f7b 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/LimitAllocationItem.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/LimitAllocationItem.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 public class LimitAllocationItem extends AllocationItem {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/LimitAllocationOutcome.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/LimitAllocationOutcome.java
index ee265c487..d635e3605 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/LimitAllocationOutcome.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/LimitAllocationOutcome.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 public class LimitAllocationOutcome extends AllocationOutcome {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/LimitAllocationRequest.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/LimitAllocationRequest.java
index 213283002..06c0e8393 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/LimitAllocationRequest.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/LimitAllocationRequest.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 public class LimitAllocationRequest extends AllocationRequest {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/LimitResource.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/LimitResource.java
index 4aa973f14..2fd9b6cae 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/LimitResource.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/LimitResource.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 public class LimitResource extends Resource {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/MultiAssetAllocationOutcome.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/MultiAssetAllocationOutcome.java
index f7a2b949c..2d7b11c31 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/MultiAssetAllocationOutcome.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/MultiAssetAllocationOutcome.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 import java.util.List;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/MultiAssetAllocationRequest.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/MultiAssetAllocationRequest.java
index 47f04a957..366201f35 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/MultiAssetAllocationRequest.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/MultiAssetAllocationRequest.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 import java.util.List;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/MultiResourceAllocationOutcome.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/MultiResourceAllocationOutcome.java
index b8ebc29d3..f71c247da 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/MultiResourceAllocationOutcome.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/MultiResourceAllocationOutcome.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 import java.util.List;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/MultiResourceAllocationRequest.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/MultiResourceAllocationRequest.java
index 60fc2da60..3244c2340 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/MultiResourceAllocationRequest.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/MultiResourceAllocationRequest.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 import java.util.List;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/RangeAllocationItem.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/RangeAllocationItem.java
index eb0d84164..8e62ef653 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/RangeAllocationItem.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/RangeAllocationItem.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 import java.util.SortedSet;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/RangeAllocationOutcome.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/RangeAllocationOutcome.java
index 943c09bfc..3b675c221 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/RangeAllocationOutcome.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/RangeAllocationOutcome.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 import java.util.SortedSet;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/RangeAllocationRequest.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/RangeAllocationRequest.java
index 83fdef898..b42960d9d 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/RangeAllocationRequest.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/RangeAllocationRequest.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 import java.util.SortedSet;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/RangeResource.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/RangeResource.java
index e2f61e7d9..c39cb37ea 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/RangeResource.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/RangeResource.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 import java.util.SortedSet;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/Resource.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/Resource.java
index 0ab656264..59706f4d5 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/Resource.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/Resource.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 import java.util.Collection;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/ResourceKey.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/ResourceKey.java
index c6f3b7281..b1f8d5910 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/ResourceKey.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/ResourceKey.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 public class ResourceKey {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/ResourceLoad.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/ResourceLoad.java
index cea781bcd..1ff1962af 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/ResourceLoad.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/ResourceLoad.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 import java.util.Date;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/ResourceType.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/ResourceType.java
index 6f66830ee..60896e492 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/data/ResourceType.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/data/ResourceType.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.data;
+package org.onap.ccsdk.sli.adaptors.rm.data;
 
 public enum ResourceType {
     Limit, Label, Range
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/util/LabelUtil.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/util/LabelUtil.java
index 16344e7e6..7cc541dd7 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/util/LabelUtil.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/util/LabelUtil.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,17 +19,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.util;
+package org.onap.ccsdk.sli.adaptors.rm.util;
 
 import java.util.ArrayList;
 import java.util.Date;
 
-import org.openecomp.sdnc.rm.data.AllocationItem;
-import org.openecomp.sdnc.rm.data.LabelAllocationItem;
-import org.openecomp.sdnc.rm.data.LabelAllocationRequest;
-import org.openecomp.sdnc.rm.data.LabelResource;
-import org.openecomp.sdnc.rm.data.ResourceKey;
-import org.openecomp.sdnc.rm.data.ResourceType;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.LabelAllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.LabelAllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.LabelResource;
+import org.onap.ccsdk.sli.adaptors.rm.data.ResourceKey;
+import org.onap.ccsdk.sli.adaptors.rm.data.ResourceType;
 
 public class LabelUtil {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/util/LimitUtil.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/util/LimitUtil.java
index a34ab0ecd..8f284b595 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/util/LimitUtil.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/util/LimitUtil.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.util;
+package org.onap.ccsdk.sli.adaptors.rm.util;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -28,12 +28,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.openecomp.sdnc.rm.data.AllocationItem;
-import org.openecomp.sdnc.rm.data.LimitAllocationItem;
-import org.openecomp.sdnc.rm.data.LimitAllocationRequest;
-import org.openecomp.sdnc.rm.data.LimitResource;
-import org.openecomp.sdnc.rm.data.ResourceKey;
-import org.openecomp.sdnc.rm.data.ResourceType;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitAllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitAllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitResource;
+import org.onap.ccsdk.sli.adaptors.rm.data.ResourceKey;
+import org.onap.ccsdk.sli.adaptors.rm.data.ResourceType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/util/RangeUtil.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/util/RangeUtil.java
index 076e4cc80..f01d35784 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/util/RangeUtil.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/util/RangeUtil.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,19 +19,19 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.util;
+package org.onap.ccsdk.sli.adaptors.rm.util;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.openecomp.sdnc.rm.data.AllocationItem;
-import org.openecomp.sdnc.rm.data.RangeAllocationItem;
-import org.openecomp.sdnc.rm.data.RangeAllocationRequest;
-import org.openecomp.sdnc.rm.data.RangeResource;
-import org.openecomp.sdnc.rm.data.ResourceKey;
-import org.openecomp.sdnc.rm.data.ResourceType;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.RangeAllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.RangeAllocationRequest;
+import org.onap.ccsdk.sli.adaptors.rm.data.RangeResource;
+import org.onap.ccsdk.sli.adaptors.rm.data.ResourceKey;
+import org.onap.ccsdk.sli.adaptors.rm.data.ResourceType;
 
 public class RangeUtil {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/util/ResourceUtil.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/util/ResourceUtil.java
index 9ef78eea7..ae7c21575 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/rm/util/ResourceUtil.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/util/ResourceUtil.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,13 +19,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.rm.util;
+package org.onap.ccsdk.sli.adaptors.rm.util;
 
-import org.openecomp.sdnc.rm.data.AllocationItem;
-import org.openecomp.sdnc.rm.data.LabelResource;
-import org.openecomp.sdnc.rm.data.LimitResource;
-import org.openecomp.sdnc.rm.data.Resource;
-import org.openecomp.sdnc.rm.data.ResourceType;
+import org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem;
+import org.onap.ccsdk.sli.adaptors.rm.data.LabelResource;
+import org.onap.ccsdk.sli.adaptors.rm.data.LimitResource;
+import org.onap.ccsdk.sli.adaptors.rm.data.Resource;
+import org.onap.ccsdk.sli.adaptors.rm.data.ResourceType;
 
 public class ResourceUtil {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/util/db/CachedDataSourceWrap.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/db/CachedDataSourceWrap.java
index 252e37700..0e46868bc 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/util/db/CachedDataSourceWrap.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/db/CachedDataSourceWrap.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.util.db;
+package org.onap.ccsdk.sli.adaptors.util.db;
 
 import java.io.PrintWriter;
 import java.sql.Connection;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/util/db/ConnectionWrap.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/db/ConnectionWrap.java
index 21a0c80d4..7d2554806 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/util/db/ConnectionWrap.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/db/ConnectionWrap.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.util.db;
+package org.onap.ccsdk.sli.adaptors.util.db;
 
 import java.sql.Array;
 import java.sql.Blob;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/util/db/DataSourceWrap.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/db/DataSourceWrap.java
index 40af34bdc..2aebb83e3 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/util/db/DataSourceWrap.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/db/DataSourceWrap.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.util.db;
+package org.onap.ccsdk.sli.adaptors.util.db;
 
 import java.io.PrintWriter;
 import java.sql.Connection;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/util/expr/ExpressionEvaluator.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/expr/ExpressionEvaluator.java
index 83cc77490..037b78b77 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/util/expr/ExpressionEvaluator.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/expr/ExpressionEvaluator.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.util.expr;
+package org.onap.ccsdk.sli.adaptors.util.expr;
 
 import java.util.Map;
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/util/speed/SpeedUtil.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/speed/SpeedUtil.java
index 4a26d8c43..1aad8f501 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/util/speed/SpeedUtil.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/speed/SpeedUtil.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.util.speed;
+package org.onap.ccsdk.sli.adaptors.util.speed;
 
 public class SpeedUtil {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/util/str/StrUtil.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/str/StrUtil.java
index fdc3892af..ef889f0d5 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/util/str/StrUtil.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/str/StrUtil.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.util.str;
+package org.onap.ccsdk.sli.adaptors.util.str;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/util/vrf/VpnParam.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/vrf/VpnParam.java
index 4e262ba9b..11e64ae1a 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/util/vrf/VpnParam.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/vrf/VpnParam.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.util.vrf;
+package org.onap.ccsdk.sli.adaptors.util.vrf;
 
 public class VpnParam {
 
diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/util/vrf/VrfUtil.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/vrf/VrfUtil.java
index 4060935ae..74025f15b 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/util/vrf/VrfUtil.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/vrf/VrfUtil.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdnc.util.vrf;
+package org.onap.ccsdk.sli.adaptors.util.vrf;
 
 public class VrfUtil {
 
diff --git a/resource-assignment/provider/src/main/resources/META-INF/spring/resource-assignment-context.xml b/resource-assignment/provider/src/main/resources/META-INF/spring/resource-assignment-context.xml
index 5dfb08838..473173e76 100644
--- a/resource-assignment/provider/src/main/resources/META-INF/spring/resource-assignment-context.xml
+++ b/resource-assignment/provider/src/main/resources/META-INF/spring/resource-assignment-context.xml
@@ -4,7 +4,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-  			reserved.
+                          reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -27,11 +27,11 @@
 
     <!-- JDBC setup -->
 
-    <bean id="rm.dataSource" class="org.openecomp.sdnc.util.db.DataSourceWrap">
+    <bean id="rm.dataSource" class="org.onap.ccsdk.sli.adaptors.util.db.DataSourceWrap">
         <property name="dataSource" ref="dblib.dataSource" />
     </bean>
 
-    <bean id="lock.dataSource" class="org.openecomp.sdnc.util.db.CachedDataSourceWrap">
+    <bean id="lock.dataSource" class="org.onap.ccsdk.sli.adaptors.util.db.CachedDataSourceWrap">
         <property name="dataSource" ref="rm.dataSource" />
     </bean>
 
@@ -45,17 +45,17 @@
 
     <!-- Utils Configuration -->
 
-    <bean id="speedUtil" class="org.openecomp.sdnc.util.speed.SpeedUtil">
+    <bean id="speedUtil" class="org.onap.ccsdk.sli.adaptors.util.speed.SpeedUtil">
         <property name="unitFactor" value="1000" />
     </bean>
 
     <!-- Resource Lock Configuration -->
 
-    <bean id="resourceLockDao" class="org.openecomp.sdnc.lock.dao.ResourceLockDaoImpl">
+    <bean id="resourceLockDao" class="org.onap.ccsdk.sli.adaptors.lock.dao.ResourceLockDaoImpl">
         <property name="jdbcTemplate" ref="lock.jdbcTemplate" />
     </bean>
 
-    <bean id="lockHelper" class="org.openecomp.sdnc.lock.comp.LockHelperImpl">
+    <bean id="lockHelper" class="org.onap.ccsdk.sli.adaptors.lock.comp.LockHelperImpl">
         <property name="resourceLockDao" ref="resourceLockDao" />
         <property name="retryCount" value="10" />
         <property name="lockWait" value="5" /> <!-- Seconds -->
@@ -63,25 +63,25 @@
 
     <!-- RM Configuration -->
 
-    <bean id="resourceJdbcDao" class="org.openecomp.sdnc.rm.dao.jdbc.ResourceJdbcDaoImpl">
+    <bean id="resourceJdbcDao" class="org.onap.ccsdk.sli.adaptors.rm.dao.jdbc.ResourceJdbcDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
-    <bean id="allocationItemJdbcDao" class="org.openecomp.sdnc.rm.dao.jdbc.AllocationItemJdbcDaoImpl">
+    <bean id="allocationItemJdbcDao" class="org.onap.ccsdk.sli.adaptors.rm.dao.jdbc.AllocationItemJdbcDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
-    <bean id="resourceLoadJdbcDao" class="org.openecomp.sdnc.rm.dao.jdbc.ResourceLoadJdbcDaoImpl">
+    <bean id="resourceLoadJdbcDao" class="org.onap.ccsdk.sli.adaptors.rm.dao.jdbc.ResourceLoadJdbcDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
-    <bean id="resourceDao" class="org.openecomp.sdnc.rm.dao.jdbc.ResourceDaoImpl">
+    <bean id="resourceDao" class="org.onap.ccsdk.sli.adaptors.rm.dao.jdbc.ResourceDaoImpl">
         <property name="resourceJdbcDao" ref="resourceJdbcDao" />
         <property name="allocationItemJdbcDao" ref="allocationItemJdbcDao" />
         <property name="resourceLoadJdbcDao" ref="resourceLoadJdbcDao" />
     </bean>
 
-    <bean id="resourceManager" class="org.openecomp.sdnc.rm.comp.ResourceManagerImpl">
+    <bean id="resourceManager" class="org.onap.ccsdk.sli.adaptors.rm.comp.ResourceManagerImpl">
         <property name="lockHelper" ref="lockHelper" />
         <property name="resourceDao" ref="resourceDao" />
         <property name="applicationId" value="SDNC" />
@@ -90,61 +90,61 @@
 
     <!-- Equipment DAO Configuration -->
 
-    <bean id="serverDao" class="org.openecomp.sdnc.ra.equip.dao.ServerDaoImpl">
+    <bean id="serverDao" class="org.onap.ccsdk.sli.adaptors.ra.equip.dao.ServerDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
-    <bean id="vpePortDao" class="org.openecomp.sdnc.ra.equip.dao.VpePortDaoImpl">
+    <bean id="vpePortDao" class="org.onap.ccsdk.sli.adaptors.ra.equip.dao.VpePortDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
-    <bean id="vplspePortDao" class="org.openecomp.sdnc.ra.equip.dao.VplspePortDaoImpl">
+    <bean id="vplspePortDao" class="org.onap.ccsdk.sli.adaptors.ra.equip.dao.VplspePortDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
     <!-- Rule DAO Configuration -->
 
-    <bean id="parameterDao" class="org.openecomp.sdnc.ra.rule.dao.ParameterDaoImpl">
+    <bean id="parameterDao" class="org.onap.ccsdk.sli.adaptors.ra.rule.dao.ParameterDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
-    <bean id="maxPortSpeedDao" class="org.openecomp.sdnc.ra.rule.dao.MaxPortSpeedDaoImpl">
+    <bean id="maxPortSpeedDao" class="org.onap.ccsdk.sli.adaptors.ra.rule.dao.MaxPortSpeedDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
         <property name="speedUtil" ref="speedUtil" />
     </bean>
 
-    <bean id="maxServerSpeedDao" class="org.openecomp.sdnc.ra.rule.dao.MaxServerSpeedDaoImpl">
+    <bean id="maxServerSpeedDao" class="org.onap.ccsdk.sli.adaptors.ra.rule.dao.MaxServerSpeedDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
         <property name="speedUtil" ref="speedUtil" />
     </bean>
 
-    <bean id="resourceRuleDao" class="org.openecomp.sdnc.ra.rule.dao.ResourceRuleDaoImpl">
+    <bean id="resourceRuleDao" class="org.onap.ccsdk.sli.adaptors.ra.rule.dao.ResourceRuleDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
-    <bean id="rangeRuleDao" class="org.openecomp.sdnc.ra.rule.dao.RangeRuleDaoImpl">
+    <bean id="rangeRuleDao" class="org.onap.ccsdk.sli.adaptors.ra.rule.dao.RangeRuleDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
-    <bean id="vpeLockDao" class="org.openecomp.sdnc.ra.rule.dao.VpeLockDaoImpl">
+    <bean id="vpeLockDao" class="org.onap.ccsdk.sli.adaptors.ra.rule.dao.VpeLockDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
     <!-- Service DAO Configuration -->
 
-    <bean id="serviceResourceDao" class="org.openecomp.sdnc.ra.service.dao.ServiceResourceDaoImpl">
+    <bean id="serviceResourceDao" class="org.onap.ccsdk.sli.adaptors.ra.service.dao.ServiceResourceDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
     <!-- ResourceAllocator Configuration -->
 
     <bean id="allocationRequestBuilder"
-        class="org.openecomp.sdnc.ra.rule.comp.AllocationRequestBuilderImpl">
+        class="org.onap.ccsdk.sli.adaptors.ra.rule.comp.AllocationRequestBuilderImpl">
         <property name="resourceRuleDao" ref="resourceRuleDao" />
         <property name="rangeRuleDao" ref="rangeRuleDao" />
     </bean>
 
-    <bean id="resourceAllocator" class="org.openecomp.sdnc.ra.ResourceAllocator">
+    <bean id="resourceAllocator" class="org.onap.ccsdk.sli.adaptors.ra.ResourceAllocator">
         <property name="speedUtil" ref="speedUtil" />
         <property name="parameterDao" ref="parameterDao" />
         <property name="serverDao" ref="serverDao" />
@@ -160,13 +160,13 @@
 
     <!-- EndPointAllocator Configuration -->
 
-    <bean id="endPointAllocator" class="org.openecomp.sdnc.ra.comp.EndPointAllocatorImpl">
+    <bean id="endPointAllocator" class="org.onap.ccsdk.sli.adaptors.ra.comp.EndPointAllocatorImpl">
         <property name="resourceManager" ref="resourceManager" />
         <property name="endPointAllocationDefinitionMap">
             <map>
                 <entry key="L3AVPN-PORT">
                     <list>
-                        <bean class="org.openecomp.sdnc.ra.comp.EndPointAllocationDefinition">
+                        <bean class="org.onap.ccsdk.sli.adaptors.ra.comp.EndPointAllocationDefinition">
                             <property name="serviceModel" value="L3AVPN-PORT" />
                             <property name="endPointPosition" value="VPE-Cust" />
                             <property name="equipmentReader" ref="vpePortReader" />
@@ -193,7 +193,7 @@
                 </entry>
                 <entry key="L3AVPN-EVC">
                     <list>
-                        <bean class="org.openecomp.sdnc.ra.comp.EndPointAllocationDefinition">
+                        <bean class="org.onap.ccsdk.sli.adaptors.ra.comp.EndPointAllocationDefinition">
                             <property name="serviceModel" value="L3AVPN-EVC" />
                             <property name="endPointPosition" value="VPE-Cust" />
                             <property name="equipmentReader" ref="vpePortReader" />
@@ -230,67 +230,67 @@
 
     <!-- Equipment Readers Configuration -->
 
-    <bean id="vpePortReader" class="org.openecomp.sdnc.ra.reader.VpePortReader">
+    <bean id="vpePortReader" class="org.onap.ccsdk.sli.adaptors.ra.reader.VpePortReader">
         <property name="vpePortDao" ref="vpePortDao" />
     </bean>
 
-    <bean id="vnfReader" class="org.openecomp.sdnc.ra.reader.VnfReader">
+    <bean id="vnfReader" class="org.onap.ccsdk.sli.adaptors.ra.reader.VnfReader">
     </bean>
 
-    <bean id="aicSiteReader" class="org.openecomp.sdnc.ra.reader.AicSiteReader">
+    <bean id="aicSiteReader" class="org.onap.ccsdk.sli.adaptors.ra.reader.AicSiteReader">
     </bean>
 
-    <bean id="uplinkCircuitReader" class="org.openecomp.sdnc.ra.reader.UplinkCircuitReader">
+    <bean id="uplinkCircuitReader" class="org.onap.ccsdk.sli.adaptors.ra.reader.UplinkCircuitReader">
     </bean>
 
     <!-- Equipment Checks Configuration -->
 
-    <bean id="vlanSpeedCheck" class="org.openecomp.sdnc.ra.check.VlanSpeedCheck">
+    <bean id="vlanSpeedCheck" class="org.onap.ccsdk.sli.adaptors.ra.check.VlanSpeedCheck">
     </bean>
 
-    <bean id="provStatusCheck" class="org.openecomp.sdnc.ra.check.ProvStatusCheck">
+    <bean id="provStatusCheck" class="org.onap.ccsdk.sli.adaptors.ra.check.ProvStatusCheck">
     </bean>
 
-    <bean id="excludeVpeCheck" class="org.openecomp.sdnc.ra.check.ExcludeVpeCheck">
+    <bean id="excludeVpeCheck" class="org.onap.ccsdk.sli.adaptors.ra.check.ExcludeVpeCheck">
     </bean>
 
-    <bean id="vpeLockCheck" class="org.openecomp.sdnc.ra.check.VpeLockCheck">
+    <bean id="vpeLockCheck" class="org.onap.ccsdk.sli.adaptors.ra.check.VpeLockCheck">
         <property name="vpeLockDao" ref="vpeLockDao" />
         <property name="resourceManager" ref="resourceManager" />
     </bean>
 
-    <bean id="anyVrfPresentCheck" class="org.openecomp.sdnc.ra.check.AnyVrfPresentCheck">
+    <bean id="anyVrfPresentCheck" class="org.onap.ccsdk.sli.adaptors.ra.check.AnyVrfPresentCheck">
         <property name="resourceManager" ref="resourceManager" />
     </bean>
 
-    <bean id="oneMVrfCheck" class="org.openecomp.sdnc.ra.check.OneMVrfCheck">
+    <bean id="oneMVrfCheck" class="org.onap.ccsdk.sli.adaptors.ra.check.OneMVrfCheck">
         <property name="resourceManager" ref="resourceManager" />
     </bean>
 
-    <bean id="hubWithRgCheck" class="org.openecomp.sdnc.ra.check.HubWithRgCheck">
+    <bean id="hubWithRgCheck" class="org.onap.ccsdk.sli.adaptors.ra.check.HubWithRgCheck">
         <property name="resourceManager" ref="resourceManager" />
     </bean>
 
     <!-- Preference Rule Configuration -->
 
-    <bean id="affinityLinkPref" class="org.openecomp.sdnc.ra.pref.AffinityLinkPref">
+    <bean id="affinityLinkPref" class="org.onap.ccsdk.sli.adaptors.ra.pref.AffinityLinkPref">
         <property name="resourceManager" ref="resourceManager" />
     </bean>
 
     <!-- Resource Allocation Rule Configuration -->
 
-    <bean id="dbAllocationRule" class="org.openecomp.sdnc.ra.alloc.DbAllocationRule">
+    <bean id="dbAllocationRule" class="org.onap.ccsdk.sli.adaptors.ra.alloc.DbAllocationRule">
         <property name="resourceRuleDao" ref="resourceRuleDao" />
         <property name="rangeRuleDao" ref="rangeRuleDao" />
     </bean>
 
-    <bean id="vrfAllocationRule" class="org.openecomp.sdnc.ra.alloc.VrfAllocationRule">
+    <bean id="vrfAllocationRule" class="org.onap.ccsdk.sli.adaptors.ra.alloc.VrfAllocationRule">
     </bean>
 
-    <bean id="servingSiteAllocationRule" class="org.openecomp.sdnc.ra.alloc.ServingSiteAllocationRule">
+    <bean id="servingSiteAllocationRule" class="org.onap.ccsdk.sli.adaptors.ra.alloc.ServingSiteAllocationRule">
     </bean>
 
-    <bean id="affinityAllocationRule" class="org.openecomp.sdnc.ra.alloc.AffinityAllocationRule">
+    <bean id="affinityAllocationRule" class="org.onap.ccsdk.sli.adaptors.ra.alloc.AffinityAllocationRule">
     </bean>
 
 </beans>
diff --git a/resource-assignment/provider/src/main/resources/META-INF/spring/resource-assignment-osgi-context.xml b/resource-assignment/provider/src/main/resources/META-INF/spring/resource-assignment-osgi-context.xml
index 591e5b88e..7fe544378 100644
--- a/resource-assignment/provider/src/main/resources/META-INF/spring/resource-assignment-osgi-context.xml
+++ b/resource-assignment/provider/src/main/resources/META-INF/spring/resource-assignment-osgi-context.xml
@@ -4,7 +4,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-  			reserved.
+                          reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -30,10 +30,10 @@
     <reference id="dblib.dataSource">
         <interfaces>
             <beans:value>javax.sql.DataSource</beans:value>
-            <beans:value>org.openecomp.sdnc.sli.resource.dblib.DbLibService</beans:value>
+            <beans:value>org.onap.ccsdk.sli.adaptors.resource.dblib.DbLibService</beans:value>
         </interfaces>
     </reference>
 
-    <service ref="resourceAllocator" interface="org.openecomp.sdnc.ra.ResourceAllocator" />
+    <service ref="resourceAllocator" interface="org.onap.ccsdk.sli.adaptors.ra.ResourceAllocator" />
 
 </beans:beans>
diff --git a/resource-assignment/provider/src/main/resources/resource-allocator.properties b/resource-assignment/provider/src/main/resources/resource-allocator.properties
index 887697bdb..72dbcf87c 100644
--- a/resource-assignment/provider/src/main/resources/resource-allocator.properties
+++ b/resource-assignment/provider/src/main/resources/resource-allocator.properties
@@ -3,7 +3,7 @@
 # openECOMP : SDN-C
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights
-# 			reserved.
+#                         reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
 # ============LICENSE_END=========================================================
 ###
 
-org.openecomp.sdnc.sli.dbtype = jdbc
-org.openecomp.sdnc.sli.jdbc.url = jdbc:mysql://dbhost:3306/sdnctl
-org.openecomp.sdnc.sli.jdbc.database = sdnctl
-org.openecomp.sdnc.sli.jdbc.user = sdnctl
-org.openecomp.sdnc.sli.jdbc.password = gamma
+org.onap.ccsdk.sli.adaptors.dbtype = jdbc
+org.onap.ccsdk.sli.adaptors.jdbc.url = jdbc:mysql://dbhost:3306/sdnctl
+org.onap.ccsdk.sli.adaptors.jdbc.database = sdnctl
+org.onap.ccsdk.sli.adaptors.jdbc.user = sdnctl
+org.onap.ccsdk.sli.adaptors.jdbc.password = gamma
diff --git a/resource-assignment/provider/src/main/resources/sql/001_resource_rule_ddl.sql b/resource-assignment/provider/src/main/resources/sql/001_resource_rule_ddl.sql
index 8c0b0fb7d..f69b6bcd8 100644
--- a/resource-assignment/provider/src/main/resources/sql/001_resource_rule_ddl.sql
+++ b/resource-assignment/provider/src/main/resources/sql/001_resource_rule_ddl.sql
@@ -3,7 +3,7 @@
 -- openECOMP : SDN-C
 -- ================================================================================
 -- Copyright (C) 2017 AT&T Intellectual Property. All rights
--- 			reserved.
+--                         reserved.
 -- ================================================================================
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
diff --git a/resource-assignment/provider/src/main/resources/sql/002_max_port_speed_ddl.sql b/resource-assignment/provider/src/main/resources/sql/002_max_port_speed_ddl.sql
index 8d8af4988..bc7babaf1 100644
--- a/resource-assignment/provider/src/main/resources/sql/002_max_port_speed_ddl.sql
+++ b/resource-assignment/provider/src/main/resources/sql/002_max_port_speed_ddl.sql
@@ -3,7 +3,7 @@
 -- openECOMP : SDN-C
 -- ================================================================================
 -- Copyright (C) 2017 AT&T Intellectual Property. All rights
--- 			reserved.
+--                         reserved.
 -- ================================================================================
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
diff --git a/resource-assignment/provider/src/main/resources/sql/003_max_server_speed_ddl.sql b/resource-assignment/provider/src/main/resources/sql/003_max_server_speed_ddl.sql
index ca0624a24..e3f18390b 100644
--- a/resource-assignment/provider/src/main/resources/sql/003_max_server_speed_ddl.sql
+++ b/resource-assignment/provider/src/main/resources/sql/003_max_server_speed_ddl.sql
@@ -3,7 +3,7 @@
 -- openECOMP : SDN-C
 -- ================================================================================
 -- Copyright (C) 2017 AT&T Intellectual Property. All rights
--- 			reserved.
+--                         reserved.
 -- ================================================================================
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
diff --git a/resource-assignment/provider/src/test/java/jtest/org/openecomp/sdnc/ra/DataSetup.java b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/DataSetup.java
index 8329cd0b7..ba57f626a 100644
--- a/resource-assignment/provider/src/test/java/jtest/org/openecomp/sdnc/ra/DataSetup.java
+++ b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/DataSetup.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package jtest.org.openecomp.sdnc.ra;
+package jtest.org.onap.ccsdk.sli.adaptors.ra;
 
 import java.util.Date;
 
-import jtest.util.org.openecomp.sdnc.ra.TestDb;
-import jtest.util.org.openecomp.sdnc.ra.TestTable;
+import jtest.util.org.onap.ccsdk.sli.adaptors.ra.TestDb;
+import jtest.util.org.onap.ccsdk.sli.adaptors.ra.TestTable;
 
 public class DataSetup {
 
diff --git a/resource-assignment/provider/src/test/java/jtest/org/openecomp/sdnc/ra/TestIsAvailable.java b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestIsAvailable.java
index 951b40559..5b9423422 100644
--- a/resource-assignment/provider/src/test/java/jtest/org/openecomp/sdnc/ra/TestIsAvailable.java
+++ b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestIsAvailable.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package jtest.org.openecomp.sdnc.ra;
+package jtest.org.onap.ccsdk.sli.adaptors.ra;
 
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
@@ -29,7 +29,7 @@ import org.junit.runners.MethodSorters;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
-import org.openecomp.sdnc.ra.ResourceAllocator;
+import org.onap.ccsdk.sli.adaptors.ra.ResourceAllocator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/resource-assignment/provider/src/test/java/jtest/org/openecomp/sdnc/ra/TestQuery.java b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestQuery.java
index 3b4898888..435f4aaa5 100644
--- a/resource-assignment/provider/src/test/java/jtest/org/openecomp/sdnc/ra/TestQuery.java
+++ b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestQuery.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package jtest.org.openecomp.sdnc.ra;
+package jtest.org.onap.ccsdk.sli.adaptors.ra;
 
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
@@ -28,7 +28,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
-import org.openecomp.sdnc.ra.ResourceAllocator;
+import org.onap.ccsdk.sli.adaptors.ra.ResourceAllocator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/resource-assignment/provider/src/test/java/jtest/org/openecomp/sdnc/ra/TestRelease.java b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestRelease.java
index b72d5079a..621022545 100644
--- a/resource-assignment/provider/src/test/java/jtest/org/openecomp/sdnc/ra/TestRelease.java
+++ b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestRelease.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package jtest.org.openecomp.sdnc.ra;
+package jtest.org.onap.ccsdk.sli.adaptors.ra;
 
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
@@ -29,7 +29,7 @@ import org.junit.runners.MethodSorters;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
-import org.openecomp.sdnc.ra.ResourceAllocator;
+import org.onap.ccsdk.sli.adaptors.ra.ResourceAllocator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/resource-assignment/provider/src/test/java/jtest/org/openecomp/sdnc/ra/TestReserve.java b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestReserve.java
index 913f2d16a..a4ee52547 100644
--- a/resource-assignment/provider/src/test/java/jtest/org/openecomp/sdnc/ra/TestReserve.java
+++ b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestReserve.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package jtest.org.openecomp.sdnc.ra;
+package jtest.org.onap.ccsdk.sli.adaptors.ra;
 
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
@@ -29,7 +29,7 @@ import org.junit.runners.MethodSorters;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
-import org.openecomp.sdnc.ra.ResourceAllocator;
+import org.onap.ccsdk.sli.adaptors.ra.ResourceAllocator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/resource-assignment/provider/src/test/java/jtest/org/openecomp/sdnc/ra/TestReserve2.java b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestReserve2.java
index c4d015891..7ae169762 100644
--- a/resource-assignment/provider/src/test/java/jtest/org/openecomp/sdnc/ra/TestReserve2.java
+++ b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestReserve2.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package jtest.org.openecomp.sdnc.ra;
+package jtest.org.onap.ccsdk.sli.adaptors.ra;
 
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
@@ -28,7 +28,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
-import org.openecomp.sdnc.ra.ResourceAllocator;
+import org.onap.ccsdk.sli.adaptors.ra.ResourceAllocator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/resource-assignment/provider/src/test/java/jtest/org/openecomp/sdnc/rm/DataSetup.java b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/rm/DataSetup.java
index 118137ec6..473a99f4c 100644
--- a/resource-assignment/provider/src/test/java/jtest/org/openecomp/sdnc/rm/DataSetup.java
+++ b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/rm/DataSetup.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package jtest.org.openecomp.sdnc.rm;
+package jtest.org.onap.ccsdk.sli.adaptors.rm;
 
 import java.util.Date;
 
-import jtest.util.org.openecomp.sdnc.ra.TestDb;
-import jtest.util.org.openecomp.sdnc.ra.TestTable;
+import jtest.util.org.onap.ccsdk.sli.adaptors.ra.TestDb;
+import jtest.util.org.onap.ccsdk.sli.adaptors.ra.TestTable;
 
 public class DataSetup {
 
diff --git a/resource-assignment/provider/src/test/java/jtest/util/org/openecomp/sdnc/ra/TestDb.java b/resource-assignment/provider/src/test/java/jtest/util/org/openecomp/sdnc/ra/TestDb.java
index 7434d939f..6446240dc 100644
--- a/resource-assignment/provider/src/test/java/jtest/util/org/openecomp/sdnc/ra/TestDb.java
+++ b/resource-assignment/provider/src/test/java/jtest/util/org/openecomp/sdnc/ra/TestDb.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package jtest.util.org.openecomp.sdnc.ra;
+package jtest.util.org.onap.ccsdk.sli.adaptors.ra;
 
 import org.springframework.jdbc.core.JdbcTemplate;
 
diff --git a/resource-assignment/provider/src/test/java/jtest/util/org/openecomp/sdnc/ra/TestTable.java b/resource-assignment/provider/src/test/java/jtest/util/org/openecomp/sdnc/ra/TestTable.java
index fe854bdd1..cda7302c9 100644
--- a/resource-assignment/provider/src/test/java/jtest/util/org/openecomp/sdnc/ra/TestTable.java
+++ b/resource-assignment/provider/src/test/java/jtest/util/org/openecomp/sdnc/ra/TestTable.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- * 			reserved.
+ *                         reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package jtest.util.org.openecomp.sdnc.ra;
+package jtest.util.org.onap.ccsdk.sli.adaptors.ra;
 
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.support.rowset.SqlRowSet;
diff --git a/resource-assignment/provider/src/test/resources/log4j.properties b/resource-assignment/provider/src/test/resources/log4j.properties
index 922ce8615..34dcdfb68 100644
--- a/resource-assignment/provider/src/test/resources/log4j.properties
+++ b/resource-assignment/provider/src/test/resources/log4j.properties
@@ -3,7 +3,7 @@
 # openECOMP : SDN-C
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights
-# 			reserved.
+#                         reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/resource-assignment/provider/src/test/resources/param.txt b/resource-assignment/provider/src/test/resources/param.txt
index d1aac4777..a20ac909d 100755
--- a/resource-assignment/provider/src/test/resources/param.txt
+++ b/resource-assignment/provider/src/test/resources/param.txt
@@ -40,5 +40,5 @@ Release:
 			Error message in: error-message, error-code
 
 
-Plugin name: org.openecomp.sdnc.ra.ResourceAllocator
+Plugin name: org.onap.ccsdk.sli.adaptors.ra.ResourceAllocator
 Resource: NetworkCapacity
diff --git a/resource-assignment/provider/src/test/resources/sql/data.sql b/resource-assignment/provider/src/test/resources/sql/data.sql
index 05f9ef4f4..5fd4c7577 100644
--- a/resource-assignment/provider/src/test/resources/sql/data.sql
+++ b/resource-assignment/provider/src/test/resources/sql/data.sql
@@ -3,7 +3,7 @@
 -- openECOMP : SDN-C
 -- ================================================================================
 -- Copyright (C) 2017 AT&T Intellectual Property. All rights
--- 			reserved.
+--                         reserved.
 -- ================================================================================
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
diff --git a/resource-assignment/provider/src/test/resources/sql/schema.sql b/resource-assignment/provider/src/test/resources/sql/schema.sql
index a61158aa0..40761de42 100644
--- a/resource-assignment/provider/src/test/resources/sql/schema.sql
+++ b/resource-assignment/provider/src/test/resources/sql/schema.sql
@@ -3,7 +3,7 @@
 -- openECOMP : SDN-C
 -- ================================================================================
 -- Copyright (C) 2017 AT&T Intellectual Property. All rights
--- 			reserved.
+--                         reserved.
 -- ================================================================================
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
diff --git a/resource-assignment/provider/src/test/resources/test-context.xml b/resource-assignment/provider/src/test/resources/test-context.xml
index 4f7bf4fbf..c3b09a1f5 100644
--- a/resource-assignment/provider/src/test/resources/test-context.xml
+++ b/resource-assignment/provider/src/test/resources/test-context.xml
@@ -4,7 +4,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-  			reserved.
+                          reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -49,28 +49,28 @@
         <property name="dataSource" ref="test.dataSource" />
     </bean>
 
-    <bean id="testDb" class="jtest.util.org.openecomp.sdnc.ra.TestDb">
+    <bean id="testDb" class="jtest.util.org.onap.ccsdk.sli.adaptors.ra.TestDb">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
-    <bean id="dataSetup" class="jtest.org.openecomp.sdnc.ra.DataSetup">
+    <bean id="dataSetup" class="jtest.org.onap.ccsdk.sli.adaptors.ra.DataSetup">
         <property name="testDb" ref="testDb" />
     </bean>
 
     <!-- Utils Configuration -->
 
-    <bean id="speedUtil" class="org.openecomp.sdnc.util.speed.SpeedUtil">
+    <bean id="speedUtil" class="org.onap.ccsdk.sli.adaptors.util.speed.SpeedUtil">
         <property name="unitFactor" value="1000" />
     </bean>
 
     <!-- Resource Lock Configuration -->
 
-    <bean id="resourceLockDao" class="org.openecomp.sdnc.lock.dao.ResourceLockDaoImpl">
+    <bean id="resourceLockDao" class="org.onap.ccsdk.sli.adaptors.lock.dao.ResourceLockDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
         <property name="testing" value="true" />
     </bean>
 
-    <bean id="lockHelper" class="org.openecomp.sdnc.lock.comp.LockHelperImpl">
+    <bean id="lockHelper" class="org.onap.ccsdk.sli.adaptors.lock.comp.LockHelperImpl">
         <property name="resourceLockDao" ref="resourceLockDao" />
         <property name="retryCount" value="10" />
         <property name="lockWait" value="5" /> <!-- Seconds -->
@@ -78,25 +78,25 @@
 
     <!-- RM Configuration -->
 
-    <bean id="resourceJdbcDao" class="org.openecomp.sdnc.rm.dao.jdbc.ResourceJdbcDaoImpl">
+    <bean id="resourceJdbcDao" class="org.onap.ccsdk.sli.adaptors.rm.dao.jdbc.ResourceJdbcDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
-    <bean id="allocationItemJdbcDao" class="org.openecomp.sdnc.rm.dao.jdbc.AllocationItemJdbcDaoImpl">
+    <bean id="allocationItemJdbcDao" class="org.onap.ccsdk.sli.adaptors.rm.dao.jdbc.AllocationItemJdbcDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
-    <bean id="resourceLoadJdbcDao" class="org.openecomp.sdnc.rm.dao.jdbc.ResourceLoadJdbcDaoImpl">
+    <bean id="resourceLoadJdbcDao" class="org.onap.ccsdk.sli.adaptors.rm.dao.jdbc.ResourceLoadJdbcDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
-    <bean id="resourceDao" class="org.openecomp.sdnc.rm.dao.jdbc.ResourceDaoImpl">
+    <bean id="resourceDao" class="org.onap.ccsdk.sli.adaptors.rm.dao.jdbc.ResourceDaoImpl">
         <property name="resourceJdbcDao" ref="resourceJdbcDao" />
         <property name="allocationItemJdbcDao" ref="allocationItemJdbcDao" />
         <property name="resourceLoadJdbcDao" ref="resourceLoadJdbcDao" />
     </bean>
 
-    <bean id="resourceManager" class="org.openecomp.sdnc.rm.comp.ResourceManagerImpl">
+    <bean id="resourceManager" class="org.onap.ccsdk.sli.adaptors.rm.comp.ResourceManagerImpl">
         <property name="lockHelper" ref="lockHelper" />
         <property name="resourceDao" ref="resourceDao" />
         <property name="applicationId" value="SDNC" />
@@ -105,60 +105,60 @@
 
     <!-- Equipment DAO Configuration -->
 
-    <bean id="serverDao" class="org.openecomp.sdnc.ra.equip.dao.ServerDaoImpl">
+    <bean id="serverDao" class="org.onap.ccsdk.sli.adaptors.ra.equip.dao.ServerDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
-    <bean id="vpePortDao" class="org.openecomp.sdnc.ra.equip.dao.VpePortDaoImpl">
+    <bean id="vpePortDao" class="org.onap.ccsdk.sli.adaptors.ra.equip.dao.VpePortDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
-    <bean id="vplspePortDao" class="org.openecomp.sdnc.ra.equip.dao.VplspePortDaoImpl">
+    <bean id="vplspePortDao" class="org.onap.ccsdk.sli.adaptors.ra.equip.dao.VplspePortDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
     <!-- Rule DAO Configuration -->
 
-    <bean id="maxPortSpeedDao" class="org.openecomp.sdnc.ra.rule.dao.MaxPortSpeedDaoImpl">
+    <bean id="maxPortSpeedDao" class="org.onap.ccsdk.sli.adaptors.ra.rule.dao.MaxPortSpeedDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
         <property name="speedUtil" ref="speedUtil" />
     </bean>
 
-    <bean id="maxServerSpeedDao" class="org.openecomp.sdnc.ra.rule.dao.MaxServerSpeedDaoImpl">
+    <bean id="maxServerSpeedDao" class="org.onap.ccsdk.sli.adaptors.ra.rule.dao.MaxServerSpeedDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
         <property name="speedUtil" ref="speedUtil" />
     </bean>
 
-    <bean id="resourceRuleDao" class="org.openecomp.sdnc.ra.rule.dao.ResourceRuleDaoImpl">
+    <bean id="resourceRuleDao" class="org.onap.ccsdk.sli.adaptors.ra.rule.dao.ResourceRuleDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
-    <bean id="rangeRuleDao" class="org.openecomp.sdnc.ra.rule.dao.RangeRuleDaoImpl">
+    <bean id="rangeRuleDao" class="org.onap.ccsdk.sli.adaptors.ra.rule.dao.RangeRuleDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
-    <bean id="vpeLockDao" class="org.openecomp.sdnc.ra.rule.dao.VpeLockDaoImpl">
+    <bean id="vpeLockDao" class="org.onap.ccsdk.sli.adaptors.ra.rule.dao.VpeLockDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
-    <bean id="parameterDao" class="org.openecomp.sdnc.ra.rule.dao.ParameterDaoImpl">
+    <bean id="parameterDao" class="org.onap.ccsdk.sli.adaptors.ra.rule.dao.ParameterDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
     <!-- Service DAO Configuration -->
 
-    <bean id="serviceResourceDao" class="org.openecomp.sdnc.ra.service.dao.ServiceResourceDaoImpl">
+    <bean id="serviceResourceDao" class="org.onap.ccsdk.sli.adaptors.ra.service.dao.ServiceResourceDaoImpl">
         <property name="jdbcTemplate" ref="rm.jdbcTemplate" />
     </bean>
 
     <!-- ResourceAllocator Configuration -->
 
-    <bean id="allocationRequestBuilder" class="org.openecomp.sdnc.ra.rule.comp.AllocationRequestBuilderImpl">
+    <bean id="allocationRequestBuilder" class="org.onap.ccsdk.sli.adaptors.ra.rule.comp.AllocationRequestBuilderImpl">
         <property name="resourceRuleDao" ref="resourceRuleDao" />
         <property name="rangeRuleDao" ref="rangeRuleDao" />
     </bean>
 
-    <bean id="resourceAllocator" class="org.openecomp.sdnc.ra.ResourceAllocator">
+    <bean id="resourceAllocator" class="org.onap.ccsdk.sli.adaptors.ra.ResourceAllocator">
         <property name="speedUtil" ref="speedUtil" />
         <property name="parameterDao" ref="parameterDao" />
         <property name="serverDao" ref="serverDao" />
@@ -174,13 +174,13 @@
 
     <!-- EndPointAllocator Configuration -->
 
-    <bean id="endPointAllocator" class="org.openecomp.sdnc.ra.comp.EndPointAllocatorImpl">
+    <bean id="endPointAllocator" class="org.onap.ccsdk.sli.adaptors.ra.comp.EndPointAllocatorImpl">
         <property name="resourceManager" ref="resourceManager" />
         <property name="endPointAllocationDefinitionMap">
             <map>
                 <entry key="L3AVPN-PORT">
                     <list>
-                        <bean class="org.openecomp.sdnc.ra.comp.EndPointAllocationDefinition">
+                        <bean class="org.onap.ccsdk.sli.adaptors.ra.comp.EndPointAllocationDefinition">
                             <property name="serviceModel" value="L3AVPN-PORT" />
                             <property name="endPointPosition" value="VPE-Cust" />
                             <property name="equipmentReader" ref="vpePortReader" />
@@ -207,7 +207,7 @@
                 </entry>
                 <entry key="L3AVPN-EVC">
                     <list>
-                        <bean class="org.openecomp.sdnc.ra.comp.EndPointAllocationDefinition">
+                        <bean class="org.onap.ccsdk.sli.adaptors.ra.comp.EndPointAllocationDefinition">
                             <property name="serviceModel" value="L3AVPN-EVC" />
                             <property name="endPointPosition" value="VPE-Cust" />
                             <property name="equipmentReader" ref="vpePortReader" />
@@ -243,55 +243,55 @@
 
     <!-- Equipment Readers Configuration -->
 
-    <bean id="vpePortReader" class="org.openecomp.sdnc.ra.reader.VpePortReader">
+    <bean id="vpePortReader" class="org.onap.ccsdk.sli.adaptors.ra.reader.VpePortReader">
         <property name="vpePortDao" ref="vpePortDao" />
     </bean>
 
     <!-- Equipment Checks Configuration -->
 
-    <bean id="provStatusCheck" class="org.openecomp.sdnc.ra.check.ProvStatusCheck">
+    <bean id="provStatusCheck" class="org.onap.ccsdk.sli.adaptors.ra.check.ProvStatusCheck">
     </bean>
 
-    <bean id="excludeVpeCheck" class="org.openecomp.sdnc.ra.check.ExcludeVpeCheck">
+    <bean id="excludeVpeCheck" class="org.onap.ccsdk.sli.adaptors.ra.check.ExcludeVpeCheck">
     </bean>
 
-    <bean id="vpeLockCheck" class="org.openecomp.sdnc.ra.check.VpeLockCheck">
+    <bean id="vpeLockCheck" class="org.onap.ccsdk.sli.adaptors.ra.check.VpeLockCheck">
         <property name="vpeLockDao" ref="vpeLockDao" />
         <property name="resourceManager" ref="resourceManager" />
     </bean>
 
-    <bean id="anyVrfPresentCheck" class="org.openecomp.sdnc.ra.check.AnyVrfPresentCheck">
+    <bean id="anyVrfPresentCheck" class="org.onap.ccsdk.sli.adaptors.ra.check.AnyVrfPresentCheck">
         <property name="resourceManager" ref="resourceManager" />
     </bean>
 
-    <bean id="oneMVrfCheck" class="org.openecomp.sdnc.ra.check.OneMVrfCheck">
+    <bean id="oneMVrfCheck" class="org.onap.ccsdk.sli.adaptors.ra.check.OneMVrfCheck">
         <property name="resourceManager" ref="resourceManager" />
     </bean>
 
-    <bean id="hubWithRgCheck" class="org.openecomp.sdnc.ra.check.HubWithRgCheck">
+    <bean id="hubWithRgCheck" class="org.onap.ccsdk.sli.adaptors.ra.check.HubWithRgCheck">
         <property name="resourceManager" ref="resourceManager" />
     </bean>
 
     <!-- Preference Rule Configuration -->
 
-    <bean id="affinityLinkPref" class="org.openecomp.sdnc.ra.pref.AffinityLinkPref">
+    <bean id="affinityLinkPref" class="org.onap.ccsdk.sli.adaptors.ra.pref.AffinityLinkPref">
         <property name="resourceManager" ref="resourceManager" />
     </bean>
 
     <!-- Resource Allocation Rule Configuration -->
 
-    <bean id="dbAllocationRule" class="org.openecomp.sdnc.ra.alloc.DbAllocationRule">
+    <bean id="dbAllocationRule" class="org.onap.ccsdk.sli.adaptors.ra.alloc.DbAllocationRule">
         <property name="resourceRuleDao" ref="resourceRuleDao" />
         <property name="rangeRuleDao" ref="rangeRuleDao" />
     </bean>
 
-    <bean id="vrfAllocationRule" class="org.openecomp.sdnc.ra.alloc.VrfAllocationRule">
+    <bean id="vrfAllocationRule" class="org.onap.ccsdk.sli.adaptors.ra.alloc.VrfAllocationRule">
     </bean>
 
-    <bean id="servingSiteAllocationRule" class="org.openecomp.sdnc.ra.alloc.ServingSiteAllocationRule">
+    <bean id="servingSiteAllocationRule" class="org.onap.ccsdk.sli.adaptors.ra.alloc.ServingSiteAllocationRule">
     </bean>
 
-    <bean id="affinityAllocationRule" class="org.openecomp.sdnc.ra.alloc.AffinityAllocationRule">
+    <bean id="affinityAllocationRule" class="org.onap.ccsdk.sli.adaptors.ra.alloc.AffinityAllocationRule">
     </bean>
 
 </beans>
author	Marcus G K Williams <marcus.williams@intel.com>	2017-08-17 10:29:11 -0700
committer	Marcus G K Williams <marcus.williams@intel.com>	2017-08-17 10:37:11 -0700
commit	1ac8baaba4a08c8cc6d18bcd7b45054d79c9b133 (patch)
tree	21d60bac801f68c22ac4691cf9d0d1d8db32a0ac /resource-assignment/provider
parent	448566611416c33d58dbd73d40f9bdc1acf40404 (diff)