Correct maven pom groupId

Correct the mismatch between gerrit project directory and wiki groupid definition.

Change-Id: I35035c67dc654e7383c5e9951f1f72986c588d57
Issue-Id:VFC-86
Signed-off-by: victor.gao <victor.gao@huawei.com>

52 files changed, 227 insertions, 227 deletions

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/ResourceUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/ResourceUtilTest.java
index 26de39a..cb2680e 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/ResourceUtilTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/ResourceUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common;
+package org.onap.vfc.nfvo.resmanagement.common;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -25,7 +25,7 @@ import java.lang.reflect.Modifier;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
 
 
 public class ResourceUtilTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/VimUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/VimUtilTest.java
index db2b30d..6d15bbc 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/VimUtilTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/VimUtilTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.common;
+package org.onap.vfc.nfvo.resmanagement.common;
 
 import static org.junit.Assert.*;
 
@@ -21,9 +21,9 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.VimUtil;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.common.VimUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
 import org.openo.baseservice.roa.util.restclient.RestfulOptions;
 import org.openo.baseservice.roa.util.restclient.RestfulParametes;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/JsonUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/JsonUtilTest.java
index 9124fc7..1f7c8a1 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/JsonUtilTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/JsonUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util;
+package org.onap.vfc.nfvo.resmanagement.common.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -24,7 +24,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import mockit.Mock;
 import mockit.MockUp;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/RestfulUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtilTest.java
index 4483316..8947985 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/RestfulUtilTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util;
+package org.onap.vfc.nfvo.resmanagement.common.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -23,8 +23,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.constant.Constant;
-import org.onap.vfc.nfvo.res.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.Constant;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.openo.baseservice.roa.util.restclient.RestfulOptions;
 import org.openo.baseservice.roa.util.restclient.RestfulParametes;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/StringUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/StringUtilTest.java
index cc5f42c..05fb52e 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/StringUtilTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/StringUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util;
+package org.onap.vfc.nfvo.resmanagement.common.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -24,7 +24,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.StringUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.StringUtil;
 
 public class StringUtilTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/request/RequestUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/request/RequestUtilTest.java
index dafc9e4..26feb0e 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/request/RequestUtilTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/request/RequestUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util.request;
+package org.onap.vfc.nfvo.resmanagement.common.util.request;
 
 import static org.junit.Assert.*;
 
@@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.io.IOUtils;
 import org.apache.cxf.jaxrs.impl.HttpServletRequestFilter;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
 
 import javassist.Modifier;
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/response/ResponseUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/response/ResponseUtilTest.java
index 6cef0c3..a62e61e 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/response/ResponseUtilTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/response/ResponseUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util.response;
+package org.onap.vfc.nfvo.resmanagement.common.util.response;
 
 import static org.junit.Assert.*;
 
@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/response/RoaResponseUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/response/RoaResponseUtilTest.java
index 9b69944..d8f8a8e 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/response/RoaResponseUtilTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/response/RoaResponseUtilTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util.response;
+package org.onap.vfc.nfvo.resmanagement.common.util.response;
 
 import static org.junit.Assert.*;
 
@@ -23,8 +23,8 @@ import java.lang.reflect.Modifier;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil;
-import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
 
 import mockit.Mock;
 import mockit.MockUp;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java
index 0855f9b..0bcdb81 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.adapter.impl;
+package org.onap.vfc.nfvo.resmanagement.service.adapter.impl;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -22,8 +22,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.RestfulUtil;
-import org.onap.vfc.nfvo.res.service.adapter.impl.ResmgrAdapter2MSBManager;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.service.adapter.impl.ResmgrAdapter2MSBManager;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapterMgrServiceTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java
index d045149..24200e8 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapterMgrServiceTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.adapter.impl;
+package org.onap.vfc.nfvo.resmanagement.service.adapter.impl;
 
 import java.io.IOException;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.adapter.impl.ResmgrAdapterMgrService;
+import org.onap.vfc.nfvo.resmanagement.service.adapter.impl.ResmgrAdapterMgrService;
 
 import mockit.Mock;
 import mockit.MockUp;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/HostImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/HostImplTest.java
index 827a56d..8e5dcc4 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/HostImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/HostImplTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import static org.junit.Assert.*;
 
@@ -22,10 +22,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.HostImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.HostBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.HostDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.HostImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.HostBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.HostDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/LocationImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImplTest.java
index 4bf8763..803d421 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/LocationImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImplTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import static org.junit.Assert.assertTrue;
 
@@ -25,13 +25,13 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.LocationImpl;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.SitesImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.LocationBusinessImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.SitesBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.LocationDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.LocationImpl;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.SitesImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.LocationBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.SitesBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.LocationDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/NetworkImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImplTest.java
index 478e6ef..a94e994 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/NetworkImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImplTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import static org.junit.Assert.*;
 
@@ -23,11 +23,11 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.NetworkImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.NetworkBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.NetworkDaoImpl;
-import org.onap.vfc.nfvo.res.service.dao.inf.NetworkDao;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.NetworkImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.NetworkBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.NetworkDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.NetworkDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/PortImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImplTest.java
index a7ea6c4..ae482f4 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/PortImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImplTest.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.PortImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.PortBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.PortDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.PortImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.PortBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.PortDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/SitesImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImplTest.java
index ea7aa28..95bbca7 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/SitesImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImplTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import static org.junit.Assert.assertEquals;
 
@@ -24,9 +24,9 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.SitesImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.SitesBusinessImpl;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.SitesImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.SitesBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/VimImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/VimImplTest.java
index 9205d30..28a7344 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/VimImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/VimImplTest.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.List;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.VimImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.VimBusinessImpl;
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.VimImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.VimBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/HostBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImplTest.java
index 4197de9..18ade35 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/HostBusinessImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImplTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.business.impl.HostBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.HostDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.HostBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.HostDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/LimitsBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImplTest.java
index 6c2f849..c5c9d78 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/LimitsBusinessImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImplTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.business.impl.LimitsBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.LimitsBusinessImpl;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.openo.baseservice.roa.util.restclient.HttpRest;
 import org.openo.baseservice.roa.util.restclient.RestfulOptions;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/LocationBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImplTest.java
index 35126cd..70ba66e 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/LocationBusinessImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImplTest.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.business.impl.LocationBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.LocationDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.LocationBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.LocationDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/SitesBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java
index ae86558..ce33e8f 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/SitesBusinessImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -27,9 +27,9 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.business.impl.SitesBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.SitesDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.SitesBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.SitesDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/VimBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java
index 6de3741..c36aaf2 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/VimBusinessImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -22,9 +22,9 @@ import static org.junit.Assert.assertTrue;
 import java.util.List;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.business.impl.VimBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.VimDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.VimBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.VimDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/HostDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/HostDaoImplTest.java
index 3aac705..9ec2c8d 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/HostDaoImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/HostDaoImplTest.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.HostDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-import org.onap.vfc.nfvo.res.service.mapper.HostMapper;
-import org.onap.vfc.nfvo.res.service.mapper.NetworkMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.HostDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.HostMapper;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Expectations;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/LocationDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/LocationDaoImplTest.java
index c131bd1..908dd5c 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/LocationDaoImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/LocationDaoImplTest.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.LocationDaoImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.NetworkDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-import org.onap.vfc.nfvo.res.service.mapper.LocationMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.LocationDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.NetworkDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.LocationMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/NetworkDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/NetworkDaoImplTest.java
index a366b8f..88117fa 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/NetworkDaoImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/NetworkDaoImplTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
@@ -22,10 +22,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.NetworkDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-import org.onap.vfc.nfvo.res.service.mapper.NetworkMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.NetworkDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Expectations;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/PortDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/PortDaoImplTest.java
index 1cb4de8..efb633c 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/PortDaoImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/PortDaoImplTest.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.PortDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
-import org.onap.vfc.nfvo.res.service.mapper.NetworkMapper;
-import org.onap.vfc.nfvo.res.service.mapper.PortMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.PortDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.PortMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Expectations;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/SitesDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/SitesDaoImplTest.java
index 763ce16..0944936 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/SitesDaoImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/SitesDaoImplTest.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.SitesDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
-import org.onap.vfc.nfvo.res.service.mapper.NetworkMapper;
-import org.onap.vfc.nfvo.res.service.mapper.SitesMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.SitesDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.SitesMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Expectations;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VimDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VimDaoImplTest.java
index 3c393f6..8adf0c8 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VimDaoImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VimDaoImplTest.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import java.util.List;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.VimDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
-import org.onap.vfc.nfvo.res.service.mapper.VimMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.VimDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VimMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Expectations;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VirtualLinkDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImplTest.java
index 839b4b3..fa7fb54 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VirtualLinkDaoImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImplTest.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.VirtualLinkDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity;
-import org.onap.vfc.nfvo.res.service.mapper.SitesMapper;
-import org.onap.vfc.nfvo.res.service.mapper.VirtualLinkMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.VirtualLinkDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.SitesMapper;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VirtualLinkMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VmDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VmDaoImplTest.java
index 5b53db4..07ac61c 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VmDaoImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VmDaoImplTest.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.VmDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.VmEntity;
-import org.onap.vfc.nfvo.res.service.mapper.SitesMapper;
-import org.onap.vfc.nfvo.res.service.mapper.VmMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.VmDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.SitesMapper;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VmMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/HostEntityTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/HostEntityTest.java
index 4a1574b..cbbccff 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/HostEntityTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/HostEntityTest.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/LocationEntityTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/LocationEntityTest.java
index 7e708ed..576101a 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/LocationEntityTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/LocationEntityTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/NetworkEntityTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/NetworkEntityTest.java
index 1bd94c1..4ce309b 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/NetworkEntityTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/NetworkEntityTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/PortEntityTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/PortEntityTest.java
index 0826514..6eef4c9 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/PortEntityTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/PortEntityTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/SitesEntityTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/SitesEntityTest.java
index d20c714..6d22897 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/SitesEntityTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/SitesEntityTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/VimEntityTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/VimEntityTest.java
index 98e5994..e204c0f 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/VimEntityTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/VimEntityTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 
 import net.sf.json.JSONObject;
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/GrantResourseRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java
index 9c5087b..952ca90 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/GrantResourseRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package org.onap.vfc.nfvo.res.service.rest;

+package org.onap.vfc.nfvo.resmanagement.service.rest;

 

 import static org.junit.Assert.assertNotNull;

 

@@ -22,10 +22,10 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.group.impl.GrantResServiceImpl;

-import org.onap.vfc.nfvo.res.service.group.inf.GrantResService;

-import org.onap.vfc.nfvo.res.service.rest.GrantResourseRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.group.impl.GrantResServiceImpl;

+import org.onap.vfc.nfvo.resmanagement.service.group.inf.GrantResService;

+import org.onap.vfc.nfvo.resmanagement.service.rest.GrantResourseRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/HostRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.java
index ef697ce..72e79d7 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/HostRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package org.onap.vfc.nfvo.res.service.rest;

+package org.onap.vfc.nfvo.resmanagement.service.rest;

 

 import static org.junit.Assert.assertNotNull;

 

@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.base.openstack.impl.HostImpl;

-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Host;

-import org.onap.vfc.nfvo.res.service.entity.HostEntity;

-import org.onap.vfc.nfvo.res.service.rest.HostRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.HostImpl;

+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Host;

+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;

+import org.onap.vfc.nfvo.resmanagement.service.rest.HostRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/LimitsRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.java
index 757856b..391aad3 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/LimitsRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package org.onap.vfc.nfvo.res.service.rest;

+package org.onap.vfc.nfvo.resmanagement.service.rest;

 

 import static org.junit.Assert.assertNotNull;

 

@@ -22,9 +22,9 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.service.business.impl.LimitsBusinessImpl;

-import org.onap.vfc.nfvo.res.service.business.inf.LimitsBusiness;

-import org.onap.vfc.nfvo.res.service.rest.LimitsRoa;

+import org.onap.vfc.nfvo.resmanagement.service.business.impl.LimitsBusinessImpl;

+import org.onap.vfc.nfvo.resmanagement.service.business.inf.LimitsBusiness;

+import org.onap.vfc.nfvo.resmanagement.service.rest.LimitsRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/LocationRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoaTest.java
index fc15bfc..78157f6 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/LocationRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoaTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package org.onap.vfc.nfvo.res.service.rest;

+package org.onap.vfc.nfvo.resmanagement.service.rest;

 

 import static org.junit.Assert.assertNotNull;

 

@@ -26,14 +26,14 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.base.openstack.impl.LocationImpl;

-import org.onap.vfc.nfvo.res.service.base.openstack.impl.SitesImpl;

-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Location;

-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Sites;

-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;

-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;

-import org.onap.vfc.nfvo.res.service.rest.LocationRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.LocationImpl;

+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.SitesImpl;

+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Location;

+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites;

+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;

+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;

+import org.onap.vfc.nfvo.resmanagement.service.rest.LocationRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/NetworkRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.java
index 0aef982..4536b0d 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/NetworkRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package org.onap.vfc.nfvo.res.service.rest;

+package org.onap.vfc.nfvo.resmanagement.service.rest;

 

 import static org.junit.Assert.assertNotNull;

 

@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.base.openstack.impl.NetworkImpl;

-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Network;

-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;

-import org.onap.vfc.nfvo.res.service.rest.NetworkRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.NetworkImpl;

+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Network;

+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;

+import org.onap.vfc.nfvo.resmanagement.service.rest.NetworkRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/PortRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.java
index 115a893..181e6e5 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/PortRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package org.onap.vfc.nfvo.res.service.rest;

+package org.onap.vfc.nfvo.resmanagement.service.rest;

 

 import static org.junit.Assert.assertNotNull;

 

@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.base.openstack.impl.PortImpl;

-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Port;

-import org.onap.vfc.nfvo.res.service.entity.PortEntity;

-import org.onap.vfc.nfvo.res.service.rest.PortRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.PortImpl;

+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Port;

+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;

+import org.onap.vfc.nfvo.resmanagement.service.rest.PortRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/ResOperateRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.java
index 3dffc89..aa87bf5 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/ResOperateRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package org.onap.vfc.nfvo.res.service.rest;

+package org.onap.vfc.nfvo.resmanagement.service.rest;

 

 import static org.junit.Assert.assertNotNull;

 

@@ -22,11 +22,11 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.VimUtil;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.group.impl.ResOperateServiceImpl;

-import org.onap.vfc.nfvo.res.service.group.inf.ResOperateService;

-import org.onap.vfc.nfvo.res.service.rest.ResOperateRoa;

+import org.onap.vfc.nfvo.resmanagement.common.VimUtil;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.group.impl.ResOperateServiceImpl;

+import org.onap.vfc.nfvo.resmanagement.service.group.inf.ResOperateService;

+import org.onap.vfc.nfvo.resmanagement.service.rest.ResOperateRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/SitesRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.java
index 60330c9..1a813c8 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/SitesRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -27,11 +27,11 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.VimUtil;
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.SitesImpl;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
-import org.onap.vfc.nfvo.res.service.rest.SitesRoa;
+import org.onap.vfc.nfvo.resmanagement.common.VimUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.SitesImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.rest.SitesRoa;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.springframework.mock.web.MockHttpServletRequest;
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/SwaggerRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoaTest.java
index 4e5124b..eccc4d9 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/SwaggerRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoaTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package org.onap.vfc.nfvo.res.service.rest;

+package org.onap.vfc.nfvo.resmanagement.service.rest;

 

 import static org.junit.Assert.assertNotNull;

 

@@ -23,7 +23,7 @@ import java.io.InputStream;
 

 import org.apache.commons.io.IOUtils;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.service.rest.SwaggerRoa;

+import org.onap.vfc.nfvo.resmanagement.service.rest.SwaggerRoa;

 

 import mockit.Mock;

 import mockit.MockUp;

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VirtualLinkRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java
index ff53d48..5377f60 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VirtualLinkRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package org.onap.vfc.nfvo.res.service.rest;

+package org.onap.vfc.nfvo.resmanagement.service.rest;

 

 import static org.junit.Assert.assertNotNull;

 

@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity;

-import org.onap.vfc.nfvo.res.service.group.impl.VirtualLinkServiceImpl;

-import org.onap.vfc.nfvo.res.service.group.inf.VirtualLinkService;

-import org.onap.vfc.nfvo.res.service.rest.VirtualLinkRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;

+import org.onap.vfc.nfvo.resmanagement.service.group.impl.VirtualLinkServiceImpl;

+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VirtualLinkService;

+import org.onap.vfc.nfvo.resmanagement.service.rest.VirtualLinkRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VmRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.java
index 0d7f52c..f3321fa 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VmRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package org.onap.vfc.nfvo.res.service.rest;

+package org.onap.vfc.nfvo.resmanagement.service.rest;

 

 import static org.junit.Assert.assertNotNull;

 

@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.entity.VmEntity;

-import org.onap.vfc.nfvo.res.service.group.impl.VmServiceImpl;

-import org.onap.vfc.nfvo.res.service.group.inf.VmService;

-import org.onap.vfc.nfvo.res.service.rest.VmRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;

+import org.onap.vfc.nfvo.resmanagement.service.group.impl.VmServiceImpl;

+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VmService;

+import org.onap.vfc.nfvo.resmanagement.service.rest.VmRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfInfoRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java
index 68d00dd..e6aafa6 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfInfoRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package org.onap.vfc.nfvo.res.service.rest;

+package org.onap.vfc.nfvo.resmanagement.service.rest;

 

 import static org.junit.Assert.assertNotNull;

 

@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity;

-import org.onap.vfc.nfvo.res.service.group.impl.VnfInfoServiceImpl;

-import org.onap.vfc.nfvo.res.service.group.inf.VnfInfoService;

-import org.onap.vfc.nfvo.res.service.rest.VnfInfoRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;

+import org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfInfoServiceImpl;

+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfInfoService;

+import org.onap.vfc.nfvo.resmanagement.service.rest.VnfInfoRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.java
index 112f661..099bae0 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package org.onap.vfc.nfvo.res.service.rest;

+package org.onap.vfc.nfvo.resmanagement.service.rest;

 

 import static org.junit.Assert.assertNotNull;

 

@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.entity.VnfEntity;

-import org.onap.vfc.nfvo.res.service.group.impl.VnfServiceImpl;

-import org.onap.vfc.nfvo.res.service.group.inf.VnfService;

-import org.onap.vfc.nfvo.res.service.rest.VnfRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;

+import org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfServiceImpl;

+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfService;

+import org.onap.vfc.nfvo.resmanagement.service.rest.VnfRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfStatusRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java
index a749290..61d3e6e 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfStatusRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.

  */

 

-package org.onap.vfc.nfvo.res.service.rest;

+package org.onap.vfc.nfvo.resmanagement.service.rest;

 

 import static org.junit.Assert.assertNotNull;

 

@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 

 import org.junit.Before;

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;

-import org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity;

-import org.onap.vfc.nfvo.res.service.group.impl.VnfStatusServiceImpl;

-import org.onap.vfc.nfvo.res.service.group.inf.VnfStatusService;

-import org.onap.vfc.nfvo.res.service.rest.VnfStatusRoa;

+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;

+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;

+import org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfStatusServiceImpl;

+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfStatusService;

+import org.onap.vfc.nfvo.resmanagement.service.rest.VnfStatusRoa;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 import org.springframework.mock.web.MockHttpServletRequest;

 

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ExceptionMessageTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessageTest.java
index e118918..c3a3c33 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ExceptionMessageTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessageTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.

  */

 

-package org.onap.vfc.nfvo.res.service.rest.exceptionmapper;

+package org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper;

 

 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertNotNull;

 

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.service.rest.exceptionmapper.ExceptionMessage;

+import org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper.ExceptionMessage;

 

 /**

  * <br>

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/GenericExceptionMapperTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapperTest.java
index 2b150c8..e6b4916 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/GenericExceptionMapperTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapperTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.

  */

 

-package org.onap.vfc.nfvo.res.service.rest.exceptionmapper;

+package org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper;

 

 import static org.junit.Assert.assertNotNull;

 

 import javax.ws.rs.core.Response;

 

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.service.rest.exceptionmapper.GenericExceptionMapper;

+import org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper.GenericExceptionMapper;

 

 /**

  * <br>

diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ServiceExceptionMapperTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java
index d5281bf..f465772 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ServiceExceptionMapperTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java
@@ -14,14 +14,14 @@
  * limitations under the License.

  */

 

-package org.onap.vfc.nfvo.res.service.rest.exceptionmapper;

+package org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper;

 

 import static org.junit.Assert.assertNotNull;

 

 import javax.ws.rs.core.Response;

 

 import org.junit.Test;

-import org.onap.vfc.nfvo.res.service.rest.exceptionmapper.ServiceExceptionMapper;

+import org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper.ServiceExceptionMapper;

 import org.openo.baseservice.remoteservice.exception.ServiceException;

 

 /**