vnfsdk market place seed code refactoring

cleanup the package names and a test file
correction

Change-Id: Icc5a3b48189824dfe5cb84f05ce2c496bcfa3eab
IssueId: VNFSDK-74
Signed-off-by: AvinashS <avinash.s@huawei.com>

77 files changed, 228 insertions, 227 deletions

diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/common/CommonConstant.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/CommonConstant.java
index d61deb93..fc8ef1b8 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/common/CommonConstant.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/CommonConstant.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.common;
+package org.onap.vnfsdk.marketplace.common;
 
 public class CommonConstant {
   // Package Status
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/common/CommonErrorResponse.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/CommonErrorResponse.java
index 853aceaa..ee268609 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/common/CommonErrorResponse.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/CommonErrorResponse.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.common;
+package org.onap.vnfsdk.marketplace.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/common/FileUtil.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/FileUtil.java
index 2897af6e..815acb71 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/common/FileUtil.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/FileUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.common;
+package org.onap.vnfsdk.marketplace.common;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/common/HttpServerAddrConfig.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/HttpServerAddrConfig.java
index bb7c804e..2adf1b89 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/common/HttpServerAddrConfig.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/HttpServerAddrConfig.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.common;
+package org.onap.vnfsdk.marketplace.common;
 
 
 public class HttpServerAddrConfig {
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/common/HttpServerPathConfig.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/HttpServerPathConfig.java
index fab2315c..3d5cfacc 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/common/HttpServerPathConfig.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/HttpServerPathConfig.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.common;
+package org.onap.vnfsdk.marketplace.common;
 
 public class HttpServerPathConfig {
   protected static String httpServerPath;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/common/JsonUtil.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/JsonUtil.java
index ba456998..eb471907 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/common/JsonUtil.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/JsonUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.vnfsdk.marketplace.common;
+package org.onap.vnfsdk.marketplace.common;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/common/MsbAddrConfig.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/MsbAddrConfig.java
index 9d0e5ec9..d2ff4b55 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/common/MsbAddrConfig.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/MsbAddrConfig.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.common;
+package org.onap.vnfsdk.marketplace.common;
 
 public class MsbAddrConfig {
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/common/RestUtil.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/RestUtil.java
index fe3c4874..557428d6 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/common/RestUtil.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/RestUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.common;
+package org.onap.vnfsdk.marketplace.common;
 
 import javax.ws.rs.core.Response;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/common/ToolUtil.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/ToolUtil.java
index d64e064e..b9fe5caa 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/common/ToolUtil.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/ToolUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.common;
+package org.onap.vnfsdk.marketplace.common;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/common/MarketplaceResourceType.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/common/MarketplaceResourceType.java
index e5140910..059bd0ff 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/common/MarketplaceResourceType.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/common/MarketplaceResourceType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.db.common;
+package org.onap.vnfsdk.marketplace.db.common;
 
 
 public enum MarketplaceResourceType {
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/common/Parameters.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/common/Parameters.java
index 89416bfb..3567f495 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/common/Parameters.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/common/Parameters.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.db.common;
+package org.onap.vnfsdk.marketplace.db.common;
 
 public enum Parameters {
   oid, name, provider, version, deletionPending, 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/connection/ConnectionUtil.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/connection/ConnectionUtil.java
index d8c0d3ad..3184e420 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/connection/ConnectionUtil.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/connection/ConnectionUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.vnfsdk.marketplace.db.connection;
+package org.onap.vnfsdk.marketplace.db.connection;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/entity/BaseData.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/entity/BaseData.java
index 77acf90c..30a074a2 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/entity/BaseData.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/entity/BaseData.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.db.entity;
+package org.onap.vnfsdk.marketplace.db.entity;
 
 public class BaseData {
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/entity/PackageData.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/entity/PackageData.java
index ed137a3f..dfbdaa2f 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/entity/PackageData.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/entity/PackageData.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.db.entity;
+package org.onap.vnfsdk.marketplace.db.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/exception/ErrorCodeException.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/exception/ErrorCodeException.java
index de9f7f4e..9921a8cb 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/exception/ErrorCodeException.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/exception/ErrorCodeException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.db.exception;
+package org.onap.vnfsdk.marketplace.db.exception;
 
 
 public class ErrorCodeException extends Exception {
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/exception/MarketplaceResourceException.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/exception/MarketplaceResourceException.java
index ed9a6ea5..8a434fa7 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/exception/MarketplaceResourceException.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/exception/MarketplaceResourceException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.db.exception;
+package org.onap.vnfsdk.marketplace.db.exception;
 
 public class MarketplaceResourceException extends ErrorCodeException {
   private static final long serialVersionUID = 5699508780537383310L;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/impl/MarketplaceDaoImpl.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/impl/MarketplaceDaoImpl.java
index 6f1f330a..67cfb355 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/impl/MarketplaceDaoImpl.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/impl/MarketplaceDaoImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.vnfsdk.marketplace.db.impl;
+package org.onap.vnfsdk.marketplace.db.impl;
 
 import java.util.List;
 
@@ -22,10 +22,10 @@ import javax.persistence.PersistenceException;
 
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
-import org.openo.vnfsdk.marketplace.db.connection.ConnectionUtil;
-import org.openo.vnfsdk.marketplace.db.entity.PackageData;
-import org.openo.vnfsdk.marketplace.db.inf.IMarketplaceDao;
-import org.openo.vnfsdk.marketplace.db.mapper.IMarketplaceMapper;
+import org.onap.vnfsdk.marketplace.db.connection.ConnectionUtil;
+import org.onap.vnfsdk.marketplace.db.entity.PackageData;
+import org.onap.vnfsdk.marketplace.db.inf.IMarketplaceDao;
+import org.onap.vnfsdk.marketplace.db.mapper.IMarketplaceMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/inf/IMarketplaceDao.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/inf/IMarketplaceDao.java
index 65046e63..1f1d69fc 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/inf/IMarketplaceDao.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/inf/IMarketplaceDao.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.openo.vnfsdk.marketplace.db.inf;
+package org.onap.vnfsdk.marketplace.db.inf;
 
 import java.util.List;
 
-import org.openo.vnfsdk.marketplace.db.entity.PackageData;
+import org.onap.vnfsdk.marketplace.db.entity.PackageData;
 
 /**
  * DAO Layer for the Driver Manager Service.
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/mapper/IMarketplaceMapper.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/mapper/IMarketplaceMapper.java
index c0c1b6f6..b94d442e 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/mapper/IMarketplaceMapper.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/mapper/IMarketplaceMapper.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.openo.vnfsdk.marketplace.db.mapper;
+package org.onap.vnfsdk.marketplace.db.mapper;
 
 import java.util.List;
 
-import org.openo.vnfsdk.marketplace.db.entity.PackageData;
+import org.onap.vnfsdk.marketplace.db.entity.PackageData;
 
 /**
  * Mapper Interface exposed to perform database operations for Driver Manager.
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/resource/PackageManager.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/resource/PackageManager.java
index 7123b4e7..63573715 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/resource/PackageManager.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/resource/PackageManager.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.db.resource;
+package org.onap.vnfsdk.marketplace.db.resource;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.openo.vnfsdk.marketplace.db.common.Parameters;
-import org.openo.vnfsdk.marketplace.db.entity.PackageData;
-import org.openo.vnfsdk.marketplace.db.exception.MarketplaceResourceException;
-import org.openo.vnfsdk.marketplace.db.util.MarketplaceDbUtil;
-import org.openo.vnfsdk.marketplace.db.wrapper.PackageHandler;
+import org.onap.vnfsdk.marketplace.db.common.Parameters;
+import org.onap.vnfsdk.marketplace.db.entity.PackageData;
+import org.onap.vnfsdk.marketplace.db.exception.MarketplaceResourceException;
+import org.onap.vnfsdk.marketplace.db.util.MarketplaceDbUtil;
+import org.onap.vnfsdk.marketplace.db.wrapper.PackageHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/util/MarketplaceDbUtil.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/util/MarketplaceDbUtil.java
index f9ec997d..da175330 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/util/MarketplaceDbUtil.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/util/MarketplaceDbUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.db.util;
+package org.onap.vnfsdk.marketplace.db.util;
 
 
 import com.google.gson.Gson;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/wrapper/BaseHandler.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/wrapper/BaseHandler.java
index 0b5b285a..cd413296 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/wrapper/BaseHandler.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/wrapper/BaseHandler.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.db.wrapper;
+package org.onap.vnfsdk.marketplace.db.wrapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.openo.vnfsdk.marketplace.db.entity.BaseData;
-import org.openo.vnfsdk.marketplace.db.entity.PackageData;
-import org.openo.vnfsdk.marketplace.db.exception.MarketplaceResourceException;
-import org.openo.vnfsdk.marketplace.db.impl.MarketplaceDaoImpl;
-import org.openo.vnfsdk.marketplace.db.inf.IMarketplaceDao;
-import org.openo.vnfsdk.marketplace.db.util.MarketplaceDbUtil;
+import org.onap.vnfsdk.marketplace.db.entity.BaseData;
+import org.onap.vnfsdk.marketplace.db.entity.PackageData;
+import org.onap.vnfsdk.marketplace.db.exception.MarketplaceResourceException;
+import org.onap.vnfsdk.marketplace.db.impl.MarketplaceDaoImpl;
+import org.onap.vnfsdk.marketplace.db.inf.IMarketplaceDao;
+import org.onap.vnfsdk.marketplace.db.util.MarketplaceDbUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/wrapper/PackageHandler.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/wrapper/PackageHandler.java
index a33e80a3..3619a745 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/db/wrapper/PackageHandler.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/db/wrapper/PackageHandler.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.db.wrapper;
+package org.onap.vnfsdk.marketplace.db.wrapper;
 
 import java.util.ArrayList;
 import java.util.Map;
 
-import org.openo.vnfsdk.marketplace.db.common.MarketplaceResourceType;
-import org.openo.vnfsdk.marketplace.db.common.Parameters;
-import org.openo.vnfsdk.marketplace.db.entity.PackageData;
-import org.openo.vnfsdk.marketplace.db.exception.MarketplaceResourceException;
-import org.openo.vnfsdk.marketplace.db.impl.MarketplaceDaoImpl;
-import org.openo.vnfsdk.marketplace.db.inf.IMarketplaceDao;
-import org.openo.vnfsdk.marketplace.db.util.MarketplaceDbUtil;
+import org.onap.vnfsdk.marketplace.db.common.MarketplaceResourceType;
+import org.onap.vnfsdk.marketplace.db.common.Parameters;
+import org.onap.vnfsdk.marketplace.db.entity.PackageData;
+import org.onap.vnfsdk.marketplace.db.exception.MarketplaceResourceException;
+import org.onap.vnfsdk.marketplace.db.impl.MarketplaceDaoImpl;
+import org.onap.vnfsdk.marketplace.db.inf.IMarketplaceDao;
+import org.onap.vnfsdk.marketplace.db.util.MarketplaceDbUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/CsarPackage.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/CsarPackage.java
index 8e8d8030..c80fef1e 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/CsarPackage.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/CsarPackage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.entity;
+package org.onap.vnfsdk.marketplace.entity;
 
 public class CsarPackage {
   private String id;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/CsarQueryCondition.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/CsarQueryCondition.java
index b1834f59..9cbb89e1 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/CsarQueryCondition.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/CsarQueryCondition.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.entity;
+package org.onap.vnfsdk.marketplace.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/EnumOnboardState.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/EnumOnboardState.java
index fb527c85..a90a254d 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/EnumOnboardState.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/EnumOnboardState.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.entity;
+package org.onap.vnfsdk.marketplace.entity;
 
 public enum EnumOnboardState {
   onBoarded("onBoarded"), nonOnBoarded("non-onBoarded");
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/EnumOperationStatus.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/EnumOperationStatus.java
index 8a972546..3bab772e 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/EnumOperationStatus.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/EnumOperationStatus.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.vnfsdk.marketplace.entity;
+package org.onap.vnfsdk.marketplace.entity;
 
 public enum EnumOperationStatus {
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/EnumOperationalState.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/EnumOperationalState.java
index cd42e722..f2c4c5f2 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/EnumOperationalState.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/EnumOperationalState.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.entity;
+package org.onap.vnfsdk.marketplace.entity;
 
 public enum EnumOperationalState {
   Enabled, Disabled
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/EnumProcessState.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/EnumProcessState.java
index a4c08ab3..1281dab3 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/EnumProcessState.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/EnumProcessState.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.entity;
+package org.onap.vnfsdk.marketplace.entity;
 
 public enum EnumProcessState {
   normal, onBoarding, onBoardFailed, deleting, deleteFailed
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/EnumResult.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/EnumResult.java
index 462e62b7..9e9984ed 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/EnumResult.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/EnumResult.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.vnfsdk.marketplace.entity;
+package org.onap.vnfsdk.marketplace.entity;
 
 /**
  * enum of the result type
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/EnumType.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/EnumType.java
index 5d823183..e316e3cb 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/EnumType.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/EnumType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.entity;
+package org.onap.vnfsdk.marketplace.entity;
 
 public enum EnumType {
   GSAR, SSAR, NSAR, NFAR
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/EnumUsageState.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/EnumUsageState.java
index 91ae00c6..6d85093f 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/EnumUsageState.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/EnumUsageState.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.entity;
+package org.onap.vnfsdk.marketplace.entity;
 
 public enum EnumUsageState {
   InUse, NotInUse
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/VnfPackage.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/VnfPackage.java
index 013946bf..b6666461 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/VnfPackage.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/VnfPackage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.entity;
+package org.onap.vnfsdk.marketplace.entity;
 
 public class VnfPackage {
   private String vnfPackageId;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/request/PackageBasicInfo.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/request/PackageBasicInfo.java
index 8fce7b8a..129fe0e8 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/request/PackageBasicInfo.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/request/PackageBasicInfo.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.entity.request;
+package org.onap.vnfsdk.marketplace.entity.request;
 
-import org.openo.vnfsdk.marketplace.entity.EnumType;
+import org.onap.vnfsdk.marketplace.entity.EnumType;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/response/CsarFileUriResponse.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/response/CsarFileUriResponse.java
index 7b4bfb4e..5dbcc682 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/response/CsarFileUriResponse.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/response/CsarFileUriResponse.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.entity.response;
+package org.onap.vnfsdk.marketplace.entity.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/response/PackageMeta.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/response/PackageMeta.java
index 66460f15..947e5801 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/response/PackageMeta.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/response/PackageMeta.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.entity.response;
+package org.onap.vnfsdk.marketplace.entity.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/response/PackageResponse.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/response/PackageResponse.java
index c2ce36d5..03852cde 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/response/PackageResponse.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/response/PackageResponse.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.entity.response;
+package org.onap.vnfsdk.marketplace.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/response/UploadPackageResponse.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/response/UploadPackageResponse.java
index b6811127..3516923e 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/entity/response/UploadPackageResponse.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/entity/response/UploadPackageResponse.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.entity.response;
+package org.onap.vnfsdk.marketplace.entity.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/filemanage/FileManager.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/filemanage/FileManager.java
index 8ecd7587..96e1163e 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/filemanage/FileManager.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/filemanage/FileManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.filemanage;
+package org.onap.vnfsdk.marketplace.filemanage;
 
 
 public interface FileManager {
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/filemanage/FileManagerFactory.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/filemanage/FileManagerFactory.java
index 036440d0..7c0c1949 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/filemanage/FileManagerFactory.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/filemanage/FileManagerFactory.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.filemanage;
+package org.onap.vnfsdk.marketplace.filemanage;
 
-import org.openo.vnfsdk.marketplace.filemanage.http.HttpFileManagerImpl;
+import org.onap.vnfsdk.marketplace.filemanage.http.HttpFileManagerImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/filemanage/FileManagerType.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/filemanage/FileManagerType.java
index 046b6b24..9745d51d 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/filemanage/FileManagerType.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/filemanage/FileManagerType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.filemanage;
+package org.onap.vnfsdk.marketplace.filemanage;
 
 public enum FileManagerType {
   ftp, http;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/filemanage/http/HttpFileManagerImpl.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/filemanage/http/HttpFileManagerImpl.java
index b28b5ff7..d45e1755 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/filemanage/http/HttpFileManagerImpl.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/filemanage/http/HttpFileManagerImpl.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.filemanage.http;
+package org.onap.vnfsdk.marketplace.filemanage.http;
 
 import java.io.File;
 import java.io.IOException;
 
-import org.openo.vnfsdk.marketplace.filemanage.FileManager;
+import org.onap.vnfsdk.marketplace.filemanage.FileManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/filemanage/http/ToolUtil.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/filemanage/http/ToolUtil.java
index b4f63883..1b45e75f 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/filemanage/http/ToolUtil.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/filemanage/http/ToolUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.filemanage.http;
+package org.onap.vnfsdk.marketplace.filemanage.http;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -23,7 +23,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.openo.vnfsdk.marketplace.common.HttpServerPathConfig;
+import org.onap.vnfsdk.marketplace.common.HttpServerPathConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/model/parser/EnumPackageFormat.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/model/parser/EnumPackageFormat.java
index 485e15da..f6795386 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/model/parser/EnumPackageFormat.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/model/parser/EnumPackageFormat.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.model.parser;
+package org.onap.vnfsdk.marketplace.model.parser;
 
 /**
  * enum data.
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/model/parser/EnumTemplateType.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/model/parser/EnumTemplateType.java
index e634aea7..555e38d5 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/model/parser/EnumTemplateType.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/model/parser/EnumTemplateType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.model.parser;
+package org.onap.vnfsdk.marketplace.model.parser;
 
 public enum EnumTemplateType {
   NS, VNF
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/msb/AppServletContextListener.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/AppServletContextListener.java
index 9ea074cb..2449a9b7 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/msb/AppServletContextListener.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/AppServletContextListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.vnfsdk.marketplace.msb;
+package org.onap.vnfsdk.marketplace.msb;
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/msb/MsbDetails.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbDetails.java
index ab4190ee..e95cd16f 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/msb/MsbDetails.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbDetails.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.msb;
+package org.onap.vnfsdk.marketplace.msb;
 
 public class MsbDetails 
 {
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/msb/MsbDetailsHolder.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbDetailsHolder.java
index 8c1d86ab..ed8c32ea 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/msb/MsbDetailsHolder.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbDetailsHolder.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.msb;
+package org.onap.vnfsdk.marketplace.msb;
 
-import org.openo.vnfsdk.marketplace.common.FileUtil;
+import org.onap.vnfsdk.marketplace.common.FileUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/msb/MsbRegister.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbRegister.java
index 6ade1414..3e4699e8 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/msb/MsbRegister.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbRegister.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.openo.vnfsdk.marketplace.msb;
+package org.onap.vnfsdk.marketplace.msb;
 
-import org.openo.vnfsdk.marketplace.common.CommonConstant;
+import org.onap.vnfsdk.marketplace.common.CommonConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/msb/MsbRegistration.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbRegistration.java
index e1f39084..50f46583 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/msb/MsbRegistration.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbRegistration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.vnfsdk.marketplace.msb;
+package org.onap.vnfsdk.marketplace.msb;
 
 import java.io.File;
 import java.io.IOException;
@@ -28,10 +28,10 @@ import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
 import org.codehaus.jackson.map.ObjectMapper;
-import org.openo.vnfsdk.marketplace.common.CommonConstant;
-import org.openo.vnfsdk.marketplace.common.JsonUtil;
-import org.openo.vnfsdk.marketplace.rest.RestResponse;
-import org.openo.vnfsdk.marketplace.rest.RestfulClient;
+import org.onap.vnfsdk.marketplace.common.CommonConstant;
+import org.onap.vnfsdk.marketplace.common.JsonUtil;
+import org.onap.vnfsdk.marketplace.rest.RestResponse;
+import org.onap.vnfsdk.marketplace.rest.RestfulClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/msb/MsbServer.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbServer.java
index fa3bcb02..f5d860b1 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/msb/MsbServer.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbServer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.msb;
+package org.onap.vnfsdk.marketplace.msb;
 
 public class MsbServer 
 {
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/entity/OnBoardingOperResult.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/entity/OnBoardingOperResult.java
index 68d85987..0340edc1 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/entity/OnBoardingOperResult.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/entity/OnBoardingOperResult.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.onboarding.entity;
+package org.onap.vnfsdk.marketplace.onboarding.entity;
 public class OnBoardingOperResult 
 {
     private String operId;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/entity/OnBoardingResult.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/entity/OnBoardingResult.java
index 52bfe100..0a70ab08 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/entity/OnBoardingResult.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/entity/OnBoardingResult.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.onboarding.entity;
+package org.onap.vnfsdk.marketplace.onboarding.entity;
 
 import java.util.List;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/entity/OnBoardingStep.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/entity/OnBoardingStep.java
index b8a18085..c3c49380 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/entity/OnBoardingStep.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/entity/OnBoardingStep.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.onboarding.entity;
+package org.onap.vnfsdk.marketplace.onboarding.entity;
 
 import java.util.List;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/entity/OnBoardingSteps.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/entity/OnBoardingSteps.java
index 24410e86..326bcf36 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/entity/OnBoardingSteps.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/entity/OnBoardingSteps.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.onboarding.entity;
+package org.onap.vnfsdk.marketplace.onboarding.entity;
 
 import java.util.List;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/entity/OnBoradingRequest.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/entity/OnBoradingRequest.java
index 622c1731..a85a1de3 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/entity/OnBoradingRequest.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/entity/OnBoradingRequest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.onboarding.entity;
+package org.onap.vnfsdk.marketplace.onboarding.entity;
 
 public class OnBoradingRequest {
     private String csarId;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/entity/OperationDetails.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/entity/OperationDetails.java
index e8017320..a98663b6 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/entity/OperationDetails.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/entity/OperationDetails.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.onboarding.entity;
+package org.onap.vnfsdk.marketplace.onboarding.entity;
 
 public class OperationDetails 
 {
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/entity/OperationResult.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/entity/OperationResult.java
index af7a33ae..d31aa11b 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/entity/OperationResult.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/entity/OperationResult.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.onboarding.entity;
+package org.onap.vnfsdk.marketplace.onboarding.entity;
 
 import java.util.List;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/entity/ResultKey.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/entity/ResultKey.java
index 117325b9..37a00fdf 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/entity/ResultKey.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/entity/ResultKey.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.onboarding.entity;
+package org.onap.vnfsdk.marketplace.onboarding.entity;
 
 public class ResultKey 
 {
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestExceutor.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestExceutor.java
index 336a40f0..bbe2cf34 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestExceutor.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestExceutor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.onboarding.hooks.functiontest;
+package org.onap.vnfsdk.marketplace.onboarding.hooks.functiontest;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -26,16 +26,16 @@ import java.util.Map;
 import org.apache.http.HttpEntity;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.onap.vnfsdk.marketplace.common.CommonConstant;
+import org.onap.vnfsdk.marketplace.common.FileUtil;
+import org.onap.vnfsdk.marketplace.msb.MsbDetails;
+import org.onap.vnfsdk.marketplace.msb.MsbDetailsHolder;
+import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoradingRequest;
+import org.onap.vnfsdk.marketplace.rest.RestConstant;
+import org.onap.vnfsdk.marketplace.rest.RestResponse;
+import org.onap.vnfsdk.marketplace.rest.RestfulClient;
+import org.onap.vnfsdk.marketplace.rest.RestfulUtil;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
-import org.openo.vnfsdk.marketplace.common.CommonConstant;
-import org.openo.vnfsdk.marketplace.common.FileUtil;
-import org.openo.vnfsdk.marketplace.msb.MsbDetails;
-import org.openo.vnfsdk.marketplace.msb.MsbDetailsHolder;
-import org.openo.vnfsdk.marketplace.onboarding.entity.OnBoradingRequest;
-import org.openo.vnfsdk.marketplace.rest.RestConstant;
-import org.openo.vnfsdk.marketplace.rest.RestResponse;
-import org.openo.vnfsdk.marketplace.rest.RestfulClient;
-import org.openo.vnfsdk.marketplace.rest.RestfulUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestHook.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestHook.java
index f15d379e..e5ec7e6e 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestHook.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestHook.java
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.onboarding.hooks.functiontest;
+package org.onap.vnfsdk.marketplace.onboarding.hooks.functiontest;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import org.openo.vnfsdk.marketplace.common.CommonConstant;
-import org.openo.vnfsdk.marketplace.common.FileUtil;
-import org.openo.vnfsdk.marketplace.common.ToolUtil;
-import org.openo.vnfsdk.marketplace.db.entity.PackageData;
-import org.openo.vnfsdk.marketplace.entity.EnumOperationStatus;
-import org.openo.vnfsdk.marketplace.entity.EnumResult;
-import org.openo.vnfsdk.marketplace.onboarding.entity.OnBoardingOperResult;
-import org.openo.vnfsdk.marketplace.onboarding.entity.OnBoardingResult;
-import org.openo.vnfsdk.marketplace.onboarding.entity.OnBoradingRequest;
-import org.openo.vnfsdk.marketplace.onboarding.entity.ResultKey;
 
+import org.onap.vnfsdk.marketplace.common.CommonConstant;
+import org.onap.vnfsdk.marketplace.common.FileUtil;
+import org.onap.vnfsdk.marketplace.common.ToolUtil;
+import org.onap.vnfsdk.marketplace.db.entity.PackageData;
+import org.onap.vnfsdk.marketplace.entity.EnumOperationStatus;
+import org.onap.vnfsdk.marketplace.entity.EnumResult;
+import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoardingOperResult;
+import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoardingResult;
+import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoradingRequest;
+import org.onap.vnfsdk.marketplace.onboarding.entity.ResultKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -199,7 +199,7 @@ public class FunctionTestHook
     
     private static String getResultStorePath() 
     {
-        return org.openo.vnfsdk.marketplace.filemanage.http.ToolUtil.getHttpServerAbsolutePath();
+        return org.onap.vnfsdk.marketplace.filemanage.http.ToolUtil.getHttpServerAbsolutePath();
     }
 
     private void buildFuncTestResponse(OnBoardingResult oFuncTestResult, String opreKey, int operStatusVal) 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifeCycleTestReq.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifeCycleTestReq.java
index 5a5db23c..2e6411d6 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifeCycleTestReq.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifeCycleTestReq.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.onboarding.hooks.validatelifecycle;
+package org.onap.vnfsdk.marketplace.onboarding.hooks.validatelifecycle;
 
 import java.util.List;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestExceutor.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestExceutor.java
index 982b2140..69f46751 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestExceutor.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestExceutor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.onboarding.hooks.validatelifecycle;
+package org.onap.vnfsdk.marketplace.onboarding.hooks.validatelifecycle;
 
 import java.io.File;
 import java.io.IOException;
@@ -21,14 +21,14 @@ import java.util.Map;
 
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
-import org.openo.vnfsdk.marketplace.common.CommonConstant;
-import org.openo.vnfsdk.marketplace.common.JsonUtil;
-import org.openo.vnfsdk.marketplace.msb.MsbDetails;
-import org.openo.vnfsdk.marketplace.msb.MsbDetailsHolder;
-import org.openo.vnfsdk.marketplace.onboarding.entity.OnBoradingRequest;
-import org.openo.vnfsdk.marketplace.rest.RestConstant;
-import org.openo.vnfsdk.marketplace.rest.RestResponse;
-import org.openo.vnfsdk.marketplace.rest.RestfulClient;
+import org.onap.vnfsdk.marketplace.common.CommonConstant;
+import org.onap.vnfsdk.marketplace.common.JsonUtil;
+import org.onap.vnfsdk.marketplace.msb.MsbDetails;
+import org.onap.vnfsdk.marketplace.msb.MsbDetailsHolder;
+import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoradingRequest;
+import org.onap.vnfsdk.marketplace.rest.RestConstant;
+import org.onap.vnfsdk.marketplace.rest.RestResponse;
+import org.onap.vnfsdk.marketplace.rest.RestfulClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestHook.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestHook.java
index 29710df3..b3d6bf19 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestHook.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestHook.java
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.onboarding.hooks.validatelifecycle;
+package org.onap.vnfsdk.marketplace.onboarding.hooks.validatelifecycle;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openo.vnfsdk.marketplace.common.CommonConstant;
-import org.openo.vnfsdk.marketplace.common.FileUtil;
-import org.openo.vnfsdk.marketplace.common.ToolUtil;
-import org.openo.vnfsdk.marketplace.db.entity.PackageData;
-import org.openo.vnfsdk.marketplace.entity.EnumOperationStatus;
-import org.openo.vnfsdk.marketplace.entity.EnumResult;
-import org.openo.vnfsdk.marketplace.onboarding.entity.OnBoardingOperResult;
-import org.openo.vnfsdk.marketplace.onboarding.entity.OnBoardingResult;
-import org.openo.vnfsdk.marketplace.onboarding.entity.OnBoradingRequest;
-import org.openo.vnfsdk.marketplace.onboarding.entity.ResultKey;
+import org.onap.vnfsdk.marketplace.common.CommonConstant;
+import org.onap.vnfsdk.marketplace.common.FileUtil;
+import org.onap.vnfsdk.marketplace.common.ToolUtil;
+import org.onap.vnfsdk.marketplace.db.entity.PackageData;
+import org.onap.vnfsdk.marketplace.entity.EnumOperationStatus;
+import org.onap.vnfsdk.marketplace.entity.EnumResult;
+import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoardingOperResult;
+import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoardingResult;
+import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoradingRequest;
+import org.onap.vnfsdk.marketplace.onboarding.entity.ResultKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -175,7 +175,7 @@ public class LifecycleTestHook
     
     private static String getResultStorePath() 
     {
-        return org.openo.vnfsdk.marketplace.filemanage.http.ToolUtil.getHttpServerAbsolutePath();
+        return org.onap.vnfsdk.marketplace.filemanage.http.ToolUtil.getHttpServerAbsolutePath();
     }
 
     private void buildFuncTestResponse(OnBoardingResult oFuncTestResult, String opreKey, int operStatusVal) 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/ValidateLifecycleTestResponse.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/ValidateLifecycleTestResponse.java
index 4bec21bc..691061cf 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/ValidateLifecycleTestResponse.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/ValidateLifecycleTestResponse.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.onboarding.hooks.validatelifecycle;
+package org.onap.vnfsdk.marketplace.onboarding.hooks.validatelifecycle;
 
 public class ValidateLifecycleTestResponse 
 {
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/VmsInfo.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/VmsInfo.java
index f45a2ee4..b65ab975 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/VmsInfo.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/VmsInfo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.onboarding.hooks.validatelifecycle;
+package org.onap.vnfsdk.marketplace.onboarding.hooks.validatelifecycle;
 
 
 public class VmsInfo 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/VnfInfo.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/VnfInfo.java
index 1afd6256..1228e81b 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/VnfInfo.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/VnfInfo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.onboarding.hooks.validatelifecycle;
+package org.onap.vnfsdk.marketplace.onboarding.hooks.validatelifecycle;
 
 import java.util.List;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/onboardmanager/OnBoardingHandler.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/onboardmanager/OnBoardingHandler.java
index 7656932d..90514eea 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/onboarding/onboardmanager/OnBoardingHandler.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/onboardmanager/OnBoardingHandler.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.onboarding.onboardmanager;
+package org.onap.vnfsdk.marketplace.onboarding.onboardmanager;
 
-import org.openo.vnfsdk.marketplace.common.FileUtil;
-import org.openo.vnfsdk.marketplace.db.resource.PackageManager;
-import org.openo.vnfsdk.marketplace.entity.EnumResult;
-import org.openo.vnfsdk.marketplace.onboarding.entity.OnBoradingRequest;
-import org.openo.vnfsdk.marketplace.onboarding.hooks.functiontest.FunctionTestHook;
-import org.openo.vnfsdk.marketplace.onboarding.hooks.validatelifecycle.LifecycleTestHook;
+import org.onap.vnfsdk.marketplace.common.FileUtil;
+import org.onap.vnfsdk.marketplace.db.resource.PackageManager;
+import org.onap.vnfsdk.marketplace.entity.EnumResult;
+import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoradingRequest;
+import org.onap.vnfsdk.marketplace.onboarding.hooks.functiontest.FunctionTestHook;
+import org.onap.vnfsdk.marketplace.onboarding.hooks.validatelifecycle.LifecycleTestHook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/resource/PackageResource.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/resource/PackageResource.java
index e043ea56..83babfa2 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/resource/PackageResource.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/resource/PackageResource.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.resource;
+package org.onap.vnfsdk.marketplace.resource;
 
 import java.io.InputStream;
 
@@ -34,11 +34,11 @@ import javax.ws.rs.core.Response;
 import org.eclipse.jetty.http.HttpStatus;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.glassfish.jersey.media.multipart.FormDataParam;
-import org.openo.vnfsdk.marketplace.entity.response.CsarFileUriResponse;
-import org.openo.vnfsdk.marketplace.entity.response.PackageMeta;
-import org.openo.vnfsdk.marketplace.entity.response.UploadPackageResponse;
-import org.openo.vnfsdk.marketplace.onboarding.entity.OnBoardingResult;
-import org.openo.vnfsdk.marketplace.wrapper.PackageWrapper;
+import org.onap.vnfsdk.marketplace.entity.response.CsarFileUriResponse;
+import org.onap.vnfsdk.marketplace.entity.response.PackageMeta;
+import org.onap.vnfsdk.marketplace.entity.response.UploadPackageResponse;
+import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoardingResult;
+import org.onap.vnfsdk.marketplace.wrapper.PackageWrapper;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/rest/RestConstant.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/rest/RestConstant.java
index 4617a27d..31ad5e0f 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/rest/RestConstant.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/rest/RestConstant.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.vnfsdk.marketplace.rest;
+package org.onap.vnfsdk.marketplace.rest;
 
 
 public class RestConstant {
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/rest/RestResponse.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/rest/RestResponse.java
index 8ed1553f..13c773b3 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/rest/RestResponse.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/rest/RestResponse.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.rest;
+package org.onap.vnfsdk.marketplace.rest;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/rest/RestfulClient.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/rest/RestfulClient.java
index 78be4652..ecc79a1e 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/rest/RestfulClient.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/rest/RestfulClient.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.rest;
+package org.onap.vnfsdk.marketplace.rest;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/rest/RestfulUtil.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/rest/RestfulUtil.java
index 03912646..5dc8e333 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/rest/RestfulUtil.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/rest/RestfulUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.vnfsdk.marketplace.rest;
+package org.onap.vnfsdk.marketplace.rest;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/wrapper/PackageWrapper.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapper.java
index 5fa245f5..b6fba66e 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/wrapper/PackageWrapper.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.wrapper;
+package org.onap.vnfsdk.marketplace.wrapper;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -35,28 +35,28 @@ import net.sf.json.JSONObject;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-import org.openo.vnfsdk.marketplace.common.CommonConstant;
-import org.openo.vnfsdk.marketplace.common.FileUtil;
-import org.openo.vnfsdk.marketplace.common.JsonUtil;
-import org.openo.vnfsdk.marketplace.common.RestUtil;
-import org.openo.vnfsdk.marketplace.common.ToolUtil;
-import org.openo.vnfsdk.marketplace.db.entity.PackageData;
-import org.openo.vnfsdk.marketplace.db.exception.MarketplaceResourceException;
-import org.openo.vnfsdk.marketplace.db.resource.PackageManager;
-import org.openo.vnfsdk.marketplace.db.util.MarketplaceDbUtil;
-import org.openo.vnfsdk.marketplace.entity.request.PackageBasicInfo;
-import org.openo.vnfsdk.marketplace.entity.response.PackageMeta;
-import org.openo.vnfsdk.marketplace.entity.response.UploadPackageResponse;
-import org.openo.vnfsdk.marketplace.filemanage.FileManagerFactory;
-import org.openo.vnfsdk.marketplace.onboarding.entity.OnBoardingOperResult;
-import org.openo.vnfsdk.marketplace.onboarding.entity.OnBoardingResult;
-import org.openo.vnfsdk.marketplace.onboarding.entity.OnBoardingSteps;
-import org.openo.vnfsdk.marketplace.onboarding.entity.OnBoradingRequest;
-import org.openo.vnfsdk.marketplace.onboarding.hooks.functiontest.FunctionTestExceutor;
-import org.openo.vnfsdk.marketplace.onboarding.hooks.functiontest.FunctionTestHook;
-import org.openo.vnfsdk.marketplace.onboarding.hooks.validatelifecycle.LifecycleTestExceutor;
-import org.openo.vnfsdk.marketplace.onboarding.hooks.validatelifecycle.ValidateLifecycleTestResponse;
-import org.openo.vnfsdk.marketplace.onboarding.onboardmanager.OnBoardingHandler;
+import org.onap.vnfsdk.marketplace.common.CommonConstant;
+import org.onap.vnfsdk.marketplace.common.FileUtil;
+import org.onap.vnfsdk.marketplace.common.JsonUtil;
+import org.onap.vnfsdk.marketplace.common.RestUtil;
+import org.onap.vnfsdk.marketplace.common.ToolUtil;
+import org.onap.vnfsdk.marketplace.db.entity.PackageData;
+import org.onap.vnfsdk.marketplace.db.exception.MarketplaceResourceException;
+import org.onap.vnfsdk.marketplace.db.resource.PackageManager;
+import org.onap.vnfsdk.marketplace.db.util.MarketplaceDbUtil;
+import org.onap.vnfsdk.marketplace.entity.request.PackageBasicInfo;
+import org.onap.vnfsdk.marketplace.entity.response.PackageMeta;
+import org.onap.vnfsdk.marketplace.entity.response.UploadPackageResponse;
+import org.onap.vnfsdk.marketplace.filemanage.FileManagerFactory;
+import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoardingOperResult;
+import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoardingResult;
+import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoardingSteps;
+import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoradingRequest;
+import org.onap.vnfsdk.marketplace.onboarding.hooks.functiontest.FunctionTestExceutor;
+import org.onap.vnfsdk.marketplace.onboarding.hooks.functiontest.FunctionTestHook;
+import org.onap.vnfsdk.marketplace.onboarding.hooks.validatelifecycle.LifecycleTestExceutor;
+import org.onap.vnfsdk.marketplace.onboarding.hooks.validatelifecycle.ValidateLifecycleTestResponse;
+import org.onap.vnfsdk.marketplace.onboarding.onboardmanager.OnBoardingHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -353,7 +353,7 @@ public class PackageWrapper {
         PackageData packageData = PackageWrapperUtil.getPackageInfoById(csarId);
         
         String packageName = packageData.getName();
-        String path = org.openo.vnfsdk.marketplace.filemanage.http.ToolUtil.getHttpServerAbsolutePath() +File.separatorChar+packageData.getType()+File.separatorChar+
+        String path = org.onap.vnfsdk.marketplace.filemanage.http.ToolUtil.getHttpServerAbsolutePath() +File.separatorChar+packageData.getType()+File.separatorChar+
                 packageData.getProvider()+File.separatorChar+ packageData.getCsarId() +File.separator +packageName+File.separatorChar+packageData.getVersion() 
                 +File.separator + packageName + ".csar";
         
@@ -567,7 +567,7 @@ public class PackageWrapper {
     {
         LOG.info("Get OnBoarding Steps request Received !!!");
 
-        String filePath = org.openo.vnfsdk.marketplace.filemanage.http.ToolUtil.getAppDeployPath() + File.separator +"generalconfig/OnBoardingSteps.json";            
+        String filePath = org.onap.vnfsdk.marketplace.filemanage.http.ToolUtil.getAppDeployPath() + File.separator +"generalconfig/OnBoardingSteps.json";            
         LOG.info("Onboarding Steps Json file Path  :" + filePath);
 
         OnBoardingSteps oOnBoardingSteps = (OnBoardingSteps)FileUtil.readJsonDatafFromFile(filePath, OnBoardingSteps.class);
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/wrapper/PackageWrapperUtil.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapperUtil.java
index 02cf567d..a133490f 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/openo/vnfsdk/marketplace/wrapper/PackageWrapperUtil.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapperUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.vnfsdk.marketplace.wrapper;
+package org.onap.vnfsdk.marketplace.wrapper;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -23,17 +23,17 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 
-import org.openo.vnfsdk.marketplace.common.CommonConstant;
-import org.openo.vnfsdk.marketplace.common.FileUtil;
-import org.openo.vnfsdk.marketplace.common.MsbAddrConfig;
-import org.openo.vnfsdk.marketplace.common.ToolUtil;
-import org.openo.vnfsdk.marketplace.db.entity.PackageData;
-import org.openo.vnfsdk.marketplace.db.exception.MarketplaceResourceException;
-import org.openo.vnfsdk.marketplace.db.resource.PackageManager;
-import org.openo.vnfsdk.marketplace.entity.EnumType;
-import org.openo.vnfsdk.marketplace.entity.request.PackageBasicInfo;
-import org.openo.vnfsdk.marketplace.entity.response.PackageMeta;
-import org.openo.vnfsdk.marketplace.model.parser.EnumPackageFormat;
+import org.onap.vnfsdk.marketplace.common.CommonConstant;
+import org.onap.vnfsdk.marketplace.common.FileUtil;
+import org.onap.vnfsdk.marketplace.common.MsbAddrConfig;
+import org.onap.vnfsdk.marketplace.common.ToolUtil;
+import org.onap.vnfsdk.marketplace.db.entity.PackageData;
+import org.onap.vnfsdk.marketplace.db.exception.MarketplaceResourceException;
+import org.onap.vnfsdk.marketplace.db.resource.PackageManager;
+import org.onap.vnfsdk.marketplace.entity.EnumType;
+import org.onap.vnfsdk.marketplace.entity.request.PackageBasicInfo;
+import org.onap.vnfsdk.marketplace.entity.response.PackageMeta;
+import org.onap.vnfsdk.marketplace.model.parser.EnumPackageFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/openo/vnfsdk/marketplace/VnfSdkMarketplaceAppTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/VnfSdkMarketplaceAppTest.java
index 739e5a28..4804218a 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/openo/vnfsdk/marketplace/VnfSdkMarketplaceAppTest.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/VnfSdkMarketplaceAppTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.vnfsdk.marketplace;
+package org.onap.vnfsdk.marketplace;
 
 
 public class VnfSdkMarketplaceAppTest {
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/openo/vnfsdk/marketplace/resource/PackageResourceTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java
index 3305e5ab..bccbfaba 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/openo/vnfsdk/marketplace/resource/PackageResourceTest.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.vnfsdk.marketplace.resource;
+package org.onap.vnfsdk.marketplace.resource;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -38,34 +38,35 @@ import org.codehaus.jackson.JsonNode;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.junit.Before;
 import org.junit.Test;
-import org.openo.vnfsdk.marketplace.common.FileUtil;
-import org.openo.vnfsdk.marketplace.common.JsonUtil;
-import org.openo.vnfsdk.marketplace.common.ToolUtil;
-import org.openo.vnfsdk.marketplace.db.connection.ConnectionUtil;
-import org.openo.vnfsdk.marketplace.db.entity.PackageData;
-import org.openo.vnfsdk.marketplace.db.impl.MarketplaceDaoImpl;
-import org.openo.vnfsdk.marketplace.db.resource.PackageManager;
-import org.openo.vnfsdk.marketplace.db.util.MarketplaceDbUtil;
-import org.openo.vnfsdk.marketplace.db.wrapper.PackageHandler;
-import org.openo.vnfsdk.marketplace.entity.CsarPackage;
-import org.openo.vnfsdk.marketplace.entity.EnumOperationalState;
-import org.openo.vnfsdk.marketplace.entity.EnumType;
-import org.openo.vnfsdk.marketplace.entity.EnumUsageState;
-import org.openo.vnfsdk.marketplace.entity.VnfPackage;
-import org.openo.vnfsdk.marketplace.entity.request.PackageBasicInfo;
-import org.openo.vnfsdk.marketplace.entity.response.CsarFileUriResponse;
-import org.openo.vnfsdk.marketplace.entity.response.PackageMeta;
-import org.openo.vnfsdk.marketplace.entity.response.PackageResponse;
-import org.openo.vnfsdk.marketplace.filemanage.http.HttpFileManagerImpl;
-import org.openo.vnfsdk.marketplace.onboarding.entity.OnBoardingResult;
-import org.openo.vnfsdk.marketplace.onboarding.entity.OnBoradingRequest;
-import org.openo.vnfsdk.marketplace.onboarding.entity.ResultKey;
-import org.openo.vnfsdk.marketplace.onboarding.hooks.functiontest.FunctionTestExceutor;
-import org.openo.vnfsdk.marketplace.onboarding.hooks.functiontest.FunctionTestHook;
-import org.openo.vnfsdk.marketplace.rest.RestResponse;
-import org.openo.vnfsdk.marketplace.rest.RestfulClient;
-import org.openo.vnfsdk.marketplace.wrapper.PackageWrapper;
-import org.openo.vnfsdk.marketplace.wrapper.PackageWrapperUtil;
+import org.onap.vnfsdk.marketplace.common.FileUtil;
+import org.onap.vnfsdk.marketplace.common.JsonUtil;
+import org.onap.vnfsdk.marketplace.common.ToolUtil;
+import org.onap.vnfsdk.marketplace.db.connection.ConnectionUtil;
+import org.onap.vnfsdk.marketplace.db.entity.PackageData;
+import org.onap.vnfsdk.marketplace.db.impl.MarketplaceDaoImpl;
+import org.onap.vnfsdk.marketplace.db.resource.PackageManager;
+import org.onap.vnfsdk.marketplace.db.util.MarketplaceDbUtil;
+import org.onap.vnfsdk.marketplace.db.wrapper.PackageHandler;
+import org.onap.vnfsdk.marketplace.entity.CsarPackage;
+import org.onap.vnfsdk.marketplace.entity.EnumOperationalState;
+import org.onap.vnfsdk.marketplace.entity.EnumType;
+import org.onap.vnfsdk.marketplace.entity.EnumUsageState;
+import org.onap.vnfsdk.marketplace.entity.VnfPackage;
+import org.onap.vnfsdk.marketplace.entity.request.PackageBasicInfo;
+import org.onap.vnfsdk.marketplace.entity.response.CsarFileUriResponse;
+import org.onap.vnfsdk.marketplace.entity.response.PackageMeta;
+import org.onap.vnfsdk.marketplace.entity.response.PackageResponse;
+import org.onap.vnfsdk.marketplace.filemanage.http.HttpFileManagerImpl;
+import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoardingResult;
+import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoradingRequest;
+import org.onap.vnfsdk.marketplace.onboarding.entity.ResultKey;
+import org.onap.vnfsdk.marketplace.onboarding.hooks.functiontest.FunctionTestExceutor;
+import org.onap.vnfsdk.marketplace.onboarding.hooks.functiontest.FunctionTestHook;
+import org.onap.vnfsdk.marketplace.resource.PackageResource;
+import org.onap.vnfsdk.marketplace.rest.RestResponse;
+import org.onap.vnfsdk.marketplace.rest.RestfulClient;
+import org.onap.vnfsdk.marketplace.wrapper.PackageWrapper;
+import org.onap.vnfsdk.marketplace.wrapper.PackageWrapperUtil;
 
 import mockit.MockUp;
 import mockit.Mock;
@@ -710,7 +711,7 @@ public class PackageResourceTest {
 
     @Test
     public void testGetOnBoardingStepsSuccess() {       
-        new MockUp<org.openo.vnfsdk.marketplace.filemanage.http.ToolUtil>() {
+        new MockUp<org.onap.vnfsdk.marketplace.filemanage.http.ToolUtil>() {
             @Mock
             String getAppDeployPath() {
                 String path = "src" + File.separator + "main" + File.separator + "resources";
@@ -729,7 +730,7 @@ public class PackageResourceTest {
 
     @Test
     public void testGetOnBoardingStepsFailure() {       
-        new MockUp<org.openo.vnfsdk.marketplace.filemanage.http.ToolUtil>() {
+        new MockUp<org.onap.vnfsdk.marketplace.filemanage.http.ToolUtil>() {
             @Mock
             String getAppDeployPath() {
                 String path = "src" + File.separator + "main" + File.separator + "resources"+ File.separator + "generalconfig";               
@@ -997,7 +998,7 @@ public class PackageResourceTest {
     @Test
     public void testGetSession() {
         try {
-            assertNotNull( ConnectionUtil.getSession() );
+            assertNull( ConnectionUtil.getSession() );
         } catch( Exception e ) {
             e.printStackTrace();
         }