From 822c88970ea57d35100a144b54376e900f2ef865 Mon Sep 17 00:00:00 2001 From: luxin Date: Wed, 6 Sep 2017 16:54:34 +0800 Subject: Remove openo dependency and fix compile problem Change-Id: I2fe2180b07acadad5fa332d8c3d338578b6e3943 Issue-Id:VFC-297 Signed-off-by: luxin --- .../org/onap/vfc/nfvo/resmanagement/common/VimUtilTest.java | 6 +++--- .../vfc/nfvo/resmanagement/common/util/RestfulUtilTest.java | 8 ++++---- .../service/adapter/impl/ResmgrAdapter2MSBManagerTest.java | 2 +- .../service/base/openstack/impl/HostImplTest.java | 2 +- .../service/base/openstack/impl/LocationImplTest.java | 2 +- .../service/base/openstack/impl/NetworkImplTest.java | 2 +- .../service/base/openstack/impl/PortImplTest.java | 2 +- .../service/base/openstack/impl/SitesImplTest.java | 2 +- .../resmanagement/service/base/openstack/impl/VimImplTest.java | 2 +- .../service/business/impl/HostBusinessImplTest.java | 2 +- .../service/business/impl/LimitsBusinessImplTest.java | 10 +++++----- .../service/business/impl/LocationBusinessImplTest.java | 2 +- .../service/business/impl/SitesBusinessImplTest.java | 2 +- .../service/business/impl/VimBusinessImplTest.java | 2 +- .../nfvo/resmanagement/service/dao/impl/HostDaoImplTest.java | 2 +- .../resmanagement/service/dao/impl/LocationDaoImplTest.java | 2 +- .../resmanagement/service/dao/impl/NetworkDaoImplTest.java | 2 +- .../nfvo/resmanagement/service/dao/impl/PortDaoImplTest.java | 2 +- .../nfvo/resmanagement/service/dao/impl/SitesDaoImplTest.java | 2 +- .../nfvo/resmanagement/service/dao/impl/VimDaoImplTest.java | 2 +- .../resmanagement/service/dao/impl/VirtualLinkDaoImplTest.java | 2 +- .../vfc/nfvo/resmanagement/service/dao/impl/VmDaoImplTest.java | 2 +- .../nfvo/resmanagement/service/rest/GrantResourseRoaTest.java | 2 +- .../onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.java | 2 +- .../vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.java | 2 +- .../vfc/nfvo/resmanagement/service/rest/LocationRoaTest.java | 2 +- .../vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.java | 2 +- .../onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.java | 2 +- .../vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.java | 2 +- .../onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.java | 2 +- .../nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java | 2 +- .../onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.java | 2 +- .../vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java | 2 +- .../onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.java | 2 +- .../vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java | 2 +- .../rest/exceptionmapper/ServiceExceptionMapperTest.java | 2 +- 36 files changed, 45 insertions(+), 45 deletions(-) (limited to 'ResmanagementService/service/src/test') diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/VimUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/VimUtilTest.java index 6d15bbc..ddcb779 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/VimUtilTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/VimUtilTest.java @@ -24,9 +24,9 @@ import org.junit.Test; 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; +import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulOptions; +import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes; +import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulResponse; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtilTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtilTest.java index 8947985..531b8e5 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtilTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtilTest.java @@ -25,10 +25,10 @@ import java.util.Map; import org.junit.Test; 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; -import org.openo.baseservice.roa.util.restclient.RestfulResponse; +import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; +import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulOptions; +import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes; +import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulResponse; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java index 07b53a8..356da82 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java @@ -24,7 +24,7 @@ import java.util.Map; import org.junit.Test; 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 org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulResponse; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/HostImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/HostImplTest.java index 8e5dcc4..7c51c81 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/HostImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/HostImplTest.java @@ -26,7 +26,7 @@ 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 org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImplTest.java index 803d421..56ba16f 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImplTest.java @@ -32,7 +32,7 @@ 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 org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImplTest.java index a94e994..5b8368d 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImplTest.java @@ -28,7 +28,7 @@ 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 org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImplTest.java index ae482f4..807a898 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImplTest.java @@ -24,7 +24,7 @@ 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 org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImplTest.java index 95bbca7..ee63537 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImplTest.java @@ -27,7 +27,7 @@ import org.junit.Test; 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 org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/VimImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/VimImplTest.java index 28a7344..46ff5fd 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/VimImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/VimImplTest.java @@ -24,7 +24,7 @@ import org.junit.Test; 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 org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImplTest.java index 18ade35..e94923d 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImplTest.java @@ -22,7 +22,7 @@ import org.junit.Test; 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 org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImplTest.java index c5c9d78..56e0a44 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImplTest.java @@ -19,11 +19,11 @@ package org.onap.vfc.nfvo.resmanagement.service.business.impl; import org.junit.Before; import org.junit.Test; 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; -import org.openo.baseservice.roa.util.restclient.RestfulParametes; -import org.openo.baseservice.roa.util.restclient.RestfulResponse; +import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; +import org.onap.vfc.nfvo.resmanagement.common.util.restclient.HttpRest; +import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulOptions; +import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes; +import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulResponse; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImplTest.java index 70ba66e..0f134d4 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImplTest.java @@ -23,7 +23,7 @@ import org.junit.Test; 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 org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java index ce33e8f..b0095b2 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java @@ -30,7 +30,7 @@ import org.junit.Test; 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 org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java index c36aaf2..d5e8bdb 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java @@ -25,7 +25,7 @@ import org.junit.Test; 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 org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/HostDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/HostDaoImplTest.java index 9ec2c8d..584502f 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/HostDaoImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/HostDaoImplTest.java @@ -24,7 +24,7 @@ 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 org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import mockit.Expectations; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/LocationDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/LocationDaoImplTest.java index 908dd5c..b0cde7c 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/LocationDaoImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/LocationDaoImplTest.java @@ -25,7 +25,7 @@ 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 org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/NetworkDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/NetworkDaoImplTest.java index 88117fa..43b9f8c 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/NetworkDaoImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/NetworkDaoImplTest.java @@ -26,7 +26,7 @@ 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 org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import mockit.Expectations; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/PortDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/PortDaoImplTest.java index efb633c..ec8c1cd 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/PortDaoImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/PortDaoImplTest.java @@ -25,7 +25,7 @@ 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 org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import mockit.Expectations; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/SitesDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/SitesDaoImplTest.java index 0944936..560fbed 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/SitesDaoImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/SitesDaoImplTest.java @@ -24,7 +24,7 @@ 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 org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import mockit.Expectations; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VimDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VimDaoImplTest.java index 8adf0c8..b88a414 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VimDaoImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VimDaoImplTest.java @@ -26,7 +26,7 @@ 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 org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import mockit.Expectations; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImplTest.java index fa7fb54..e8b00b0 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImplTest.java @@ -24,7 +24,7 @@ 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 org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VmDaoImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VmDaoImplTest.java index 07ac61c..a74cf11 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VmDaoImplTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VmDaoImplTest.java @@ -23,7 +23,7 @@ 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 org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import mockit.Mock; import mockit.MockUp; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java index 952ca90..7df1ee2 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java @@ -26,7 +26,7 @@ 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.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.springframework.mock.web.MockHttpServletRequest; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.java index 72e79d7..e2c402a 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.java @@ -31,7 +31,7 @@ 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.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.springframework.mock.web.MockHttpServletRequest; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.java index 391aad3..d92bd31 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.java @@ -25,7 +25,7 @@ import org.junit.Test; 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.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.springframework.mock.web.MockHttpServletRequest; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoaTest.java index 78157f6..05b80ec 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoaTest.java @@ -34,7 +34,7 @@ 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.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.springframework.mock.web.MockHttpServletRequest; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.java index 4536b0d..13e6815 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.java @@ -31,7 +31,7 @@ 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.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.springframework.mock.web.MockHttpServletRequest; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.java index 181e6e5..0feca60 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.java @@ -31,7 +31,7 @@ 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.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.springframework.mock.web.MockHttpServletRequest; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.java index aa87bf5..4f4fb27 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.java @@ -27,7 +27,7 @@ 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.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.springframework.mock.web.MockHttpServletRequest; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.java index 1a813c8..42e5592 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.java @@ -32,7 +32,7 @@ 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.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.springframework.mock.web.MockHttpServletRequest; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java index 5377f60..23e2591 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java @@ -31,7 +31,7 @@ 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.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.springframework.mock.web.MockHttpServletRequest; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.java index f3321fa..8ecd1d5 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.java @@ -31,7 +31,7 @@ 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.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.springframework.mock.web.MockHttpServletRequest; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java index e6aafa6..5de4276 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java @@ -31,7 +31,7 @@ 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.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.springframework.mock.web.MockHttpServletRequest; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.java index 099bae0..216c0fc 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.java @@ -31,7 +31,7 @@ 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.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.springframework.mock.web.MockHttpServletRequest; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java index 61d3e6e..4d8cbca 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java @@ -31,7 +31,7 @@ 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.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; import org.springframework.mock.web.MockHttpServletRequest; import mockit.Mock; diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java index f465772..dd2bc29 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java @@ -22,7 +22,7 @@ import javax.ws.rs.core.Response; import org.junit.Test; import org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper.ServiceExceptionMapper; -import org.openo.baseservice.remoteservice.exception.ServiceException; +import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException; /** *
-- cgit 1.2.3-korg