diff options
author | 2017-08-16 16:45:43 +0800 | |
---|---|---|
committer | 2017-08-16 16:45:43 +0800 | |
commit | e585e291a7d1fc27541471d8bebb6fe36a72b9e7 (patch) | |
tree | 4215d55a7150385721c24f5727a194899d3665a4 /ResmanagementService/service/src/test | |
parent | ce49905d056ed097e2e9eb98efe1159b42ec0209 (diff) |
Update directory according groupid
Update openo to onap according groupid org.onap.vfc.nfvo.res.
Change-Id: I3e32d445b8e5f2bfe8caa813052a8a7ae7e128a8
Issue-Id:VFC-86
Signed-off-by: victor.gao <victor.gao@huawei.com>
Diffstat (limited to 'ResmanagementService/service/src/test')
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/ResourceUtilTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/ResourceUtilTest.java) | 3 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/VimUtilTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/VimUtilTest.java) | 7 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/JsonUtilTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/JsonUtilTest.java) | 3 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/RestfulUtilTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/RestfulUtilTest.java) | 5 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/StringUtilTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/StringUtilTest.java) | 3 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/request/RequestUtilTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/request/RequestUtilTest.java) | 3 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/response/ResponseUtilTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/response/ResponseUtilTest.java) | 3 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/response/RoaResponseUtilTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/response/RoaResponseUtilTest.java) | 4 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java) | 5 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapterMgrServiceTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java) | 3 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/HostImplTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/HostImplTest.java) | 9 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/LocationImplTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/LocationImplTest.java) | 14 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/NetworkImplTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/NetworkImplTest.java) | 11 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/PortImplTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/PortImplTest.java) | 11 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/SitesImplTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/SitesImplTest.java) | 7 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/VimImplTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/VimImplTest.java) | 8 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/HostBusinessImplTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/business/impl/HostBusinessImplTest.java) | 7 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/LimitsBusinessImplTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/business/impl/LimitsBusinessImplTest.java) | 3 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/LocationBusinessImplTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/business/impl/LocationBusinessImplTest.java) | 7 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/SitesBusinessImplTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java) | 7 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/VimBusinessImplTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java) | 7 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/HostDaoImplTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/HostDaoImplTest.java) | 12 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/LocationDaoImplTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/LocationDaoImplTest.java) | 11 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/NetworkDaoImplTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/NetworkDaoImplTest.java) | 9 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/PortDaoImplTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/PortDaoImplTest.java) | 14 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/SitesDaoImplTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/SitesDaoImplTest.java) | 12 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VimDaoImplTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/VimDaoImplTest.java) | 10 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VirtualLinkDaoImplTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImplTest.java) | 12 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VmDaoImplTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/VmDaoImplTest.java) | 10 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/HostEntityTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/HostEntityTest.java) | 3 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/LocationEntityTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/LocationEntityTest.java) | 3 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/NetworkEntityTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/NetworkEntityTest.java) | 3 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/PortEntityTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/PortEntityTest.java) | 3 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/SitesEntityTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/SitesEntityTest.java) | 3 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/VimEntityTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/VimEntityTest.java) | 3 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/GrantResourseRoaTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java) | 9 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/HostRoaTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/HostRoaTest.java) | 11 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/LimitsRoaTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/LimitsRoaTest.java) | 7 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/LocationRoaTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/LocationRoaTest.java) | 17 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/NetworkRoaTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/NetworkRoaTest.java) | 11 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/PortRoaTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/PortRoaTest.java) | 11 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/ResOperateRoaTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/ResOperateRoaTest.java) | 11 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/SitesRoaTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/SitesRoaTest.java) | 11 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/SwaggerRoaTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/SwaggerRoaTest.java) | 3 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VirtualLinkRoaTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java) | 11 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VmRoaTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VmRoaTest.java) | 11 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfInfoRoaTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java) | 11 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfRoaTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VnfRoaTest.java) | 11 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfStatusRoaTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java) | 11 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ExceptionMessageTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessageTest.java) | 3 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/GenericExceptionMapperTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapperTest.java) | 3 | ||||
-rw-r--r-- | ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ServiceExceptionMapperTest.java (renamed from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java) | 3 |
52 files changed, 228 insertions, 165 deletions
diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/ResourceUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/ResourceUtilTest.java index d162713..26de39a 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/ResourceUtilTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/ResourceUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.common; +package org.onap.vfc.nfvo.res.common; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -25,6 +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; public class ResourceUtilTest { diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/VimUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/VimUtilTest.java index 13e12e5..db2b30d 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/VimUtilTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/VimUtilTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.resmanagement.common; +package org.onap.vfc.nfvo.res.common; import static org.junit.Assert.*; @@ -21,11 +21,12 @@ 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.openo.baseservice.roa.util.restclient.RestfulOptions; import org.openo.baseservice.roa.util.restclient.RestfulParametes; import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.common.util.RestfulUtil; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/JsonUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/JsonUtilTest.java index 92b499d..9124fc7 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/JsonUtilTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/JsonUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.common.util; +package org.onap.vfc.nfvo.res.common.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -24,6 +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 mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/RestfulUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/RestfulUtilTest.java index 69bfd74..4483316 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/RestfulUtilTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/RestfulUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.common.util; +package org.onap.vfc.nfvo.res.common.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -23,11 +23,12 @@ 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.openo.baseservice.remoteservice.exception.ServiceException; import org.openo.baseservice.roa.util.restclient.RestfulOptions; import org.openo.baseservice.roa.util.restclient.RestfulParametes; import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.nfvo.resmanagement.common.constant.Constant; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/StringUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/StringUtilTest.java index 9fb9ef1..cc5f42c 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/StringUtilTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/StringUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.common.util; +package org.onap.vfc.nfvo.res.common.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -24,6 +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; public class StringUtilTest { diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/request/RequestUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/request/RequestUtilTest.java index e4d34b8..dafc9e4 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/request/RequestUtilTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/request/RequestUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.common.util.request; +package org.onap.vfc.nfvo.res.common.util.request; import static org.junit.Assert.*; @@ -33,6 +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 javassist.Modifier; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/response/ResponseUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/response/ResponseUtilTest.java index b3258f5..6cef0c3 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/response/ResponseUtilTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/response/ResponseUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.common.util.response; +package org.onap.vfc.nfvo.res.common.util.response; import static org.junit.Assert.*; @@ -24,6 +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 net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/response/RoaResponseUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/response/RoaResponseUtilTest.java index 1e30587..9b69944 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/response/RoaResponseUtilTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/response/RoaResponseUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.common.util.response; +package org.onap.vfc.nfvo.res.common.util.response; import static org.junit.Assert.*; @@ -23,6 +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 mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java index 511e509..0855f9b 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.adapter.impl; +package org.onap.vfc.nfvo.res.service.adapter.impl; import static org.junit.Assert.assertNotNull; @@ -22,8 +22,9 @@ 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.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.nfvo.resmanagement.common.util.RestfulUtil; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapterMgrServiceTest.java index 4ed114d..d045149 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapterMgrServiceTest.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.adapter.impl; +package org.onap.vfc.nfvo.res.service.adapter.impl; import java.io.IOException; import org.junit.Test; +import org.onap.vfc.nfvo.res.service.adapter.impl.ResmgrAdapterMgrService; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/HostImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/HostImplTest.java index 446c29f..827a56d 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/HostImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/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.openo.nfvo.resmanagement.service.base.openstack.impl; +package org.onap.vfc.nfvo.res.service.base.openstack.impl; import static org.junit.Assert.*; @@ -22,10 +22,11 @@ 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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.business.impl.HostBusinessImpl; -import org.openo.nfvo.resmanagement.service.dao.impl.HostDaoImpl; -import org.openo.nfvo.resmanagement.service.entity.HostEntity; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/LocationImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/LocationImplTest.java index 74dfe99..4bf8763 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/LocationImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/LocationImplTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.base.openstack.impl; +package org.onap.vfc.nfvo.res.service.base.openstack.impl; import static org.junit.Assert.assertTrue; @@ -25,12 +25,14 @@ 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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.business.impl.LocationBusinessImpl; -import org.openo.nfvo.resmanagement.service.business.impl.SitesBusinessImpl; -import org.openo.nfvo.resmanagement.service.dao.impl.LocationDaoImpl; -import org.openo.nfvo.resmanagement.service.entity.LocationEntity; -import org.openo.nfvo.resmanagement.service.entity.SitesEntity; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/NetworkImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/NetworkImplTest.java index 6222005..478e6ef 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/NetworkImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/NetworkImplTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.base.openstack.impl; +package org.onap.vfc.nfvo.res.service.base.openstack.impl; import static org.junit.Assert.*; @@ -23,11 +23,12 @@ 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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.business.impl.NetworkBusinessImpl; -import org.openo.nfvo.resmanagement.service.dao.impl.NetworkDaoImpl; -import org.openo.nfvo.resmanagement.service.dao.inf.NetworkDao; -import org.openo.nfvo.resmanagement.service.entity.NetworkEntity; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/PortImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/PortImplTest.java index 3d36011..a7ea6c4 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/PortImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/PortImplTest.java @@ -14,16 +14,17 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.base.openstack.impl; +package org.onap.vfc.nfvo.res.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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.util.JsonUtil; -import org.openo.nfvo.resmanagement.service.business.impl.PortBusinessImpl; -import org.openo.nfvo.resmanagement.service.dao.impl.PortDaoImpl; -import org.openo.nfvo.resmanagement.service.entity.PortEntity; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/SitesImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/SitesImplTest.java index 5db06a8..ea7aa28 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/SitesImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/SitesImplTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.base.openstack.impl; +package org.onap.vfc.nfvo.res.service.base.openstack.impl; import static org.junit.Assert.assertEquals; @@ -24,9 +24,10 @@ 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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.business.impl.SitesBusinessImpl; -import org.openo.nfvo.resmanagement.service.entity.SitesEntity; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/VimImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/VimImplTest.java index b21525c..9205d30 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/VimImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/VimImplTest.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.base.openstack.impl; +package org.onap.vfc.nfvo.res.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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.base.openstack.impl.VimImpl; -import org.openo.nfvo.resmanagement.service.business.impl.VimBusinessImpl; -import org.openo.nfvo.resmanagement.service.entity.VimEntity; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/business/impl/HostBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/HostBusinessImplTest.java index 1a1d142..4197de9 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/business/impl/HostBusinessImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/HostBusinessImplTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.business.impl; +package org.onap.vfc.nfvo.res.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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.dao.impl.HostDaoImpl; -import org.openo.nfvo.resmanagement.service.entity.HostEntity; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/business/impl/LimitsBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/LimitsBusinessImplTest.java index 32ec28a..6c2f849 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/business/impl/LimitsBusinessImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/LimitsBusinessImplTest.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.business.impl; +package org.onap.vfc.nfvo.res.service.business.impl; import org.junit.Before; import org.junit.Test; +import org.onap.vfc.nfvo.res.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/openo/nfvo/resmanagement/service/business/impl/LocationBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/LocationBusinessImplTest.java index 03f17b3..35126cd 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/business/impl/LocationBusinessImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/LocationBusinessImplTest.java @@ -14,15 +14,16 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.business.impl; +package org.onap.vfc.nfvo.res.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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.dao.impl.LocationDaoImpl; -import org.openo.nfvo.resmanagement.service.entity.LocationEntity; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/SitesBusinessImplTest.java index 94a0dad..ae86558 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/SitesBusinessImplTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.business.impl; +package org.onap.vfc.nfvo.res.service.business.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -27,9 +27,10 @@ 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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.dao.impl.SitesDaoImpl; -import org.openo.nfvo.resmanagement.service.entity.SitesEntity; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/VimBusinessImplTest.java index 1e35569..6de3741 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/VimBusinessImplTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.business.impl; +package org.onap.vfc.nfvo.res.service.business.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -22,9 +22,10 @@ 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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.dao.impl.VimDaoImpl; -import org.openo.nfvo.resmanagement.service.entity.VimEntity; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/HostDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/HostDaoImplTest.java index 65e7b97..3aac705 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/HostDaoImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/HostDaoImplTest.java @@ -13,16 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.HostEntity; -import org.openo.nfvo.resmanagement.service.entity.NetworkEntity; -import org.openo.nfvo.resmanagement.service.mapper.HostMapper; -import org.openo.nfvo.resmanagement.service.mapper.NetworkMapper; import mockit.Expectations; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/LocationDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/LocationDaoImplTest.java index fa56c24..c131bd1 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/LocationDaoImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/LocationDaoImplTest.java @@ -14,15 +14,18 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.LocationEntity; -import org.openo.nfvo.resmanagement.service.entity.NetworkEntity; -import org.openo.nfvo.resmanagement.service.mapper.LocationMapper; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/NetworkDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/NetworkDaoImplTest.java index d0fd3fe..a366b8f 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/NetworkDaoImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/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.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.service.dao.impl; import static org.junit.Assert.*; @@ -22,9 +22,12 @@ 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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.NetworkEntity; -import org.openo.nfvo.resmanagement.service.mapper.NetworkMapper; + import mockit.Expectations; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/PortDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/PortDaoImplTest.java index 4edcdf3..1cb4de8 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/PortDaoImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/PortDaoImplTest.java @@ -13,17 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.HostEntity; -import org.openo.nfvo.resmanagement.service.entity.NetworkEntity; -import org.openo.nfvo.resmanagement.service.entity.PortEntity; -import org.openo.nfvo.resmanagement.service.mapper.NetworkMapper; -import org.openo.nfvo.resmanagement.service.mapper.PortMapper; import mockit.Expectations; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/SitesDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/SitesDaoImplTest.java index 4deb71e..763ce16 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/SitesDaoImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/SitesDaoImplTest.java @@ -13,16 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.NetworkEntity; -import org.openo.nfvo.resmanagement.service.entity.SitesEntity; -import org.openo.nfvo.resmanagement.service.mapper.NetworkMapper; -import org.openo.nfvo.resmanagement.service.mapper.SitesMapper; import mockit.Expectations; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/VimDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VimDaoImplTest.java index 736a844..3c393f6 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/VimDaoImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VimDaoImplTest.java @@ -14,17 +14,19 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.NetworkEntity; -import org.openo.nfvo.resmanagement.service.entity.VimEntity; -import org.openo.nfvo.resmanagement.service.mapper.VimMapper; import mockit.Expectations; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VirtualLinkDaoImplTest.java index c3a3b98..839b4b3 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VirtualLinkDaoImplTest.java @@ -13,16 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.NetworkEntity; -import org.openo.nfvo.resmanagement.service.entity.VirtualLinkEntity; -import org.openo.nfvo.resmanagement.service.mapper.SitesMapper; -import org.openo.nfvo.resmanagement.service.mapper.VirtualLinkMapper; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/VmDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VmDaoImplTest.java index afb9917..5b53db4 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/VmDaoImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VmDaoImplTest.java @@ -13,15 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.VmEntity; -import org.openo.nfvo.resmanagement.service.mapper.SitesMapper; -import org.openo.nfvo.resmanagement.service.mapper.VmMapper; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/HostEntityTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/HostEntityTest.java index 119d4f2..4a1574b 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/HostEntityTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/HostEntityTest.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.entity; +package org.onap.vfc.nfvo.res.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 net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/LocationEntityTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/LocationEntityTest.java index 7998905..7e708ed 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/LocationEntityTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/LocationEntityTest.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.entity; +package org.onap.vfc.nfvo.res.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 net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/NetworkEntityTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/NetworkEntityTest.java index 35f1fdc..1bd94c1 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/NetworkEntityTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/NetworkEntityTest.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.entity; +package org.onap.vfc.nfvo.res.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 net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/PortEntityTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/PortEntityTest.java index 70fa7ad..0826514 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/PortEntityTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/PortEntityTest.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.entity; +package org.onap.vfc.nfvo.res.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 net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/SitesEntityTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/SitesEntityTest.java index 44d4dce..d20c714 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/SitesEntityTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/SitesEntityTest.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.entity; +package org.onap.vfc.nfvo.res.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 net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/VimEntityTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/VimEntityTest.java index a21642d..98e5994 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/VimEntityTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/VimEntityTest.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.entity; +package org.onap.vfc.nfvo.res.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 net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/GrantResourseRoaTest.java index 1629f8e..9c5087b 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/GrantResourseRoaTest.java @@ -14,7 +14,7 @@ * limitations under the License.
*/
-package org.openo.nfvo.resmanagement.service.rest;
+package org.onap.vfc.nfvo.res.service.rest;
import static org.junit.Assert.assertNotNull;
@@ -22,10 +22,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.group.impl.GrantResServiceImpl;
+import org.onap.vfc.nfvo.res.service.group.inf.GrantResService;
+import org.onap.vfc.nfvo.res.service.rest.GrantResourseRoa;
import org.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.nfvo.resmanagement.common.util.request.RequestUtil;
-import org.openo.nfvo.resmanagement.service.group.impl.GrantResServiceImpl;
-import org.openo.nfvo.resmanagement.service.group.inf.GrantResService;
import org.springframework.mock.web.MockHttpServletRequest;
import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/HostRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/HostRoaTest.java index bc0b8b7..ef697ce 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/HostRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/HostRoaTest.java @@ -14,7 +14,7 @@ * limitations under the License.
*/
-package org.openo.nfvo.resmanagement.service.rest;
+package org.onap.vfc.nfvo.res.service.rest;
import static org.junit.Assert.assertNotNull;
@@ -26,11 +26,12 @@ 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.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.nfvo.resmanagement.common.util.request.RequestUtil;
-import org.openo.nfvo.resmanagement.service.base.openstack.impl.HostImpl;
-import org.openo.nfvo.resmanagement.service.base.openstack.inf.Host;
-import org.openo.nfvo.resmanagement.service.entity.HostEntity;
import org.springframework.mock.web.MockHttpServletRequest;
import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/LimitsRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/LimitsRoaTest.java index 3c028dc..757856b 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/LimitsRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/LimitsRoaTest.java @@ -14,7 +14,7 @@ * limitations under the License.
*/
-package org.openo.nfvo.resmanagement.service.rest;
+package org.onap.vfc.nfvo.res.service.rest;
import static org.junit.Assert.assertNotNull;
@@ -22,9 +22,10 @@ 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.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.nfvo.resmanagement.service.business.impl.LimitsBusinessImpl;
-import org.openo.nfvo.resmanagement.service.business.inf.LimitsBusiness;
import org.springframework.mock.web.MockHttpServletRequest;
import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/LocationRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/LocationRoaTest.java index 2a3c062..fc15bfc 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/LocationRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/LocationRoaTest.java @@ -14,7 +14,7 @@ * limitations under the License.
*/
-package org.openo.nfvo.resmanagement.service.rest;
+package org.onap.vfc.nfvo.res.service.rest;
import static org.junit.Assert.assertNotNull;
@@ -26,14 +26,15 @@ 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.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.nfvo.resmanagement.common.util.request.RequestUtil;
-import org.openo.nfvo.resmanagement.service.base.openstack.impl.LocationImpl;
-import org.openo.nfvo.resmanagement.service.base.openstack.impl.SitesImpl;
-import org.openo.nfvo.resmanagement.service.base.openstack.inf.Location;
-import org.openo.nfvo.resmanagement.service.base.openstack.inf.Sites;
-import org.openo.nfvo.resmanagement.service.entity.LocationEntity;
-import org.openo.nfvo.resmanagement.service.entity.SitesEntity;
import org.springframework.mock.web.MockHttpServletRequest;
import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/NetworkRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/NetworkRoaTest.java index b838e27..0aef982 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/NetworkRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/NetworkRoaTest.java @@ -14,7 +14,7 @@ * limitations under the License.
*/
-package org.openo.nfvo.resmanagement.service.rest;
+package org.onap.vfc.nfvo.res.service.rest;
import static org.junit.Assert.assertNotNull;
@@ -26,11 +26,12 @@ 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.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.nfvo.resmanagement.common.util.request.RequestUtil;
-import org.openo.nfvo.resmanagement.service.base.openstack.impl.NetworkImpl;
-import org.openo.nfvo.resmanagement.service.base.openstack.inf.Network;
-import org.openo.nfvo.resmanagement.service.entity.NetworkEntity;
import org.springframework.mock.web.MockHttpServletRequest;
import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/PortRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/PortRoaTest.java index 9e4d127..115a893 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/PortRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/PortRoaTest.java @@ -14,7 +14,7 @@ * limitations under the License.
*/
-package org.openo.nfvo.resmanagement.service.rest;
+package org.onap.vfc.nfvo.res.service.rest;
import static org.junit.Assert.assertNotNull;
@@ -26,11 +26,12 @@ 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.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.nfvo.resmanagement.common.util.request.RequestUtil;
-import org.openo.nfvo.resmanagement.service.base.openstack.impl.PortImpl;
-import org.openo.nfvo.resmanagement.service.base.openstack.inf.Port;
-import org.openo.nfvo.resmanagement.service.entity.PortEntity;
import org.springframework.mock.web.MockHttpServletRequest;
import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/ResOperateRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/ResOperateRoaTest.java index eddd61d..3dffc89 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/ResOperateRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/ResOperateRoaTest.java @@ -14,7 +14,7 @@ * limitations under the License.
*/
-package org.openo.nfvo.resmanagement.service.rest;
+package org.onap.vfc.nfvo.res.service.rest;
import static org.junit.Assert.assertNotNull;
@@ -22,11 +22,12 @@ 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.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.nfvo.resmanagement.common.VimUtil;
-import org.openo.nfvo.resmanagement.common.util.request.RequestUtil;
-import org.openo.nfvo.resmanagement.service.group.impl.ResOperateServiceImpl;
-import org.openo.nfvo.resmanagement.service.group.inf.ResOperateService;
import org.springframework.mock.web.MockHttpServletRequest;
import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/SitesRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/SitesRoaTest.java index ad21b19..60330c9 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/SitesRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/SitesRoaTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.rest; +package org.onap.vfc.nfvo.res.service.rest; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -27,11 +27,12 @@ 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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.VimUtil; -import org.openo.nfvo.resmanagement.common.util.request.RequestUtil; -import org.openo.nfvo.resmanagement.service.base.openstack.impl.SitesImpl; -import org.openo.nfvo.resmanagement.service.entity.SitesEntity; import org.springframework.mock.web.MockHttpServletRequest; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/SwaggerRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/SwaggerRoaTest.java index 7cd0b97..4e5124b 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/SwaggerRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/SwaggerRoaTest.java @@ -14,7 +14,7 @@ * limitations under the License.
*/
-package org.openo.nfvo.resmanagement.service.rest;
+package org.onap.vfc.nfvo.res.service.rest;
import static org.junit.Assert.assertNotNull;
@@ -23,6 +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 mockit.Mock;
import mockit.MockUp;
diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VirtualLinkRoaTest.java index f8054ae..ff53d48 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VirtualLinkRoaTest.java @@ -14,7 +14,7 @@ * limitations under the License.
*/
-package org.openo.nfvo.resmanagement.service.rest;
+package org.onap.vfc.nfvo.res.service.rest;
import static org.junit.Assert.assertNotNull;
@@ -26,11 +26,12 @@ 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.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.nfvo.resmanagement.common.util.request.RequestUtil;
-import org.openo.nfvo.resmanagement.service.entity.VirtualLinkEntity;
-import org.openo.nfvo.resmanagement.service.group.impl.VirtualLinkServiceImpl;
-import org.openo.nfvo.resmanagement.service.group.inf.VirtualLinkService;
import org.springframework.mock.web.MockHttpServletRequest;
import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VmRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VmRoaTest.java index 111a330..0d7f52c 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VmRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VmRoaTest.java @@ -14,7 +14,7 @@ * limitations under the License.
*/
-package org.openo.nfvo.resmanagement.service.rest;
+package org.onap.vfc.nfvo.res.service.rest;
import static org.junit.Assert.assertNotNull;
@@ -26,11 +26,12 @@ 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.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.nfvo.resmanagement.common.util.request.RequestUtil;
-import org.openo.nfvo.resmanagement.service.entity.VmEntity;
-import org.openo.nfvo.resmanagement.service.group.impl.VmServiceImpl;
-import org.openo.nfvo.resmanagement.service.group.inf.VmService;
import org.springframework.mock.web.MockHttpServletRequest;
import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfInfoRoaTest.java index 2128d3a..68d00dd 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfInfoRoaTest.java @@ -14,7 +14,7 @@ * limitations under the License.
*/
-package org.openo.nfvo.resmanagement.service.rest;
+package org.onap.vfc.nfvo.res.service.rest;
import static org.junit.Assert.assertNotNull;
@@ -26,11 +26,12 @@ 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.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.nfvo.resmanagement.common.util.request.RequestUtil;
-import org.openo.nfvo.resmanagement.service.entity.VnfInfoEntity;
-import org.openo.nfvo.resmanagement.service.group.impl.VnfInfoServiceImpl;
-import org.openo.nfvo.resmanagement.service.group.inf.VnfInfoService;
import org.springframework.mock.web.MockHttpServletRequest;
import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VnfRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfRoaTest.java index 332cf2d..112f661 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VnfRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfRoaTest.java @@ -14,7 +14,7 @@ * limitations under the License.
*/
-package org.openo.nfvo.resmanagement.service.rest;
+package org.onap.vfc.nfvo.res.service.rest;
import static org.junit.Assert.assertNotNull;
@@ -26,11 +26,12 @@ 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.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.nfvo.resmanagement.common.util.request.RequestUtil;
-import org.openo.nfvo.resmanagement.service.entity.VnfEntity;
-import org.openo.nfvo.resmanagement.service.group.impl.VnfServiceImpl;
-import org.openo.nfvo.resmanagement.service.group.inf.VnfService;
import org.springframework.mock.web.MockHttpServletRequest;
import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfStatusRoaTest.java index 1629271..a749290 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfStatusRoaTest.java @@ -14,7 +14,7 @@ * limitations under the License.
*/
-package org.openo.nfvo.resmanagement.service.rest;
+package org.onap.vfc.nfvo.res.service.rest;
import static org.junit.Assert.assertNotNull;
@@ -26,11 +26,12 @@ 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.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.nfvo.resmanagement.common.util.request.RequestUtil;
-import org.openo.nfvo.resmanagement.service.entity.VnfStatusEntity;
-import org.openo.nfvo.resmanagement.service.group.impl.VnfStatusServiceImpl;
-import org.openo.nfvo.resmanagement.service.group.inf.VnfStatusService;
import org.springframework.mock.web.MockHttpServletRequest;
import mockit.Mock;
diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessageTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ExceptionMessageTest.java index 5409ada..e118918 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessageTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ExceptionMessageTest.java @@ -14,12 +14,13 @@ * limitations under the License.
*/
-package org.openo.nfvo.resmanagement.service.rest.exceptionmapper;
+package org.onap.vfc.nfvo.res.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;
/**
* <br>
diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapperTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/GenericExceptionMapperTest.java index 7a90d9e..2b150c8 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapperTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/GenericExceptionMapperTest.java @@ -14,13 +14,14 @@ * limitations under the License.
*/
-package org.openo.nfvo.resmanagement.service.rest.exceptionmapper;
+package org.onap.vfc.nfvo.res.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;
/**
* <br>
diff --git a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ServiceExceptionMapperTest.java index fc4378b..d5281bf 100644 --- a/ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ServiceExceptionMapperTest.java @@ -14,13 +14,14 @@ * limitations under the License.
*/
-package org.openo.nfvo.resmanagement.service.rest.exceptionmapper;
+package org.onap.vfc.nfvo.res.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.openo.baseservice.remoteservice.exception.ServiceException;
/**
|