From e585e291a7d1fc27541471d8bebb6fe36a72b9e7 Mon Sep 17 00:00:00 2001 From: "victor.gao" Date: Wed, 16 Aug 2017 16:45:43 +0800 Subject: [PATCH] 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 --- .../vfc/nfvo/res}/common/ResourceUtil.java | 2 +- .../vfc/nfvo/res}/common/VimUtil.java | 8 +- .../vfc/nfvo/res}/common/constant/Constant.java | 2 +- .../nfvo/res}/common/constant/HttpConstant.java | 2 +- .../nfvo/res}/common/constant/ParamConstant.java | 2 +- .../res}/common/constant/ResponseConstant.java | 4 +- .../vfc/nfvo/res}/common/constant/UrlConstant.java | 2 +- .../vfc/nfvo/res}/common/util/JsonUtil.java | 4 +- .../vfc/nfvo/res}/common/util/RestfulUtil.java | 8 +- .../vfc/nfvo/res}/common/util/StringUtil.java | 2 +- .../nfvo/res}/common/util/request/RequestUtil.java | 2 +- .../res}/common/util/response/ResponseUtil.java | 2 +- .../res}/common/util/response/RoaResponseUtil.java | 8 +- .../activator/ROAResmgrServicePostProcessor.java | 4 +- .../adapter/impl/ResmgrAdapter2MSBManager.java | 10 +-- .../adapter/impl/ResmgrAdapterMgrService.java | 14 +-- .../adapter/inf/IResmgrAdapter2MSBManager.java | 2 +- .../adapter/inf/IResmgrAdapterMgrService.java | 2 +- .../res}/service/base/openstack/impl/HostImpl.java | 8 +- .../service/base/openstack/impl/LocationImpl.java | 18 ++-- .../service/base/openstack/impl/NetworkImpl.java | 10 +-- .../res}/service/base/openstack/impl/PortImpl.java | 10 +-- .../service/base/openstack/impl/SitesImpl.java | 18 ++-- .../res}/service/base/openstack/impl/VimImpl.java | 8 +- .../nfvo/res}/service/base/openstack/inf/Host.java | 4 +- .../base/openstack/inf/InterfaceResManagement.java | 2 +- .../res}/service/base/openstack/inf/Location.java | 4 +- .../res}/service/base/openstack/inf/Network.java | 4 +- .../nfvo/res}/service/base/openstack/inf/Port.java | 4 +- .../service/base/openstack/inf/ResManagement.java | 2 +- .../res}/service/base/openstack/inf/Sites.java | 4 +- .../nfvo/res}/service/base/openstack/inf/Vim.java | 4 +- .../service/business/impl/HostBusinessImpl.java | 10 +-- .../service/business/impl/LimitsBusinessImpl.java | 12 +-- .../business/impl/LocationBusinessImpl.java | 14 +-- .../service/business/impl/NetworkBusinessImpl.java | 10 +-- .../service/business/impl/PortBusinessImpl.java | 10 +-- .../service/business/impl/SitesBusinessImpl.java | 12 +-- .../service/business/impl/VimBusinessImpl.java | 12 +-- .../res}/service/business/inf/HostBusiness.java | 4 +- .../res}/service/business/inf/LimitsBusiness.java | 2 +- .../service/business/inf/LocationBusiness.java | 4 +- .../res}/service/business/inf/NetworkBusiness.java | 4 +- .../res}/service/business/inf/PortBusiness.java | 4 +- .../res}/service/business/inf/SitesBusiness.java | 4 +- .../res}/service/business/inf/VimBusiness.java | 4 +- .../nfvo/res}/service/dao/impl/AbstractDao.java | 2 +- .../nfvo/res}/service/dao/impl/HostDaoImpl.java | 10 +-- .../res}/service/dao/impl/LocationDaoImpl.java | 10 +-- .../nfvo/res}/service/dao/impl/NetworkDaoImpl.java | 10 +-- .../nfvo/res}/service/dao/impl/PortDaoImpl.java | 10 +-- .../nfvo/res}/service/dao/impl/SitesDaoImpl.java | 10 +-- .../vfc/nfvo/res}/service/dao/impl/VimDaoImpl.java | 10 +-- .../res}/service/dao/impl/VirtualLinkDaoImpl.java | 8 +- .../vfc/nfvo/res}/service/dao/impl/VmDaoImpl.java | 8 +- .../vfc/nfvo/res}/service/dao/impl/VnfDaoImpl.java | 8 +- .../nfvo/res}/service/dao/impl/VnfInfoDaoImpl.java | 8 +- .../res}/service/dao/impl/VnfStatusDaoImpl.java | 8 +- .../vfc/nfvo/res}/service/dao/inf/HostDao.java | 4 +- .../vfc/nfvo/res}/service/dao/inf/LocationDao.java | 4 +- .../vfc/nfvo/res}/service/dao/inf/NetworkDao.java | 4 +- .../vfc/nfvo/res}/service/dao/inf/PortDao.java | 4 +- .../vfc/nfvo/res}/service/dao/inf/SitesDao.java | 4 +- .../vfc/nfvo/res}/service/dao/inf/VimDao.java | 4 +- .../nfvo/res}/service/dao/inf/VirtualLinkDao.java | 4 +- .../vfc/nfvo/res}/service/dao/inf/VmDao.java | 4 +- .../vfc/nfvo/res}/service/dao/inf/VnfDao.java | 4 +- .../vfc/nfvo/res}/service/dao/inf/VnfInfoDao.java | 4 +- .../nfvo/res}/service/dao/inf/VnfStatusDao.java | 4 +- .../vfc/nfvo/res}/service/entity/HostEntity.java | 4 +- .../nfvo/res}/service/entity/LocationEntity.java | 4 +- .../nfvo/res}/service/entity/NetworkEntity.java | 4 +- .../vfc/nfvo/res}/service/entity/PortEntity.java | 4 +- .../vfc/nfvo/res}/service/entity/SitesEntity.java | 6 +- .../vfc/nfvo/res}/service/entity/VimEntity.java | 4 +- .../res}/service/entity/VirtualLinkEntity.java | 4 +- .../vfc/nfvo/res}/service/entity/VmEntity.java | 4 +- .../vfc/nfvo/res}/service/entity/VnfEntity.java | 4 +- .../nfvo/res}/service/entity/VnfInfoEntity.java | 4 +- .../nfvo/res}/service/entity/VnfStatusEntity.java | 4 +- .../service/group/impl/GrantResServiceImpl.java | 8 +- .../group/impl/IResourceAddServiceImpl.java | 12 +-- .../group/impl/IResourceDelServiceImpl.java | 10 +-- .../group/impl/IResourceUpdateServiceImpl.java | 10 +-- .../service/group/impl/ResOperateServiceImpl.java | 34 +++---- .../service/group/impl/VirtualLinkServiceImpl.java | 12 +-- .../res}/service/group/impl/VmServiceImpl.java | 14 +-- .../service/group/impl/VnfInfoServiceImpl.java | 12 +-- .../res}/service/group/impl/VnfServiceImpl.java | 14 +-- .../service/group/impl/VnfStatusServiceImpl.java | 8 +- .../res}/service/group/inf/GrantResService.java | 2 +- .../res}/service/group/inf/ResOperateService.java | 2 +- .../res}/service/group/inf/VirtualLinkService.java | 4 +- .../vfc/nfvo/res}/service/group/inf/VmService.java | 4 +- .../res}/service/group/inf/VnfInfoService.java | 4 +- .../nfvo/res}/service/group/inf/VnfService.java | 4 +- .../res}/service/group/inf/VnfStatusService.java | 4 +- .../vfc/nfvo/res}/service/mapper/HostMapper.java | 4 +- .../nfvo/res}/service/mapper/LocationMapper.java | 4 +- .../nfvo/res}/service/mapper/NetworkMapper.java | 4 +- .../vfc/nfvo/res}/service/mapper/PortMapper.java | 4 +- .../vfc/nfvo/res}/service/mapper/SitesMapper.java | 4 +- .../vfc/nfvo/res}/service/mapper/VimMapper.java | 4 +- .../res}/service/mapper/VirtualLinkMapper.java | 4 +- .../vfc/nfvo/res}/service/mapper/VmMapper.java | 4 +- .../nfvo/res}/service/mapper/VnfInfoMapper.java | 4 +- .../vfc/nfvo/res}/service/mapper/VnfMapper.java | 4 +- .../nfvo/res}/service/mapper/VnfStatusMapper.java | 4 +- .../nfvo/res}/service/rest/GrantResourseRoa.java | 14 +-- .../vfc/nfvo/res}/service/rest/HostRoa.java | 18 ++-- .../vfc/nfvo/res}/service/rest/LimitsRoa.java | 8 +- .../vfc/nfvo/res}/service/rest/LocationRoa.java | 26 +++--- .../vfc/nfvo/res}/service/rest/NetworkRoa.java | 18 ++-- .../vfc/nfvo/res}/service/rest/PortRoa.java | 18 ++-- .../vfc/nfvo/res}/service/rest/ResOperateRoa.java | 18 ++-- .../vfc/nfvo/res}/service/rest/SitesRoa.java | 20 ++--- .../vfc/nfvo/res}/service/rest/SwaggerRoa.java | 2 +- .../vfc/nfvo/res}/service/rest/VirtualLinkRoa.java | 20 ++--- .../vfc/nfvo/res}/service/rest/VmRoa.java | 20 ++--- .../vfc/nfvo/res}/service/rest/VnfInfoRoa.java | 20 ++--- .../vfc/nfvo/res}/service/rest/VnfRoa.java | 20 ++--- .../vfc/nfvo/res}/service/rest/VnfStatusRoa.java | 20 ++--- .../rest/exceptionmapper/ExceptionMessage.java | 2 +- .../exceptionmapper/GenericExceptionMapper.java | 2 +- .../exceptionmapper/ServiceExceptionMapper.java | 2 +- .../main/resources/mybatis/mysql/HostMapper.xml | 14 +-- .../resources/mybatis/mysql/LocationMapper.xml | 12 +-- .../main/resources/mybatis/mysql/NetworkMapper.xml | 14 +-- .../main/resources/mybatis/mysql/PortMapper.xml | 14 +-- .../main/resources/mybatis/mysql/SitesMapper.xml | 14 +-- .../src/main/resources/mybatis/mysql/VimMapper.xml | 6 +- .../resources/mybatis/mysql/VirtualLinkMapper.xml | 12 +-- .../src/main/resources/mybatis/mysql/VmMapper.xml | 12 +-- .../main/resources/mybatis/mysql/VnfInfoMapper.xml | 12 +-- .../src/main/resources/mybatis/mysql/VnfMapper.xml | 12 +-- .../resources/mybatis/mysql/VnfStatusMapper.xml | 12 +-- .../resources/spring/Resmanagement/services.xml | 100 ++++++++++----------- .../spring/Resmanagement/svc_register.xml | 4 +- .../vfc/nfvo/res}/common/ResourceUtilTest.java | 3 +- .../vfc/nfvo/res}/common/VimUtilTest.java | 7 +- .../vfc/nfvo/res}/common/util/JsonUtilTest.java | 3 +- .../vfc/nfvo/res}/common/util/RestfulUtilTest.java | 5 +- .../vfc/nfvo/res}/common/util/StringUtilTest.java | 3 +- .../res}/common/util/request/RequestUtilTest.java | 3 +- .../common/util/response/ResponseUtilTest.java | 3 +- .../common/util/response/RoaResponseUtilTest.java | 4 +- .../adapter/impl/ResmgrAdapter2MSBManagerTest.java | 5 +- .../adapter/impl/ResmgrAdapterMgrServiceTest.java | 3 +- .../service/base/openstack/impl/HostImplTest.java | 9 +- .../base/openstack/impl/LocationImplTest.java | 14 +-- .../base/openstack/impl/NetworkImplTest.java | 11 +-- .../service/base/openstack/impl/PortImplTest.java | 11 +-- .../service/base/openstack/impl/SitesImplTest.java | 7 +- .../service/base/openstack/impl/VimImplTest.java | 8 +- .../business/impl/HostBusinessImplTest.java | 7 +- .../business/impl/LimitsBusinessImplTest.java | 3 +- .../business/impl/LocationBusinessImplTest.java | 7 +- .../business/impl/SitesBusinessImplTest.java | 7 +- .../service/business/impl/VimBusinessImplTest.java | 7 +- .../res}/service/dao/impl/HostDaoImplTest.java | 12 +-- .../res}/service/dao/impl/LocationDaoImplTest.java | 11 ++- .../res}/service/dao/impl/NetworkDaoImplTest.java | 9 +- .../res}/service/dao/impl/PortDaoImplTest.java | 14 +-- .../res}/service/dao/impl/SitesDaoImplTest.java | 12 +-- .../nfvo/res}/service/dao/impl/VimDaoImplTest.java | 10 ++- .../service/dao/impl/VirtualLinkDaoImplTest.java | 12 +-- .../nfvo/res}/service/dao/impl/VmDaoImplTest.java | 10 ++- .../nfvo/res}/service/entity/HostEntityTest.java | 3 +- .../res}/service/entity/LocationEntityTest.java | 3 +- .../res}/service/entity/NetworkEntityTest.java | 3 +- .../nfvo/res}/service/entity/PortEntityTest.java | 3 +- .../nfvo/res}/service/entity/SitesEntityTest.java | 3 +- .../nfvo/res}/service/entity/VimEntityTest.java | 3 +- .../res}/service/rest/GrantResourseRoaTest.java | 9 +- .../vfc/nfvo/res}/service/rest/HostRoaTest.java | 11 +-- .../vfc/nfvo/res}/service/rest/LimitsRoaTest.java | 7 +- .../nfvo/res}/service/rest/LocationRoaTest.java | 17 ++-- .../vfc/nfvo/res}/service/rest/NetworkRoaTest.java | 11 +-- .../vfc/nfvo/res}/service/rest/PortRoaTest.java | 11 +-- .../nfvo/res}/service/rest/ResOperateRoaTest.java | 11 +-- .../vfc/nfvo/res}/service/rest/SitesRoaTest.java | 11 +-- .../vfc/nfvo/res}/service/rest/SwaggerRoaTest.java | 3 +- .../nfvo/res}/service/rest/VirtualLinkRoaTest.java | 11 +-- .../vfc/nfvo/res}/service/rest/VmRoaTest.java | 11 +-- .../vfc/nfvo/res}/service/rest/VnfInfoRoaTest.java | 11 +-- .../vfc/nfvo/res}/service/rest/VnfRoaTest.java | 11 +-- .../nfvo/res}/service/rest/VnfStatusRoaTest.java | 11 +-- .../rest/exceptionmapper/ExceptionMessageTest.java | 3 +- .../GenericExceptionMapperTest.java | 3 +- .../ServiceExceptionMapperTest.java | 3 +- 190 files changed, 811 insertions(+), 748 deletions(-) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/ResourceUtil.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/VimUtil.java (94%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/constant/Constant.java (97%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/constant/HttpConstant.java (97%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/constant/ParamConstant.java (99%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/constant/ResponseConstant.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/constant/UrlConstant.java (99%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/util/JsonUtil.java (98%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/util/RestfulUtil.java (98%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/util/StringUtil.java (99%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/util/request/RequestUtil.java (98%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/util/response/ResponseUtil.java (98%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/util/response/RoaResponseUtil.java (93%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/activator/ROAResmgrServicePostProcessor.java (92%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/adapter/impl/ResmgrAdapter2MSBManager.java (93%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/adapter/impl/ResmgrAdapterMgrService.java (92%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/adapter/inf/IResmgrAdapter2MSBManager.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/adapter/inf/IResmgrAdapterMgrService.java (93%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/impl/HostImpl.java (88%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/impl/LocationImpl.java (91%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/impl/NetworkImpl.java (90%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/impl/PortImpl.java (90%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/impl/SitesImpl.java (93%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/impl/VimImpl.java (88%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/inf/Host.java (92%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/inf/InterfaceResManagement.java (94%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/inf/Location.java (94%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/inf/Network.java (92%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/inf/Port.java (93%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/inf/ResManagement.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/inf/Sites.java (94%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/inf/Vim.java (93%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/business/impl/HostBusinessImpl.java (94%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/business/impl/LimitsBusinessImpl.java (88%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/business/impl/LocationBusinessImpl.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/business/impl/NetworkBusinessImpl.java (94%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/business/impl/PortBusinessImpl.java (94%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/business/impl/SitesBusinessImpl.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/business/impl/VimBusinessImpl.java (88%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/business/inf/HostBusiness.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/business/inf/LimitsBusiness.java (94%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/business/inf/LocationBusiness.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/business/inf/NetworkBusiness.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/business/inf/PortBusiness.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/business/inf/SitesBusiness.java (96%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/business/inf/VimBusiness.java (93%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/AbstractDao.java (96%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/HostDaoImpl.java (87%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/LocationDaoImpl.java (87%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/NetworkDaoImpl.java (87%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/PortDaoImpl.java (87%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/SitesDaoImpl.java (86%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/VimDaoImpl.java (80%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/VirtualLinkDaoImpl.java (87%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/VmDaoImpl.java (90%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/VnfDaoImpl.java (87%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/VnfInfoDaoImpl.java (89%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/VnfStatusDaoImpl.java (89%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/inf/HostDao.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/inf/LocationDao.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/inf/NetworkDao.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/inf/PortDao.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/inf/SitesDao.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/inf/VimDao.java (92%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/inf/VirtualLinkDao.java (91%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/inf/VmDao.java (89%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/inf/VnfDao.java (91%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/inf/VnfInfoDao.java (89%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/inf/VnfStatusDao.java (89%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/entity/HostEntity.java (97%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/entity/LocationEntity.java (98%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/entity/NetworkEntity.java (98%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/entity/PortEntity.java (97%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/entity/SitesEntity.java (98%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/entity/VimEntity.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/entity/VirtualLinkEntity.java (98%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/entity/VmEntity.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/entity/VnfEntity.java (98%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/entity/VnfInfoEntity.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/entity/VnfStatusEntity.java (98%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/group/impl/GrantResServiceImpl.java (96%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/group/impl/IResourceAddServiceImpl.java (94%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/group/impl/IResourceDelServiceImpl.java (86%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/group/impl/IResourceUpdateServiceImpl.java (93%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/group/impl/ResOperateServiceImpl.java (88%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/group/impl/VirtualLinkServiceImpl.java (87%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/group/impl/VmServiceImpl.java (91%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/group/impl/VnfInfoServiceImpl.java (91%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/group/impl/VnfServiceImpl.java (87%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/group/impl/VnfStatusServiceImpl.java (92%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/group/inf/GrantResService.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/group/inf/ResOperateService.java (97%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/group/inf/VirtualLinkService.java (91%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/group/inf/VmService.java (90%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/group/inf/VnfInfoService.java (89%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/group/inf/VnfService.java (92%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/group/inf/VnfStatusService.java (89%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/mapper/HostMapper.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/mapper/LocationMapper.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/mapper/NetworkMapper.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/mapper/PortMapper.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/mapper/SitesMapper.java (94%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/mapper/VimMapper.java (92%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/mapper/VirtualLinkMapper.java (89%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/mapper/VmMapper.java (90%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/mapper/VnfInfoMapper.java (90%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/mapper/VnfMapper.java (89%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/mapper/VnfStatusMapper.java (90%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/GrantResourseRoa.java (87%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/HostRoa.java (89%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/LimitsRoa.java (88%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/LocationRoa.java (92%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/NetworkRoa.java (89%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/PortRoa.java (89%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/ResOperateRoa.java (89%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/SitesRoa.java (90%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/SwaggerRoa.java (96%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/VirtualLinkRoa.java (86%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/VmRoa.java (86%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/VnfInfoRoa.java (86%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/VnfRoa.java (86%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/VnfStatusRoa.java (86%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/exceptionmapper/ExceptionMessage.java (95%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/exceptionmapper/GenericExceptionMapper.java (94%) rename ResmanagementService/service/src/main/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/exceptionmapper/ServiceExceptionMapper.java (95%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/ResourceUtilTest.java (94%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/VimUtilTest.java (88%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/util/JsonUtilTest.java (99%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/util/RestfulUtilTest.java (98%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/util/StringUtilTest.java (97%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/util/request/RequestUtilTest.java (98%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/util/response/ResponseUtilTest.java (96%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/common/util/response/RoaResponseUtilTest.java (95%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java (97%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/adapter/impl/ResmgrAdapterMgrServiceTest.java (93%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/impl/HostImplTest.java (94%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/impl/LocationImplTest.java (97%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/impl/NetworkImplTest.java (96%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/impl/PortImplTest.java (92%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/impl/SitesImplTest.java (94%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/base/openstack/impl/VimImplTest.java (93%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/business/impl/HostBusinessImplTest.java (92%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/business/impl/LimitsBusinessImplTest.java (94%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/business/impl/LocationBusinessImplTest.java (96%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/business/impl/SitesBusinessImplTest.java (98%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/business/impl/VimBusinessImplTest.java (95%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/HostDaoImplTest.java (90%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/LocationDaoImplTest.java (83%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/NetworkDaoImplTest.java (93%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/PortDaoImplTest.java (89%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/SitesDaoImplTest.java (90%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/VimDaoImplTest.java (84%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/VirtualLinkDaoImplTest.java (75%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/dao/impl/VmDaoImplTest.java (79%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/entity/HostEntityTest.java (91%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/entity/LocationEntityTest.java (92%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/entity/NetworkEntityTest.java (93%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/entity/PortEntityTest.java (92%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/entity/SitesEntityTest.java (97%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/entity/VimEntityTest.java (91%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/GrantResourseRoaTest.java (91%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/HostRoaTest.java (91%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/LimitsRoaTest.java (85%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/LocationRoaTest.java (92%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/NetworkRoaTest.java (91%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/PortRoaTest.java (91%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/ResOperateRoaTest.java (91%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/SitesRoaTest.java (96%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/SwaggerRoaTest.java (89%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/VirtualLinkRoaTest.java (90%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/VmRoaTest.java (91%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/VnfInfoRoaTest.java (90%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/VnfRoaTest.java (90%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/VnfStatusRoaTest.java (90%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/exceptionmapper/ExceptionMessageTest.java (89%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/exceptionmapper/GenericExceptionMapperTest.java (85%) rename ResmanagementService/service/src/test/java/org/{openo/nfvo/resmanagement => onap/vfc/nfvo/res}/service/rest/exceptionmapper/ServiceExceptionMapperTest.java (86%) diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/ResourceUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/ResourceUtil.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/ResourceUtil.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/ResourceUtil.java index 572de2b..d38459a 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/ResourceUtil.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/ResourceUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.common; +package org.onap.vfc.nfvo.res.common; /** *
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/VimUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/VimUtil.java similarity index 94% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/VimUtil.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/VimUtil.java index 5f2d417..6dc3121 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/VimUtil.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/VimUtil.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.common; +package org.onap.vfc.nfvo.res.common; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +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.RestfulParametes; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.common.util.RestfulUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/constant/Constant.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/Constant.java similarity index 97% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/constant/Constant.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/Constant.java index 1e5941d..d26c63e 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/constant/Constant.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/Constant.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.common.constant; +package org.onap.vfc.nfvo.res.common.constant; /** * HTTP constants
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/constant/HttpConstant.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/HttpConstant.java similarity index 97% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/constant/HttpConstant.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/HttpConstant.java index f480b70..a81dff5 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/constant/HttpConstant.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/HttpConstant.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.common.constant; +package org.onap.vfc.nfvo.res.common.constant; /** * diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/constant/ParamConstant.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/ParamConstant.java similarity index 99% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/constant/ParamConstant.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/ParamConstant.java index 9ba0c4c..870e4a7 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/constant/ParamConstant.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/ParamConstant.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.common.constant; +package org.onap.vfc.nfvo.res.common.constant; /** *
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/constant/ResponseConstant.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/ResponseConstant.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/constant/ResponseConstant.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/ResponseConstant.java index a4fe9e0..5e7126c 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/constant/ResponseConstant.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/ResponseConstant.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.common.constant; +package org.onap.vfc.nfvo.res.common.constant; -import org.openo.nfvo.resmanagement.common.ResourceUtil; +import org.onap.vfc.nfvo.res.common.ResourceUtil; /** * Response constants.
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/constant/UrlConstant.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/UrlConstant.java similarity index 99% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/constant/UrlConstant.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/UrlConstant.java index b9a93a1..572bff3 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/constant/UrlConstant.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/UrlConstant.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.common.constant; +package org.onap.vfc.nfvo.res.common.constant; /** *
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/util/JsonUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/JsonUtil.java similarity index 98% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/util/JsonUtil.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/JsonUtil.java index 5440a7a..2b6e905 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/util/JsonUtil.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/JsonUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.common.util; +package org.onap.vfc.nfvo.res.common.util; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/util/RestfulUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/RestfulUtil.java similarity index 98% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/util/RestfulUtil.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/RestfulUtil.java index e644e27..5d7d334 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/util/RestfulUtil.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/RestfulUtil.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 java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -24,6 +24,9 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; +import org.onap.vfc.nfvo.res.common.ResourceUtil; +import org.onap.vfc.nfvo.res.common.constant.Constant; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; import org.openo.baseservice.remoteservice.exception.ServiceException; import org.openo.baseservice.roa.util.restclient.Restful; import org.openo.baseservice.roa.util.restclient.RestfulAsyncCallback; @@ -31,9 +34,6 @@ import org.openo.baseservice.roa.util.restclient.RestfulFactory; 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.ResourceUtil; -import org.openo.nfvo.resmanagement.common.constant.Constant; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/util/StringUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/StringUtil.java similarity index 99% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/util/StringUtil.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/StringUtil.java index fd8f09f..2d4b1c7 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/util/StringUtil.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/StringUtil.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 java.math.BigDecimal; import java.text.DecimalFormat; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/util/request/RequestUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/request/RequestUtil.java similarity index 98% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/util/request/RequestUtil.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/request/RequestUtil.java index 5eae4e3..bbc28a3 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/util/request/RequestUtil.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/request/RequestUtil.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 java.io.IOException; import java.io.InputStream; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/util/response/ResponseUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/response/ResponseUtil.java similarity index 98% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/util/response/ResponseUtil.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/response/ResponseUtil.java index d6b1415..28ee1b0 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/util/response/ResponseUtil.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/response/ResponseUtil.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 java.util.HashMap; import java.util.Iterator; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/util/response/RoaResponseUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/response/RoaResponseUtil.java similarity index 93% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/util/response/RoaResponseUtil.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/response/RoaResponseUtil.java index dbb034d..1043e7a 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/common/util/response/RoaResponseUtil.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/response/RoaResponseUtil.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.common.util.response; +package org.onap.vfc.nfvo.res.common.util.response; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.common.constant.HttpConstant; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.ResponseConstant; +import org.onap.vfc.nfvo.res.common.constant.HttpConstant; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.ResponseConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/activator/ROAResmgrServicePostProcessor.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/activator/ROAResmgrServicePostProcessor.java similarity index 92% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/activator/ROAResmgrServicePostProcessor.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/activator/ROAResmgrServicePostProcessor.java index ad66303..6c217c2 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/activator/ROAResmgrServicePostProcessor.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/activator/ROAResmgrServicePostProcessor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.activator; +package org.onap.vfc.nfvo.res.service.activator; -import org.openo.nfvo.resmanagement.service.adapter.inf.IResmgrAdapterMgrService; +import org.onap.vfc.nfvo.res.service.adapter.inf.IResmgrAdapterMgrService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManager.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapter2MSBManager.java similarity index 93% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManager.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapter2MSBManager.java index 9e523e3..f9ccbed 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManager.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapter2MSBManager.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.adapter.impl; +package org.onap.vfc.nfvo.res.service.adapter.impl; import java.util.Map; +import org.onap.vfc.nfvo.res.common.constant.Constant; +import org.onap.vfc.nfvo.res.common.constant.HttpConstant; +import org.onap.vfc.nfvo.res.common.util.RestfulUtil; +import org.onap.vfc.nfvo.res.service.adapter.inf.IResmgrAdapter2MSBManager; import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.nfvo.resmanagement.common.constant.Constant; -import org.openo.nfvo.resmanagement.common.constant.HttpConstant; -import org.openo.nfvo.resmanagement.common.util.RestfulUtil; -import org.openo.nfvo.resmanagement.service.adapter.inf.IResmgrAdapter2MSBManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapterMgrService.java similarity index 92% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapterMgrService.java index ea9a53d..8b1d905 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapterMgrService.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 java.io.BufferedInputStream; import java.io.FileInputStream; @@ -25,13 +25,13 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.Executors; +import org.onap.vfc.nfvo.res.common.constant.Constant; +import org.onap.vfc.nfvo.res.common.constant.HttpConstant; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.UrlConstant; +import org.onap.vfc.nfvo.res.service.adapter.inf.IResmgrAdapter2MSBManager; +import org.onap.vfc.nfvo.res.service.adapter.inf.IResmgrAdapterMgrService; import org.openo.baseservice.util.impl.SystemEnvVariablesFactory; -import org.openo.nfvo.resmanagement.common.constant.Constant; -import org.openo.nfvo.resmanagement.common.constant.HttpConstant; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.service.adapter.inf.IResmgrAdapter2MSBManager; -import org.openo.nfvo.resmanagement.service.adapter.inf.IResmgrAdapterMgrService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/adapter/inf/IResmgrAdapter2MSBManager.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/inf/IResmgrAdapter2MSBManager.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/adapter/inf/IResmgrAdapter2MSBManager.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/inf/IResmgrAdapter2MSBManager.java index df00261..5981f59 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/adapter/inf/IResmgrAdapter2MSBManager.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/inf/IResmgrAdapter2MSBManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.adapter.inf; +package org.onap.vfc.nfvo.res.service.adapter.inf; import java.util.Map; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/adapter/inf/IResmgrAdapterMgrService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/inf/IResmgrAdapterMgrService.java similarity index 93% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/adapter/inf/IResmgrAdapterMgrService.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/inf/IResmgrAdapterMgrService.java index 05d4739..3bce8af 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/adapter/inf/IResmgrAdapterMgrService.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/inf/IResmgrAdapterMgrService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.adapter.inf; +package org.onap.vfc.nfvo.res.service.adapter.inf; /** *
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/HostImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/HostImpl.java similarity index 88% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/HostImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/HostImpl.java index 131d7c7..1dbaf51 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/HostImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/HostImpl.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.base.openstack.impl; +package org.onap.vfc.nfvo.res.service.base.openstack.impl; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.Host; +import org.onap.vfc.nfvo.res.service.business.inf.HostBusiness; +import org.onap.vfc.nfvo.res.service.entity.HostEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.base.openstack.inf.Host; -import org.openo.nfvo.resmanagement.service.business.inf.HostBusiness; -import org.openo.nfvo.resmanagement.service.entity.HostEntity; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/LocationImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/LocationImpl.java similarity index 91% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/LocationImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/LocationImpl.java index 346ac84..422fa06 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/LocationImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/LocationImpl.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.base.openstack.impl; +package org.onap.vfc.nfvo.res.service.base.openstack.impl; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.common.VimUtil; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.util.JsonUtil; +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.business.inf.LocationBusiness; +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.common.VimUtil; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.util.JsonUtil; -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.business.inf.LocationBusiness; -import org.openo.nfvo.resmanagement.service.entity.LocationEntity; -import org.openo.nfvo.resmanagement.service.entity.SitesEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/NetworkImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/NetworkImpl.java similarity index 90% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/NetworkImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/NetworkImpl.java index b9ec757..9bfcf74 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/NetworkImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/NetworkImpl.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.base.openstack.impl; +package org.onap.vfc.nfvo.res.service.base.openstack.impl; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.common.util.JsonUtil; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.Network; +import org.onap.vfc.nfvo.res.service.business.inf.NetworkBusiness; +import org.onap.vfc.nfvo.res.service.entity.NetworkEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.util.JsonUtil; -import org.openo.nfvo.resmanagement.service.base.openstack.inf.Network; -import org.openo.nfvo.resmanagement.service.business.inf.NetworkBusiness; -import org.openo.nfvo.resmanagement.service.entity.NetworkEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/PortImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/PortImpl.java similarity index 90% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/PortImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/PortImpl.java index 3dee172..36b6cd1 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/PortImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/PortImpl.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.base.openstack.impl; +package org.onap.vfc.nfvo.res.service.base.openstack.impl; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.common.util.JsonUtil; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.Port; +import org.onap.vfc.nfvo.res.service.business.inf.PortBusiness; +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.base.openstack.inf.Port; -import org.openo.nfvo.resmanagement.service.business.inf.PortBusiness; -import org.openo.nfvo.resmanagement.service.entity.PortEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/SitesImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/SitesImpl.java similarity index 93% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/SitesImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/SitesImpl.java index 6b9345e..3238f50 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/SitesImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/SitesImpl.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 java.math.BigDecimal; import java.util.HashMap; @@ -23,15 +23,15 @@ import java.util.Map; import java.util.UUID; import org.apache.commons.lang3.StringUtils; +import org.onap.vfc.nfvo.res.common.VimUtil; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.util.JsonUtil; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.Sites; +import org.onap.vfc.nfvo.res.service.business.inf.LimitsBusiness; +import org.onap.vfc.nfvo.res.service.business.inf.SitesBusiness; +import org.onap.vfc.nfvo.res.service.entity.SitesEntity; +import org.onap.vfc.nfvo.res.service.group.inf.ResOperateService; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.VimUtil; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.util.JsonUtil; -import org.openo.nfvo.resmanagement.service.base.openstack.inf.Sites; -import org.openo.nfvo.resmanagement.service.business.inf.LimitsBusiness; -import org.openo.nfvo.resmanagement.service.business.inf.SitesBusiness; -import org.openo.nfvo.resmanagement.service.entity.SitesEntity; -import org.openo.nfvo.resmanagement.service.group.inf.ResOperateService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/VimImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/VimImpl.java similarity index 88% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/VimImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/VimImpl.java index d1405a2..99c1e96 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/VimImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/VimImpl.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.base.openstack.impl; +package org.onap.vfc.nfvo.res.service.base.openstack.impl; import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.Vim; +import org.onap.vfc.nfvo.res.service.business.inf.VimBusiness; +import org.onap.vfc.nfvo.res.service.entity.VimEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.base.openstack.inf.Vim; -import org.openo.nfvo.resmanagement.service.business.inf.VimBusiness; -import org.openo.nfvo.resmanagement.service.entity.VimEntity; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/Host.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Host.java similarity index 92% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/Host.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Host.java index 44adb19..068762b 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/Host.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Host.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.base.openstack.inf; +package org.onap.vfc.nfvo.res.service.base.openstack.inf; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.entity.HostEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.HostEntity; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/InterfaceResManagement.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/InterfaceResManagement.java similarity index 94% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/InterfaceResManagement.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/InterfaceResManagement.java index a89e48e..167c617 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/InterfaceResManagement.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/InterfaceResManagement.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.base.openstack.inf; +package org.onap.vfc.nfvo.res.service.base.openstack.inf; import org.openo.baseservice.remoteservice.exception.ServiceException; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/Location.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Location.java similarity index 94% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/Location.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Location.java index 7ee574c..a3a0c15 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/Location.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Location.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.base.openstack.inf; +package org.onap.vfc.nfvo.res.service.base.openstack.inf; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.entity.LocationEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.LocationEntity; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/Network.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Network.java similarity index 92% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/Network.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Network.java index bd00e1a..398d8a9 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/Network.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Network.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.base.openstack.inf; +package org.onap.vfc.nfvo.res.service.base.openstack.inf; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.entity.NetworkEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.NetworkEntity; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/Port.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Port.java similarity index 93% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/Port.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Port.java index 3ef79b3..9fc7f77 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/Port.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Port.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.base.openstack.inf; +package org.onap.vfc.nfvo.res.service.base.openstack.inf; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.entity.PortEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.PortEntity; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/ResManagement.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/ResManagement.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/ResManagement.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/ResManagement.java index 8acbf77..225f095 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/ResManagement.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/ResManagement.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.base.openstack.inf; +package org.onap.vfc.nfvo.res.service.base.openstack.inf; import org.openo.baseservice.remoteservice.exception.ServiceException; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/Sites.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Sites.java similarity index 94% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/Sites.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Sites.java index ab2e104..c6c622a 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/Sites.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Sites.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.base.openstack.inf; +package org.onap.vfc.nfvo.res.service.base.openstack.inf; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.entity.SitesEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.SitesEntity; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/Vim.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Vim.java similarity index 93% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/Vim.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Vim.java index f923e0f..4d3e278 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/base/openstack/inf/Vim.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Vim.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.base.openstack.inf; +package org.onap.vfc.nfvo.res.service.base.openstack.inf; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.entity.VimEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.VimEntity; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/HostBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/HostBusinessImpl.java similarity index 94% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/HostBusinessImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/HostBusinessImpl.java index 6da2657..f7be74f 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/HostBusinessImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/HostBusinessImpl.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.business.impl; +package org.onap.vfc.nfvo.res.service.business.impl; import java.util.List; import java.util.Map; import java.util.UUID; import org.apache.commons.lang3.StringUtils; +import org.onap.vfc.nfvo.res.common.ResourceUtil; +import org.onap.vfc.nfvo.res.service.business.inf.HostBusiness; +import org.onap.vfc.nfvo.res.service.dao.inf.HostDao; +import org.onap.vfc.nfvo.res.service.entity.HostEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.ResourceUtil; -import org.openo.nfvo.resmanagement.service.business.inf.HostBusiness; -import org.openo.nfvo.resmanagement.service.dao.inf.HostDao; -import org.openo.nfvo.resmanagement.service.entity.HostEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/LimitsBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/LimitsBusinessImpl.java similarity index 88% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/LimitsBusinessImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/LimitsBusinessImpl.java index eeb2de0..8a2be18 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/LimitsBusinessImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/LimitsBusinessImpl.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.business.impl; +package org.onap.vfc.nfvo.res.service.business.impl; +import org.onap.vfc.nfvo.res.common.VimUtil; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.UrlConstant; +import org.onap.vfc.nfvo.res.common.util.RestfulUtil; +import org.onap.vfc.nfvo.res.service.business.inf.LimitsBusiness; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.VimUtil; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.common.util.RestfulUtil; -import org.openo.nfvo.resmanagement.service.business.inf.LimitsBusiness; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/LocationBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/LocationBusinessImpl.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/LocationBusinessImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/LocationBusinessImpl.java index 76ee2a0..f1da586 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/LocationBusinessImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/LocationBusinessImpl.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 java.util.HashMap; import java.util.List; @@ -22,13 +22,13 @@ import java.util.Map; import java.util.UUID; import org.apache.commons.lang3.StringUtils; +import org.onap.vfc.nfvo.res.common.ResourceUtil; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.util.StringUtil; +import org.onap.vfc.nfvo.res.service.business.inf.LocationBusiness; +import org.onap.vfc.nfvo.res.service.dao.inf.LocationDao; +import org.onap.vfc.nfvo.res.service.entity.LocationEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.ResourceUtil; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.util.StringUtil; -import org.openo.nfvo.resmanagement.service.business.inf.LocationBusiness; -import org.openo.nfvo.resmanagement.service.dao.inf.LocationDao; -import org.openo.nfvo.resmanagement.service.entity.LocationEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/NetworkBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/NetworkBusinessImpl.java similarity index 94% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/NetworkBusinessImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/NetworkBusinessImpl.java index 811c3e4..e14f9ca 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/NetworkBusinessImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/NetworkBusinessImpl.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.business.impl; +package org.onap.vfc.nfvo.res.service.business.impl; import java.util.List; import java.util.Map; import java.util.UUID; import org.apache.commons.lang3.StringUtils; +import org.onap.vfc.nfvo.res.common.ResourceUtil; +import org.onap.vfc.nfvo.res.service.business.inf.NetworkBusiness; +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.common.ResourceUtil; -import org.openo.nfvo.resmanagement.service.business.inf.NetworkBusiness; -import org.openo.nfvo.resmanagement.service.dao.inf.NetworkDao; -import org.openo.nfvo.resmanagement.service.entity.NetworkEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/PortBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/PortBusinessImpl.java similarity index 94% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/PortBusinessImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/PortBusinessImpl.java index ce715d9..8b11b82 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/PortBusinessImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/PortBusinessImpl.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.business.impl; +package org.onap.vfc.nfvo.res.service.business.impl; import java.util.List; import java.util.Map; import java.util.UUID; import org.apache.commons.lang3.StringUtils; +import org.onap.vfc.nfvo.res.common.ResourceUtil; +import org.onap.vfc.nfvo.res.service.business.inf.PortBusiness; +import org.onap.vfc.nfvo.res.service.dao.inf.PortDao; +import org.onap.vfc.nfvo.res.service.entity.PortEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.ResourceUtil; -import org.openo.nfvo.resmanagement.service.business.inf.PortBusiness; -import org.openo.nfvo.resmanagement.service.dao.inf.PortDao; -import org.openo.nfvo.resmanagement.service.entity.PortEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/SitesBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/SitesBusinessImpl.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/SitesBusinessImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/SitesBusinessImpl.java index 6ffb3fc..4b724b0 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/SitesBusinessImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/SitesBusinessImpl.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 java.util.HashMap; import java.util.List; @@ -22,12 +22,12 @@ import java.util.Map; import java.util.UUID; import org.apache.commons.lang3.StringUtils; +import org.onap.vfc.nfvo.res.common.ResourceUtil; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.service.business.inf.SitesBusiness; +import org.onap.vfc.nfvo.res.service.dao.inf.SitesDao; +import org.onap.vfc.nfvo.res.service.entity.SitesEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.ResourceUtil; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.service.business.inf.SitesBusiness; -import org.openo.nfvo.resmanagement.service.dao.inf.SitesDao; -import org.openo.nfvo.resmanagement.service.entity.SitesEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/VimBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/VimBusinessImpl.java similarity index 88% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/VimBusinessImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/VimBusinessImpl.java index 6cbcfc4..48ecd1f 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/impl/VimBusinessImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/VimBusinessImpl.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.business.impl; +package org.onap.vfc.nfvo.res.service.business.impl; import java.util.List; import org.apache.commons.lang3.StringUtils; +import org.onap.vfc.nfvo.res.common.ResourceUtil; +import org.onap.vfc.nfvo.res.common.util.StringUtil; +import org.onap.vfc.nfvo.res.service.business.inf.VimBusiness; +import org.onap.vfc.nfvo.res.service.dao.inf.VimDao; +import org.onap.vfc.nfvo.res.service.entity.VimEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.ResourceUtil; -import org.openo.nfvo.resmanagement.common.util.StringUtil; -import org.openo.nfvo.resmanagement.service.business.inf.VimBusiness; -import org.openo.nfvo.resmanagement.service.dao.inf.VimDao; -import org.openo.nfvo.resmanagement.service.entity.VimEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/HostBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/HostBusiness.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/HostBusiness.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/HostBusiness.java index 803c96e..d8a95f3 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/HostBusiness.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/HostBusiness.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.business.inf; +package org.onap.vfc.nfvo.res.service.business.inf; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.entity.HostEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.HostEntity; /** * Host Buisiness Class.
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/LimitsBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/LimitsBusiness.java similarity index 94% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/LimitsBusiness.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/LimitsBusiness.java index b78b6a8..661406a 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/LimitsBusiness.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/LimitsBusiness.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.business.inf; +package org.onap.vfc.nfvo.res.service.business.inf; import org.openo.baseservice.remoteservice.exception.ServiceException; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/LocationBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/LocationBusiness.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/LocationBusiness.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/LocationBusiness.java index fd5cef2..f132a6d 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/LocationBusiness.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/LocationBusiness.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.business.inf; +package org.onap.vfc.nfvo.res.service.business.inf; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.entity.LocationEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.LocationEntity; /** * diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/NetworkBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/NetworkBusiness.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/NetworkBusiness.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/NetworkBusiness.java index be0c9dc..f75d2ae 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/NetworkBusiness.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/NetworkBusiness.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.business.inf; +package org.onap.vfc.nfvo.res.service.business.inf; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.entity.NetworkEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.NetworkEntity; /** * diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/PortBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/PortBusiness.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/PortBusiness.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/PortBusiness.java index b81a3e1..4c19408 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/PortBusiness.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/PortBusiness.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.business.inf; +package org.onap.vfc.nfvo.res.service.business.inf; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.entity.PortEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.PortEntity; /** * Port Buisiness Class.
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/SitesBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/SitesBusiness.java similarity index 96% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/SitesBusiness.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/SitesBusiness.java index 8d11a39..574e745 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/SitesBusiness.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/SitesBusiness.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.business.inf; +package org.onap.vfc.nfvo.res.service.business.inf; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.entity.SitesEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.SitesEntity; /** * DC info interface.
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/VimBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/VimBusiness.java similarity index 93% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/VimBusiness.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/VimBusiness.java index 8806e7a..f29f257 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/business/inf/VimBusiness.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/VimBusiness.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.business.inf; +package org.onap.vfc.nfvo.res.service.business.inf; import java.util.List; +import org.onap.vfc.nfvo.res.service.entity.VimEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.VimEntity; /** * Vim info interface.
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/AbstractDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/AbstractDao.java similarity index 96% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/AbstractDao.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/AbstractDao.java index e3a76ca..b31c5bc 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/AbstractDao.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/AbstractDao.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.service.dao.impl; import org.apache.ibatis.session.SqlSession; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/HostDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/HostDaoImpl.java similarity index 87% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/HostDaoImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/HostDaoImpl.java index 1c5c03c..7dae83c 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/HostDaoImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/HostDaoImpl.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.service.dao.impl; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.dao.impl.AbstractDao; -import org.openo.nfvo.resmanagement.service.dao.inf.HostDao; -import org.openo.nfvo.resmanagement.service.entity.HostEntity; -import org.openo.nfvo.resmanagement.service.mapper.HostMapper; +import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao; +import org.onap.vfc.nfvo.res.service.dao.inf.HostDao; +import org.onap.vfc.nfvo.res.service.entity.HostEntity; +import org.onap.vfc.nfvo.res.service.mapper.HostMapper; /** * diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/LocationDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/LocationDaoImpl.java similarity index 87% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/LocationDaoImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/LocationDaoImpl.java index 949f19f..b6af978 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/LocationDaoImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/LocationDaoImpl.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.service.dao.impl; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.dao.impl.AbstractDao; -import org.openo.nfvo.resmanagement.service.dao.inf.LocationDao; -import org.openo.nfvo.resmanagement.service.entity.LocationEntity; -import org.openo.nfvo.resmanagement.service.mapper.LocationMapper; +import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao; +import org.onap.vfc.nfvo.res.service.dao.inf.LocationDao; +import org.onap.vfc.nfvo.res.service.entity.LocationEntity; +import org.onap.vfc.nfvo.res.service.mapper.LocationMapper; /** * diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/NetworkDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/NetworkDaoImpl.java similarity index 87% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/NetworkDaoImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/NetworkDaoImpl.java index 12769a2..a63e094 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/NetworkDaoImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/NetworkDaoImpl.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.service.dao.impl; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.dao.impl.AbstractDao; -import org.openo.nfvo.resmanagement.service.dao.inf.NetworkDao; -import org.openo.nfvo.resmanagement.service.entity.NetworkEntity; -import org.openo.nfvo.resmanagement.service.mapper.NetworkMapper; +import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao; +import org.onap.vfc.nfvo.res.service.dao.inf.NetworkDao; +import org.onap.vfc.nfvo.res.service.entity.NetworkEntity; +import org.onap.vfc.nfvo.res.service.mapper.NetworkMapper; /** * diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/PortDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/PortDaoImpl.java similarity index 87% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/PortDaoImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/PortDaoImpl.java index e113c7a..d4ec76d 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/PortDaoImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/PortDaoImpl.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.service.dao.impl; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.dao.impl.AbstractDao; -import org.openo.nfvo.resmanagement.service.dao.inf.PortDao; -import org.openo.nfvo.resmanagement.service.entity.PortEntity; -import org.openo.nfvo.resmanagement.service.mapper.PortMapper; +import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao; +import org.onap.vfc.nfvo.res.service.dao.inf.PortDao; +import org.onap.vfc.nfvo.res.service.entity.PortEntity; +import org.onap.vfc.nfvo.res.service.mapper.PortMapper; /** * diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/SitesDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/SitesDaoImpl.java similarity index 86% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/SitesDaoImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/SitesDaoImpl.java index 2d29d7b..f35963e 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/SitesDaoImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/SitesDaoImpl.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.service.dao.impl; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.dao.impl.AbstractDao; -import org.openo.nfvo.resmanagement.service.dao.inf.SitesDao; -import org.openo.nfvo.resmanagement.service.entity.SitesEntity; -import org.openo.nfvo.resmanagement.service.mapper.SitesMapper; +import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao; +import org.onap.vfc.nfvo.res.service.dao.inf.SitesDao; +import org.onap.vfc.nfvo.res.service.entity.SitesEntity; +import org.onap.vfc.nfvo.res.service.mapper.SitesMapper; /** * DC interface.
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/VimDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VimDaoImpl.java similarity index 80% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/VimDaoImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VimDaoImpl.java index e73b251..e8c7374 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/VimDaoImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VimDaoImpl.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.service.dao.impl; import java.util.List; -import org.openo.nfvo.resmanagement.service.dao.impl.AbstractDao; -import org.openo.nfvo.resmanagement.service.dao.inf.VimDao; -import org.openo.nfvo.resmanagement.service.entity.VimEntity; -import org.openo.nfvo.resmanagement.service.mapper.VimMapper; +import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao; +import org.onap.vfc.nfvo.res.service.dao.inf.VimDao; +import org.onap.vfc.nfvo.res.service.entity.VimEntity; +import org.onap.vfc.nfvo.res.service.mapper.VimMapper; /** * Vim interface.
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VirtualLinkDaoImpl.java similarity index 87% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VirtualLinkDaoImpl.java index 96ed906..bfe0345 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VirtualLinkDaoImpl.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.service.dao.impl; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.dao.inf.VirtualLinkDao; -import org.openo.nfvo.resmanagement.service.entity.VirtualLinkEntity; -import org.openo.nfvo.resmanagement.service.mapper.VirtualLinkMapper; +import org.onap.vfc.nfvo.res.service.dao.inf.VirtualLinkDao; +import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity; +import org.onap.vfc.nfvo.res.service.mapper.VirtualLinkMapper; /** *
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/VmDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VmDaoImpl.java similarity index 90% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/VmDaoImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VmDaoImpl.java index ee3806c..ec174e2 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/VmDaoImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VmDaoImpl.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.service.dao.impl; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.dao.inf.VmDao; -import org.openo.nfvo.resmanagement.service.entity.VmEntity; -import org.openo.nfvo.resmanagement.service.mapper.VmMapper; +import org.onap.vfc.nfvo.res.service.dao.inf.VmDao; +import org.onap.vfc.nfvo.res.service.entity.VmEntity; +import org.onap.vfc.nfvo.res.service.mapper.VmMapper; /** *
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/VnfDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VnfDaoImpl.java similarity index 87% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/VnfDaoImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VnfDaoImpl.java index 42bb5b5..de1b293 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/VnfDaoImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VnfDaoImpl.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.service.dao.impl; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.dao.inf.VnfDao; -import org.openo.nfvo.resmanagement.service.entity.VnfEntity; -import org.openo.nfvo.resmanagement.service.mapper.VnfMapper; +import org.onap.vfc.nfvo.res.service.dao.inf.VnfDao; +import org.onap.vfc.nfvo.res.service.entity.VnfEntity; +import org.onap.vfc.nfvo.res.service.mapper.VnfMapper; /** *
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/VnfInfoDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VnfInfoDaoImpl.java similarity index 89% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/VnfInfoDaoImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VnfInfoDaoImpl.java index 6e8d32b..a01e01d 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/VnfInfoDaoImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VnfInfoDaoImpl.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.service.dao.impl; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.dao.inf.VnfInfoDao; -import org.openo.nfvo.resmanagement.service.entity.VnfInfoEntity; -import org.openo.nfvo.resmanagement.service.mapper.VnfInfoMapper; +import org.onap.vfc.nfvo.res.service.dao.inf.VnfInfoDao; +import org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity; +import org.onap.vfc.nfvo.res.service.mapper.VnfInfoMapper; /** *
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/VnfStatusDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VnfStatusDaoImpl.java similarity index 89% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/VnfStatusDaoImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VnfStatusDaoImpl.java index ed7db95..6570664 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/impl/VnfStatusDaoImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VnfStatusDaoImpl.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.impl; +package org.onap.vfc.nfvo.res.service.dao.impl; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.dao.inf.VnfStatusDao; -import org.openo.nfvo.resmanagement.service.entity.VnfStatusEntity; -import org.openo.nfvo.resmanagement.service.mapper.VnfStatusMapper; +import org.onap.vfc.nfvo.res.service.dao.inf.VnfStatusDao; +import org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity; +import org.onap.vfc.nfvo.res.service.mapper.VnfStatusMapper; /** *
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/HostDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/HostDao.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/HostDao.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/HostDao.java index a48c6aa..0f0c825 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/HostDao.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/HostDao.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.inf; +package org.onap.vfc.nfvo.res.service.dao.inf; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.HostEntity; +import org.onap.vfc.nfvo.res.service.entity.HostEntity; /** * Host info interface.
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/LocationDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/LocationDao.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/LocationDao.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/LocationDao.java index dcf2c9f..4266b6a 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/LocationDao.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/LocationDao.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.inf; +package org.onap.vfc.nfvo.res.service.dao.inf; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.LocationEntity; +import org.onap.vfc.nfvo.res.service.entity.LocationEntity; /** * diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/NetworkDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/NetworkDao.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/NetworkDao.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/NetworkDao.java index 0725bd9..1c9b319 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/NetworkDao.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/NetworkDao.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.inf; +package org.onap.vfc.nfvo.res.service.dao.inf; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.NetworkEntity; +import org.onap.vfc.nfvo.res.service.entity.NetworkEntity; /** * diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/PortDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/PortDao.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/PortDao.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/PortDao.java index f558b5d..555e507 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/PortDao.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/PortDao.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.inf; +package org.onap.vfc.nfvo.res.service.dao.inf; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.PortEntity; +import org.onap.vfc.nfvo.res.service.entity.PortEntity; /** * Port info interface.
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/SitesDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/SitesDao.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/SitesDao.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/SitesDao.java index f978c8b..c179d40 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/SitesDao.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/SitesDao.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.inf; +package org.onap.vfc.nfvo.res.service.dao.inf; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.SitesEntity; +import org.onap.vfc.nfvo.res.service.entity.SitesEntity; /** * Sites info interface.
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/VimDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VimDao.java similarity index 92% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/VimDao.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VimDao.java index 1b17a46..38f1dda 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/VimDao.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VimDao.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.inf; +package org.onap.vfc.nfvo.res.service.dao.inf; import java.util.List; -import org.openo.nfvo.resmanagement.service.entity.VimEntity; +import org.onap.vfc.nfvo.res.service.entity.VimEntity; /** * Vim info interface.
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/VirtualLinkDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VirtualLinkDao.java similarity index 91% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/VirtualLinkDao.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VirtualLinkDao.java index ead3975..4b12169 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/VirtualLinkDao.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VirtualLinkDao.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.inf; +package org.onap.vfc.nfvo.res.service.dao.inf; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.VirtualLinkEntity; +import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity; /** *
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/VmDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VmDao.java similarity index 89% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/VmDao.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VmDao.java index 6d2b6b6..3b88b5c 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/VmDao.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VmDao.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.inf; +package org.onap.vfc.nfvo.res.service.dao.inf; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.VmEntity; +import org.onap.vfc.nfvo.res.service.entity.VmEntity; /** *
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/VnfDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VnfDao.java similarity index 91% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/VnfDao.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VnfDao.java index 7f72ce3..03b7ff4 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/VnfDao.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VnfDao.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.inf; +package org.onap.vfc.nfvo.res.service.dao.inf; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.VnfEntity; +import org.onap.vfc.nfvo.res.service.entity.VnfEntity; /** *
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/VnfInfoDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VnfInfoDao.java similarity index 89% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/VnfInfoDao.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VnfInfoDao.java index 9e2aade..6ea65cb 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/VnfInfoDao.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VnfInfoDao.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.inf; +package org.onap.vfc.nfvo.res.service.dao.inf; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.VnfInfoEntity; +import org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity; /** *
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/VnfStatusDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VnfStatusDao.java similarity index 89% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/VnfStatusDao.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VnfStatusDao.java index ef5ba9b..ee6f0f1 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/dao/inf/VnfStatusDao.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VnfStatusDao.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.dao.inf; +package org.onap.vfc.nfvo.res.service.dao.inf; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.VnfStatusEntity; +import org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity; /** *
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/HostEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/HostEntity.java similarity index 97% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/HostEntity.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/HostEntity.java index f8166da..6c5a20f 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/HostEntity.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/HostEntity.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.entity; +package org.onap.vfc.nfvo.res.service.entity; import org.apache.commons.lang3.StringUtils; -import org.openo.nfvo.resmanagement.common.util.JsonUtil; +import org.onap.vfc.nfvo.res.common.util.JsonUtil; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/LocationEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/LocationEntity.java similarity index 98% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/LocationEntity.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/LocationEntity.java index eab8ca0..95d5fad 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/LocationEntity.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/LocationEntity.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.entity; +package org.onap.vfc.nfvo.res.service.entity; import org.apache.commons.lang3.StringUtils; -import org.openo.nfvo.resmanagement.common.util.JsonUtil; +import org.onap.vfc.nfvo.res.common.util.JsonUtil; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/NetworkEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/NetworkEntity.java similarity index 98% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/NetworkEntity.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/NetworkEntity.java index f65ad37..7f1a7e5 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/NetworkEntity.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/NetworkEntity.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.entity; +package org.onap.vfc.nfvo.res.service.entity; import org.apache.commons.lang3.StringUtils; -import org.openo.nfvo.resmanagement.common.util.JsonUtil; +import org.onap.vfc.nfvo.res.common.util.JsonUtil; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/PortEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/PortEntity.java similarity index 97% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/PortEntity.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/PortEntity.java index 4700554..2249726 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/PortEntity.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/PortEntity.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.entity; +package org.onap.vfc.nfvo.res.service.entity; import org.apache.commons.lang3.StringUtils; -import org.openo.nfvo.resmanagement.common.util.JsonUtil; +import org.onap.vfc.nfvo.res.common.util.JsonUtil; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/SitesEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/SitesEntity.java similarity index 98% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/SitesEntity.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/SitesEntity.java index 33c1942..c2940d6 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/SitesEntity.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/SitesEntity.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.entity; +package org.onap.vfc.nfvo.res.service.entity; import org.apache.commons.lang3.StringUtils; -import org.openo.nfvo.resmanagement.common.util.JsonUtil; -import org.openo.nfvo.resmanagement.common.util.StringUtil; +import org.onap.vfc.nfvo.res.common.util.JsonUtil; +import org.onap.vfc.nfvo.res.common.util.StringUtil; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/VimEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VimEntity.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/VimEntity.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VimEntity.java index 9959101..b1b52de 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/VimEntity.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VimEntity.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.entity; +package org.onap.vfc.nfvo.res.service.entity; import org.apache.commons.lang3.StringUtils; -import org.openo.nfvo.resmanagement.common.util.JsonUtil; +import org.onap.vfc.nfvo.res.common.util.JsonUtil; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/VirtualLinkEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VirtualLinkEntity.java similarity index 98% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/VirtualLinkEntity.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VirtualLinkEntity.java index c9a38d9..d4408e8 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/VirtualLinkEntity.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VirtualLinkEntity.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.entity; +package org.onap.vfc.nfvo.res.service.entity; import java.io.Serializable; import org.apache.commons.lang3.StringUtils; -import org.openo.nfvo.resmanagement.common.util.JsonUtil; +import org.onap.vfc.nfvo.res.common.util.JsonUtil; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/VmEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VmEntity.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/VmEntity.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VmEntity.java index e01cabd..d46633e 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/VmEntity.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VmEntity.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.entity; +package org.onap.vfc.nfvo.res.service.entity; import java.io.Serializable; import org.apache.commons.lang3.StringUtils; -import org.openo.nfvo.resmanagement.common.util.JsonUtil; +import org.onap.vfc.nfvo.res.common.util.JsonUtil; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/VnfEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VnfEntity.java similarity index 98% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/VnfEntity.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VnfEntity.java index 3a18524..4028c89 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/VnfEntity.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VnfEntity.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.entity; +package org.onap.vfc.nfvo.res.service.entity; import java.io.Serializable; import org.apache.commons.lang3.StringUtils; -import org.openo.nfvo.resmanagement.common.util.JsonUtil; +import org.onap.vfc.nfvo.res.common.util.JsonUtil; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/VnfInfoEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VnfInfoEntity.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/VnfInfoEntity.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VnfInfoEntity.java index 023f491..f993d9c 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/VnfInfoEntity.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VnfInfoEntity.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.entity; +package org.onap.vfc.nfvo.res.service.entity; import java.io.Serializable; import org.apache.commons.lang3.StringUtils; -import org.openo.nfvo.resmanagement.common.util.JsonUtil; +import org.onap.vfc.nfvo.res.common.util.JsonUtil; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/VnfStatusEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VnfStatusEntity.java similarity index 98% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/VnfStatusEntity.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VnfStatusEntity.java index 290f264..78ad1b8 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/entity/VnfStatusEntity.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VnfStatusEntity.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.entity; +package org.onap.vfc.nfvo.res.service.entity; import java.io.Serializable; import org.apache.commons.lang3.StringUtils; -import org.openo.nfvo.resmanagement.common.util.JsonUtil; +import org.onap.vfc.nfvo.res.common.util.JsonUtil; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/GrantResServiceImpl.java similarity index 96% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/GrantResServiceImpl.java index 4a8a633..2eea6d0 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/GrantResServiceImpl.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.group.impl; +package org.onap.vfc.nfvo.res.service.group.impl; +import org.onap.vfc.nfvo.res.common.VimUtil; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.Sites; +import org.onap.vfc.nfvo.res.service.group.inf.GrantResService; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.VimUtil; -import org.openo.nfvo.resmanagement.service.base.openstack.inf.Sites; -import org.openo.nfvo.resmanagement.service.group.inf.GrantResService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/IResourceAddServiceImpl.java similarity index 94% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/IResourceAddServiceImpl.java index 0699b98..6c7bad9 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/IResourceAddServiceImpl.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.group.impl; +package org.onap.vfc.nfvo.res.service.group.impl; import java.util.HashMap; import java.util.Map; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.UrlConstant; +import org.onap.vfc.nfvo.res.common.util.JsonUtil; +import org.onap.vfc.nfvo.res.common.util.RestfulUtil; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.InterfaceResManagement; import org.openo.baseservice.remoteservice.exception.ServiceException; import org.openo.baseservice.roa.util.restclient.RestfulParametes; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.common.util.JsonUtil; -import org.openo.nfvo.resmanagement.common.util.RestfulUtil; -import org.openo.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.transaction.annotation.Transactional; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/IResourceDelServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/IResourceDelServiceImpl.java similarity index 86% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/IResourceDelServiceImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/IResourceDelServiceImpl.java index 59cff09..8dbcaf0 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/IResourceDelServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/IResourceDelServiceImpl.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.group.impl; +package org.onap.vfc.nfvo.res.service.group.impl; import java.util.HashMap; import java.util.Map; +import org.onap.vfc.nfvo.res.common.ResourceUtil; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.InterfaceResManagement; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.Vim; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.ResourceUtil; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement; -import org.openo.nfvo.resmanagement.service.base.openstack.inf.Vim; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/IResourceUpdateServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/IResourceUpdateServiceImpl.java similarity index 93% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/IResourceUpdateServiceImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/IResourceUpdateServiceImpl.java index b789bf9..f26fedf 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/IResourceUpdateServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/IResourceUpdateServiceImpl.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.group.impl; +package org.onap.vfc.nfvo.res.service.group.impl; import java.util.HashMap; import java.util.Map; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.UrlConstant; +import org.onap.vfc.nfvo.res.common.util.RestfulUtil; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.InterfaceResManagement; import org.openo.baseservice.remoteservice.exception.ServiceException; import org.openo.baseservice.roa.util.restclient.RestfulParametes; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.common.util.RestfulUtil; -import org.openo.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.transaction.annotation.Transactional; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/ResOperateServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/ResOperateServiceImpl.java similarity index 88% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/ResOperateServiceImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/ResOperateServiceImpl.java index 788e487..66686e7 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/ResOperateServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/ResOperateServiceImpl.java @@ -14,31 +14,31 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.group.impl; +package org.onap.vfc.nfvo.res.service.group.impl; import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.commons.lang3.StringUtils; +import org.onap.vfc.nfvo.res.common.ResourceUtil; +import org.onap.vfc.nfvo.res.common.constant.Constant; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.UrlConstant; +import org.onap.vfc.nfvo.res.common.util.JsonUtil; +import org.onap.vfc.nfvo.res.common.util.RestfulUtil; +import org.onap.vfc.nfvo.res.common.util.StringUtil; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.Host; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.InterfaceResManagement; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.Network; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.Port; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.Sites; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.Vim; +import org.onap.vfc.nfvo.res.service.entity.HostEntity; +import org.onap.vfc.nfvo.res.service.entity.VimEntity; +import org.onap.vfc.nfvo.res.service.group.inf.ResOperateService; import org.openo.baseservice.remoteservice.exception.ServiceException; import org.openo.baseservice.roa.util.restclient.RestfulParametes; -import org.openo.nfvo.resmanagement.common.ResourceUtil; -import org.openo.nfvo.resmanagement.common.constant.Constant; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.common.util.JsonUtil; -import org.openo.nfvo.resmanagement.common.util.RestfulUtil; -import org.openo.nfvo.resmanagement.common.util.StringUtil; -import org.openo.nfvo.resmanagement.service.base.openstack.inf.Host; -import org.openo.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement; -import org.openo.nfvo.resmanagement.service.base.openstack.inf.Network; -import org.openo.nfvo.resmanagement.service.base.openstack.inf.Port; -import org.openo.nfvo.resmanagement.service.base.openstack.inf.Sites; -import org.openo.nfvo.resmanagement.service.base.openstack.inf.Vim; -import org.openo.nfvo.resmanagement.service.entity.HostEntity; -import org.openo.nfvo.resmanagement.service.entity.VimEntity; -import org.openo.nfvo.resmanagement.service.group.inf.ResOperateService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.transaction.annotation.Transactional; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/VirtualLinkServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VirtualLinkServiceImpl.java similarity index 87% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/VirtualLinkServiceImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VirtualLinkServiceImpl.java index 5dd726c..287f636 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/VirtualLinkServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VirtualLinkServiceImpl.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.group.impl; +package org.onap.vfc.nfvo.res.service.group.impl; import java.util.List; import java.util.Map; import java.util.UUID; import org.apache.commons.lang3.StringUtils; +import org.onap.vfc.nfvo.res.common.ResourceUtil; +import org.onap.vfc.nfvo.res.service.dao.inf.VirtualLinkDao; +import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity; +import org.onap.vfc.nfvo.res.service.group.inf.VirtualLinkService; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.ResourceUtil; -import org.openo.nfvo.resmanagement.service.dao.inf.VirtualLinkDao; -import org.openo.nfvo.resmanagement.service.entity.VirtualLinkEntity; -import org.openo.nfvo.resmanagement.service.group.inf.VirtualLinkService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,7 +58,7 @@ public class VirtualLinkServiceImpl implements VirtualLinkService { if(!checkId(virtualLinkEntity.getId())) { LOGGER.error("function=addVl; msg=add error, because id is already exist."); throw new ServiceException(ResourceUtil - .getMessage("org.openo.nfvo.resmanagement.service.group.impl.VirtualLinkServiceImpl.add.id.check")); + .getMessage("org.onap.vfc.nfvo.res.service.group.impl.VirtualLinkServiceImpl.add.id.check")); } if(StringUtils.isEmpty(virtualLinkEntity.getId())) { virtualLinkEntity.setId(UUID.randomUUID().toString()); diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/VmServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VmServiceImpl.java similarity index 91% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/VmServiceImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VmServiceImpl.java index 51ec0dd..fef97b2 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/VmServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VmServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.group.impl; +package org.onap.vfc.nfvo.res.service.group.impl; import java.util.HashMap; import java.util.List; @@ -22,14 +22,14 @@ import java.util.Map; import java.util.UUID; import org.apache.commons.lang3.StringUtils; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.UrlConstant; +import org.onap.vfc.nfvo.res.common.util.RestfulUtil; +import org.onap.vfc.nfvo.res.service.dao.inf.VmDao; +import org.onap.vfc.nfvo.res.service.entity.VmEntity; +import org.onap.vfc.nfvo.res.service.group.inf.VmService; import org.openo.baseservice.remoteservice.exception.ServiceException; import org.openo.baseservice.roa.util.restclient.RestfulParametes; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.common.util.RestfulUtil; -import org.openo.nfvo.resmanagement.service.dao.inf.VmDao; -import org.openo.nfvo.resmanagement.service.entity.VmEntity; -import org.openo.nfvo.resmanagement.service.group.inf.VmService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/VnfInfoServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VnfInfoServiceImpl.java similarity index 91% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/VnfInfoServiceImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VnfInfoServiceImpl.java index fb34127..7b0e1b8 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/VnfInfoServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VnfInfoServiceImpl.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.group.impl; +package org.onap.vfc.nfvo.res.service.group.impl; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.dao.inf.VnfInfoDao; +import org.onap.vfc.nfvo.res.service.entity.VmEntity; +import org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity; +import org.onap.vfc.nfvo.res.service.group.inf.VmService; +import org.onap.vfc.nfvo.res.service.group.inf.VnfInfoService; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.dao.inf.VnfInfoDao; -import org.openo.nfvo.resmanagement.service.entity.VmEntity; -import org.openo.nfvo.resmanagement.service.entity.VnfInfoEntity; -import org.openo.nfvo.resmanagement.service.group.inf.VmService; -import org.openo.nfvo.resmanagement.service.group.inf.VnfInfoService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/VnfServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VnfServiceImpl.java similarity index 87% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/VnfServiceImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VnfServiceImpl.java index 3a1a02e..552d252 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/VnfServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VnfServiceImpl.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.group.impl; +package org.onap.vfc.nfvo.res.service.group.impl; import java.util.List; import java.util.Map; import java.util.UUID; import org.apache.commons.lang3.StringUtils; +import org.onap.vfc.nfvo.res.common.ResourceUtil; +import org.onap.vfc.nfvo.res.service.dao.inf.VnfDao; +import org.onap.vfc.nfvo.res.service.entity.VnfEntity; +import org.onap.vfc.nfvo.res.service.group.inf.VnfInfoService; +import org.onap.vfc.nfvo.res.service.group.inf.VnfService; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.ResourceUtil; -import org.openo.nfvo.resmanagement.service.dao.inf.VnfDao; -import org.openo.nfvo.resmanagement.service.entity.VnfEntity; -import org.openo.nfvo.resmanagement.service.group.inf.VnfInfoService; -import org.openo.nfvo.resmanagement.service.group.inf.VnfService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,7 +61,7 @@ public class VnfServiceImpl implements VnfService { if(!checkId(vnfEntity.getId())) { LOGGER.error("function=addVnf; msg=add error, because id is already exist."); throw new ServiceException(ResourceUtil - .getMessage("org.openo.nfvo.resmanagement.service.group.impl.VnfServiceImpl.add.id.check")); + .getMessage("org.onap.vfc.nfvo.res.service.group.impl.VnfServiceImpl.add.id.check")); } if(StringUtils.isEmpty(vnfEntity.getId())) { vnfEntity.setId(UUID.randomUUID().toString()); diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/VnfStatusServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VnfStatusServiceImpl.java similarity index 92% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/VnfStatusServiceImpl.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VnfStatusServiceImpl.java index 7e37561..a846d59 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/impl/VnfStatusServiceImpl.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VnfStatusServiceImpl.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.group.impl; +package org.onap.vfc.nfvo.res.service.group.impl; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.dao.inf.VnfStatusDao; +import org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity; +import org.onap.vfc.nfvo.res.service.group.inf.VnfStatusService; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.dao.inf.VnfStatusDao; -import org.openo.nfvo.resmanagement.service.entity.VnfStatusEntity; -import org.openo.nfvo.resmanagement.service.group.inf.VnfStatusService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/GrantResService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/GrantResService.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/GrantResService.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/GrantResService.java index 4c52b9c..502cba9 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/GrantResService.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/GrantResService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.group.inf; +package org.onap.vfc.nfvo.res.service.group.inf; import org.openo.baseservice.remoteservice.exception.ServiceException; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/ResOperateService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/ResOperateService.java similarity index 97% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/ResOperateService.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/ResOperateService.java index 7e2069f..ebd1b7b 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/ResOperateService.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/ResOperateService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.group.inf; +package org.onap.vfc.nfvo.res.service.group.inf; import org.openo.baseservice.remoteservice.exception.ServiceException; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/VirtualLinkService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VirtualLinkService.java similarity index 91% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/VirtualLinkService.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VirtualLinkService.java index cd1ea93..aaca1b9 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/VirtualLinkService.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VirtualLinkService.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.group.inf; +package org.onap.vfc.nfvo.res.service.group.inf; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.VirtualLinkEntity; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/VmService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VmService.java similarity index 90% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/VmService.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VmService.java index 668f9d3..98d9565 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/VmService.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VmService.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.group.inf; +package org.onap.vfc.nfvo.res.service.group.inf; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.entity.VmEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.VmEntity; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/VnfInfoService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VnfInfoService.java similarity index 89% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/VnfInfoService.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VnfInfoService.java index 6e736d6..891a8ac 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/VnfInfoService.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VnfInfoService.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.group.inf; +package org.onap.vfc.nfvo.res.service.group.inf; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.VnfInfoEntity; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/VnfService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VnfService.java similarity index 92% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/VnfService.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VnfService.java index 4fbe45e..ab4c46d 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/VnfService.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VnfService.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.group.inf; +package org.onap.vfc.nfvo.res.service.group.inf; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.entity.VnfEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.VnfEntity; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/VnfStatusService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VnfStatusService.java similarity index 89% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/VnfStatusService.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VnfStatusService.java index cdc826c..029dd1a 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/group/inf/VnfStatusService.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VnfStatusService.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.group.inf; +package org.onap.vfc.nfvo.res.service.group.inf; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.service.entity.VnfStatusEntity; import net.sf.json.JSONObject; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/HostMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/HostMapper.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/HostMapper.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/HostMapper.java index 643c581..ab3fdc9 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/HostMapper.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/HostMapper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.mapper; +package org.onap.vfc.nfvo.res.service.mapper; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.HostEntity; +import org.onap.vfc.nfvo.res.service.entity.HostEntity; /** * Host info interface.
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/LocationMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/LocationMapper.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/LocationMapper.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/LocationMapper.java index 2a2ec5c..b06fd55 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/LocationMapper.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/LocationMapper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.mapper; +package org.onap.vfc.nfvo.res.service.mapper; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.LocationEntity; +import org.onap.vfc.nfvo.res.service.entity.LocationEntity; /** * diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/NetworkMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/NetworkMapper.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/NetworkMapper.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/NetworkMapper.java index b727f4f..6b71ca0 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/NetworkMapper.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/NetworkMapper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.mapper; +package org.onap.vfc.nfvo.res.service.mapper; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.NetworkEntity; +import org.onap.vfc.nfvo.res.service.entity.NetworkEntity; /** * diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/PortMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/PortMapper.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/PortMapper.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/PortMapper.java index 9cae421..d14b476 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/PortMapper.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/PortMapper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.mapper; +package org.onap.vfc.nfvo.res.service.mapper; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.PortEntity; +import org.onap.vfc.nfvo.res.service.entity.PortEntity; /** * Port info interface.
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/SitesMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/SitesMapper.java similarity index 94% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/SitesMapper.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/SitesMapper.java index e86d5e1..28407c3 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/SitesMapper.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/SitesMapper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.mapper; +package org.onap.vfc.nfvo.res.service.mapper; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.SitesEntity; +import org.onap.vfc.nfvo.res.service.entity.SitesEntity; /** * ResPool info interface.
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/VimMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VimMapper.java similarity index 92% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/VimMapper.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VimMapper.java index 1c4573a..6963637 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/VimMapper.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VimMapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.mapper; +package org.onap.vfc.nfvo.res.service.mapper; import java.util.List; -import org.openo.nfvo.resmanagement.service.entity.VimEntity; +import org.onap.vfc.nfvo.res.service.entity.VimEntity; /** * Vim info interface.
diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/VirtualLinkMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VirtualLinkMapper.java similarity index 89% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/VirtualLinkMapper.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VirtualLinkMapper.java index c4cba74..5a1294b 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/VirtualLinkMapper.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VirtualLinkMapper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.mapper; +package org.onap.vfc.nfvo.res.service.mapper; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.VirtualLinkEntity; +import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity; public interface VirtualLinkMapper { diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/VmMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VmMapper.java similarity index 90% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/VmMapper.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VmMapper.java index 4cb4878..51fea63 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/VmMapper.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VmMapper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.mapper; +package org.onap.vfc.nfvo.res.service.mapper; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.VmEntity; +import org.onap.vfc.nfvo.res.service.entity.VmEntity; public interface VmMapper { diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/VnfInfoMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VnfInfoMapper.java similarity index 90% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/VnfInfoMapper.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VnfInfoMapper.java index 45d4f45..c7a51ae 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/VnfInfoMapper.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VnfInfoMapper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.mapper; +package org.onap.vfc.nfvo.res.service.mapper; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.VnfInfoEntity; +import org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity; public interface VnfInfoMapper { diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/VnfMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VnfMapper.java similarity index 89% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/VnfMapper.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VnfMapper.java index 5d0078f..39bbeff 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/VnfMapper.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VnfMapper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.mapper; +package org.onap.vfc.nfvo.res.service.mapper; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.VnfEntity; +import org.onap.vfc.nfvo.res.service.entity.VnfEntity; public interface VnfMapper { diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/VnfStatusMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VnfStatusMapper.java similarity index 90% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/VnfStatusMapper.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VnfStatusMapper.java index c7e5c7a..75dd652 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/mapper/VnfStatusMapper.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VnfStatusMapper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.mapper; +package org.onap.vfc.nfvo.res.service.mapper; import java.util.List; import java.util.Map; -import org.openo.nfvo.resmanagement.service.entity.VnfStatusEntity; +import org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity; public interface VnfStatusMapper { diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/GrantResourseRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/GrantResourseRoa.java similarity index 87% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/GrantResourseRoa.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/GrantResourseRoa.java index 47a9a02..7affca5 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/GrantResourseRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/GrantResourseRoa.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 javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; @@ -24,13 +24,13 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.onap.vfc.nfvo.res.common.ResourceUtil; +import org.onap.vfc.nfvo.res.common.constant.HttpConstant; +import org.onap.vfc.nfvo.res.common.constant.UrlConstant; +import org.onap.vfc.nfvo.res.common.util.request.RequestUtil; +import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil; +import org.onap.vfc.nfvo.res.service.group.inf.GrantResService; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.ResourceUtil; -import org.openo.nfvo.resmanagement.common.constant.HttpConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.common.util.request.RequestUtil; -import org.openo.nfvo.resmanagement.common.util.response.ResponseUtil; -import org.openo.nfvo.resmanagement.service.group.inf.GrantResService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/HostRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/HostRoa.java similarity index 89% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/HostRoa.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/HostRoa.java index 98e7da0..b8ab7b7 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/HostRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/HostRoa.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 java.util.HashMap; import java.util.List; @@ -33,15 +33,15 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.onap.vfc.nfvo.res.common.constant.HttpConstant; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.UrlConstant; +import org.onap.vfc.nfvo.res.common.util.request.RequestUtil; +import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil; +import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.Host; +import org.onap.vfc.nfvo.res.service.entity.HostEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.constant.HttpConstant; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.common.util.request.RequestUtil; -import org.openo.nfvo.resmanagement.common.util.response.ResponseUtil; -import org.openo.nfvo.resmanagement.common.util.response.RoaResponseUtil; -import org.openo.nfvo.resmanagement.service.base.openstack.inf.Host; -import org.openo.nfvo.resmanagement.service.entity.HostEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/LimitsRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/LimitsRoa.java similarity index 88% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/LimitsRoa.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/LimitsRoa.java index 5275dfe..849e64d 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/LimitsRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/LimitsRoa.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 javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; @@ -25,10 +25,10 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.UrlConstant; +import org.onap.vfc.nfvo.res.service.business.inf.LimitsBusiness; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.service.business.inf.LimitsBusiness; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/LocationRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/LocationRoa.java similarity index 92% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/LocationRoa.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/LocationRoa.java index f3bb351..b982b4c 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/LocationRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/LocationRoa.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 java.util.ArrayList; import java.util.HashMap; @@ -34,19 +34,19 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.onap.vfc.nfvo.res.common.ResourceUtil; +import org.onap.vfc.nfvo.res.common.constant.HttpConstant; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.UrlConstant; +import org.onap.vfc.nfvo.res.common.util.JsonUtil; +import org.onap.vfc.nfvo.res.common.util.request.RequestUtil; +import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil; +import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil; +import org.onap.vfc.nfvo.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.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.ResourceUtil; -import org.openo.nfvo.resmanagement.common.constant.HttpConstant; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.common.util.JsonUtil; -import org.openo.nfvo.resmanagement.common.util.request.RequestUtil; -import org.openo.nfvo.resmanagement.common.util.response.ResponseUtil; -import org.openo.nfvo.resmanagement.common.util.response.RoaResponseUtil; -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.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/NetworkRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/NetworkRoa.java similarity index 89% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/NetworkRoa.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/NetworkRoa.java index 8a3e0bd..7f9d0f5 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/NetworkRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/NetworkRoa.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 java.util.HashMap; import java.util.List; @@ -33,15 +33,15 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.onap.vfc.nfvo.res.common.constant.HttpConstant; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.UrlConstant; +import org.onap.vfc.nfvo.res.common.util.request.RequestUtil; +import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil; +import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.Network; +import org.onap.vfc.nfvo.res.service.entity.NetworkEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.constant.HttpConstant; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.common.util.request.RequestUtil; -import org.openo.nfvo.resmanagement.common.util.response.ResponseUtil; -import org.openo.nfvo.resmanagement.common.util.response.RoaResponseUtil; -import org.openo.nfvo.resmanagement.service.base.openstack.inf.Network; -import org.openo.nfvo.resmanagement.service.entity.NetworkEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/PortRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/PortRoa.java similarity index 89% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/PortRoa.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/PortRoa.java index 1d79f93..952e326 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/PortRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/PortRoa.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 java.util.HashMap; import java.util.List; @@ -33,15 +33,15 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.onap.vfc.nfvo.res.common.constant.HttpConstant; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.UrlConstant; +import org.onap.vfc.nfvo.res.common.util.request.RequestUtil; +import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil; +import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.Port; +import org.onap.vfc.nfvo.res.service.entity.PortEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.constant.HttpConstant; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.common.util.request.RequestUtil; -import org.openo.nfvo.resmanagement.common.util.response.ResponseUtil; -import org.openo.nfvo.resmanagement.common.util.response.RoaResponseUtil; -import org.openo.nfvo.resmanagement.service.base.openstack.inf.Port; -import org.openo.nfvo.resmanagement.service.entity.PortEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/ResOperateRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/ResOperateRoa.java similarity index 89% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/ResOperateRoa.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/ResOperateRoa.java index 1e68e83..111160e 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/ResOperateRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/ResOperateRoa.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 javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; @@ -27,15 +27,15 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.onap.vfc.nfvo.res.common.VimUtil; +import org.onap.vfc.nfvo.res.common.constant.HttpConstant; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.UrlConstant; +import org.onap.vfc.nfvo.res.common.util.request.RequestUtil; +import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil; +import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil; +import org.onap.vfc.nfvo.res.service.group.inf.ResOperateService; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.VimUtil; -import org.openo.nfvo.resmanagement.common.constant.HttpConstant; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.common.util.request.RequestUtil; -import org.openo.nfvo.resmanagement.common.util.response.ResponseUtil; -import org.openo.nfvo.resmanagement.common.util.response.RoaResponseUtil; -import org.openo.nfvo.resmanagement.service.group.inf.ResOperateService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/SitesRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/SitesRoa.java similarity index 90% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/SitesRoa.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/SitesRoa.java index 192d33d..6d31aa8 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/SitesRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/SitesRoa.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 java.util.HashMap; import java.util.List; @@ -32,16 +32,16 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.onap.vfc.nfvo.res.common.VimUtil; +import org.onap.vfc.nfvo.res.common.constant.HttpConstant; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.UrlConstant; +import org.onap.vfc.nfvo.res.common.util.request.RequestUtil; +import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil; +import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil; +import org.onap.vfc.nfvo.res.service.base.openstack.inf.Sites; +import org.onap.vfc.nfvo.res.service.entity.SitesEntity; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.VimUtil; -import org.openo.nfvo.resmanagement.common.constant.HttpConstant; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.common.util.request.RequestUtil; -import org.openo.nfvo.resmanagement.common.util.response.ResponseUtil; -import org.openo.nfvo.resmanagement.common.util.response.RoaResponseUtil; -import org.openo.nfvo.resmanagement.service.base.openstack.inf.Sites; -import org.openo.nfvo.resmanagement.service.entity.SitesEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/SwaggerRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/SwaggerRoa.java similarity index 96% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/SwaggerRoa.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/SwaggerRoa.java index 0e9bf48..45ea2c1 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/SwaggerRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/SwaggerRoa.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 java.io.IOException; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/VirtualLinkRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VirtualLinkRoa.java similarity index 86% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/VirtualLinkRoa.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VirtualLinkRoa.java index 524a474..a30d673 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/VirtualLinkRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VirtualLinkRoa.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 java.util.HashMap; import java.util.List; @@ -31,16 +31,16 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.onap.vfc.nfvo.res.common.ResourceUtil; +import org.onap.vfc.nfvo.res.common.constant.HttpConstant; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.UrlConstant; +import org.onap.vfc.nfvo.res.common.util.request.RequestUtil; +import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil; +import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil; +import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity; +import org.onap.vfc.nfvo.res.service.group.inf.VirtualLinkService; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.ResourceUtil; -import org.openo.nfvo.resmanagement.common.constant.HttpConstant; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.common.util.request.RequestUtil; -import org.openo.nfvo.resmanagement.common.util.response.ResponseUtil; -import org.openo.nfvo.resmanagement.common.util.response.RoaResponseUtil; -import org.openo.nfvo.resmanagement.service.entity.VirtualLinkEntity; -import org.openo.nfvo.resmanagement.service.group.inf.VirtualLinkService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/VmRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VmRoa.java similarity index 86% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/VmRoa.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VmRoa.java index cb9d2b6..5b17caa 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/VmRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VmRoa.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 java.util.HashMap; import java.util.List; @@ -31,16 +31,16 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.onap.vfc.nfvo.res.common.ResourceUtil; +import org.onap.vfc.nfvo.res.common.constant.HttpConstant; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.UrlConstant; +import org.onap.vfc.nfvo.res.common.util.request.RequestUtil; +import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil; +import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil; +import org.onap.vfc.nfvo.res.service.entity.VmEntity; +import org.onap.vfc.nfvo.res.service.group.inf.VmService; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.ResourceUtil; -import org.openo.nfvo.resmanagement.common.constant.HttpConstant; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.common.util.request.RequestUtil; -import org.openo.nfvo.resmanagement.common.util.response.ResponseUtil; -import org.openo.nfvo.resmanagement.common.util.response.RoaResponseUtil; -import org.openo.nfvo.resmanagement.service.entity.VmEntity; -import org.openo.nfvo.resmanagement.service.group.inf.VmService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/VnfInfoRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VnfInfoRoa.java similarity index 86% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/VnfInfoRoa.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VnfInfoRoa.java index b6fd5a5..c4f631c 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/VnfInfoRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VnfInfoRoa.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 java.util.HashMap; import java.util.List; @@ -31,16 +31,16 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.onap.vfc.nfvo.res.common.ResourceUtil; +import org.onap.vfc.nfvo.res.common.constant.HttpConstant; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.UrlConstant; +import org.onap.vfc.nfvo.res.common.util.request.RequestUtil; +import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil; +import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil; +import org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity; +import org.onap.vfc.nfvo.res.service.group.inf.VnfInfoService; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.ResourceUtil; -import org.openo.nfvo.resmanagement.common.constant.HttpConstant; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.common.util.request.RequestUtil; -import org.openo.nfvo.resmanagement.common.util.response.ResponseUtil; -import org.openo.nfvo.resmanagement.common.util.response.RoaResponseUtil; -import org.openo.nfvo.resmanagement.service.entity.VnfInfoEntity; -import org.openo.nfvo.resmanagement.service.group.inf.VnfInfoService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/VnfRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VnfRoa.java similarity index 86% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/VnfRoa.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VnfRoa.java index 4d5fc47..a60842b 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/VnfRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VnfRoa.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 java.util.HashMap; import java.util.List; @@ -31,16 +31,16 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.onap.vfc.nfvo.res.common.ResourceUtil; +import org.onap.vfc.nfvo.res.common.constant.HttpConstant; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.UrlConstant; +import org.onap.vfc.nfvo.res.common.util.request.RequestUtil; +import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil; +import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil; +import org.onap.vfc.nfvo.res.service.entity.VnfEntity; +import org.onap.vfc.nfvo.res.service.group.inf.VnfService; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.ResourceUtil; -import org.openo.nfvo.resmanagement.common.constant.HttpConstant; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.common.util.request.RequestUtil; -import org.openo.nfvo.resmanagement.common.util.response.ResponseUtil; -import org.openo.nfvo.resmanagement.common.util.response.RoaResponseUtil; -import org.openo.nfvo.resmanagement.service.entity.VnfEntity; -import org.openo.nfvo.resmanagement.service.group.inf.VnfService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/VnfStatusRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VnfStatusRoa.java similarity index 86% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/VnfStatusRoa.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VnfStatusRoa.java index 1e7d9f4..d67c11b 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/VnfStatusRoa.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VnfStatusRoa.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 java.util.HashMap; import java.util.List; @@ -31,16 +31,16 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.onap.vfc.nfvo.res.common.ResourceUtil; +import org.onap.vfc.nfvo.res.common.constant.HttpConstant; +import org.onap.vfc.nfvo.res.common.constant.ParamConstant; +import org.onap.vfc.nfvo.res.common.constant.UrlConstant; +import org.onap.vfc.nfvo.res.common.util.request.RequestUtil; +import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil; +import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil; +import org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity; +import org.onap.vfc.nfvo.res.service.group.inf.VnfStatusService; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.resmanagement.common.ResourceUtil; -import org.openo.nfvo.resmanagement.common.constant.HttpConstant; -import org.openo.nfvo.resmanagement.common.constant.ParamConstant; -import org.openo.nfvo.resmanagement.common.constant.UrlConstant; -import org.openo.nfvo.resmanagement.common.util.request.RequestUtil; -import org.openo.nfvo.resmanagement.common.util.response.ResponseUtil; -import org.openo.nfvo.resmanagement.common.util.response.RoaResponseUtil; -import org.openo.nfvo.resmanagement.service.entity.VnfStatusEntity; -import org.openo.nfvo.resmanagement.service.group.inf.VnfStatusService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessage.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ExceptionMessage.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessage.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ExceptionMessage.java index 8f57345..2529c1f 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessage.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ExceptionMessage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.rest.exceptionmapper; +package org.onap.vfc.nfvo.res.service.rest.exceptionmapper; import org.apache.http.HttpStatus; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/GenericExceptionMapper.java similarity index 94% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapper.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/GenericExceptionMapper.java index d557e0c..104c29a 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapper.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/GenericExceptionMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.rest.exceptionmapper; +package org.onap.vfc.nfvo.res.service.rest.exceptionmapper; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; diff --git a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ServiceExceptionMapper.java similarity index 95% rename from ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapper.java rename to ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ServiceExceptionMapper.java index a45852a..27d0c9f 100644 --- a/ResmanagementService/service/src/main/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapper.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ServiceExceptionMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.resmanagement.service.rest.exceptionmapper; +package org.onap.vfc.nfvo.res.service.rest.exceptionmapper; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/HostMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/HostMapper.xml index 850eef4..7c4c1da 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/HostMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/HostMapper.xml @@ -16,9 +16,9 @@ limitations under the License. --> - + + type="org.onap.vfc.nfvo.res.service.entity.HostEntity"> @@ -58,7 +58,7 @@ limitations under the License. where VIM_ID = #{vimId,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity"> insert into host (ID, NAME, CPU, MEMORY, DISK, VIM_ID, VIM_NAME) values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{cpu,jdbcType=VARCHAR}, @@ -66,7 +66,7 @@ limitations under the License. , #{vimName,jdbcType=VARCHAR}) + parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity"> insert into host @@ -116,7 +116,7 @@ limitations under the License. + parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity"> update host @@ -148,7 +148,7 @@ limitations under the License. + parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity"> update host set NAME = #{name,jdbcType=VARCHAR}, CPU = #{cpu,jdbcType=VARCHAR}, @@ -159,7 +159,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity"> update host diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/LocationMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/LocationMapper.xml index b0ecba2..22e8885 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/LocationMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/LocationMapper.xml @@ -16,9 +16,9 @@ limitations under the License. --> - + + type="org.onap.vfc.nfvo.res.service.entity.LocationEntity"> @@ -68,7 +68,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.LocationEntity"> insert into location (ID, COUNTRY, LOCATION, LATITUDE, LONGITUDE, DESCRIPTION) @@ -77,7 +77,7 @@ limitations under the License. #{latitude,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}) + parameterType="org.onap.vfc.nfvo.res.service.entity.LocationEntity"> insert into location @@ -122,7 +122,7 @@ limitations under the License. + parameterType="org.onap.vfc.nfvo.res.service.entity.LocationEntity"> update location @@ -145,7 +145,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.LocationEntity"> update location set COUNTRY = #{country,jdbcType=VARCHAR}, diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/NetworkMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/NetworkMapper.xml index 65e4d67..dbae050 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/NetworkMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/NetworkMapper.xml @@ -16,9 +16,9 @@ limitations under the License. --> - + + type="org.onap.vfc.nfvo.res.service.entity.NetworkEntity"> @@ -64,7 +64,7 @@ limitations under the License. where VIM_ID = #{vimId,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity"> insert into network (ID, NAME, TENANT_ID, VIM_ID, VIM_NAME, STATUS, PHYSICAL_NETWORK, NETWORK_TYPE, SEGMENTATION_ID @@ -77,7 +77,7 @@ limitations under the License. ) + parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity"> insert into network @@ -139,7 +139,7 @@ limitations under the License. + parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity"> update network @@ -170,7 +170,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity"> update network set NAME = #{name,jdbcType=VARCHAR}, TENANT_ID = #{tenantId,jdbcType=VARCHAR}, @@ -183,7 +183,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity"> update network diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/PortMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/PortMapper.xml index 765dcfe..5cdb358 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/PortMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/PortMapper.xml @@ -16,9 +16,9 @@ limitations under the License. --> - + + type="org.onap.vfc.nfvo.res.service.entity.PortEntity"> @@ -55,7 +55,7 @@ limitations under the License. where VIM_ID = #{vimId,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity"> insert into port (ID, NAME, NWTWORK_ID, STATUS, TENANT_ID, VIM_ID, VIM_NAME) values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, @@ -64,7 +64,7 @@ limitations under the License. , #{vimName,jdbcType=VARCHAR}) + parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity"> insert into port @@ -114,7 +114,7 @@ limitations under the License. + parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity"> update port @@ -139,7 +139,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity"> update port set NAME = #{name,jdbcType=VARCHAR}, NWTWORK_ID = #{networkId,jdbcType=VARCHAR}, @@ -150,7 +150,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity"> update port diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/SitesMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/SitesMapper.xml index 14f7b52..17fad53 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/SitesMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/SitesMapper.xml @@ -16,9 +16,9 @@ limitations under the License. --> - + + type="org.onap.vfc.nfvo.res.service.entity.SitesEntity"> @@ -70,7 +70,7 @@ limitations under the License. #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity"> insert into site (ID, NAME, LOCATION, COUNTRY, VIM_ID, VIM_NAME, STATUS,TOTAL_CPU, TOTAL_MEMORY, TOTAL_DISK, @@ -89,7 +89,7 @@ limitations under the License. #{usedDisk,jdbcType=VARCHAR}) + parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity"> insert into site @@ -175,7 +175,7 @@ limitations under the License. + parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity"> update site @@ -218,7 +218,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity"> update site set NAME = #{name,jdbcType=VARCHAR}, LOCATION @@ -240,7 +240,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity"> update site diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/VimMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/VimMapper.xml index e6f38ef..90d09ed 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/VimMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/VimMapper.xml @@ -16,9 +16,9 @@ limitations under the License. --> - + + type="org.onap.vfc.nfvo.res.service.entity.VimEntity"> @@ -45,7 +45,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.VimEntity"> insert into vim (ID) values (#{id,jdbcType=VARCHAR}) diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/VirtualLinkMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/VirtualLinkMapper.xml index b4d2394..c73dbed 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/VirtualLinkMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/VirtualLinkMapper.xml @@ -15,8 +15,8 @@ limitations under the License. --> - - + + @@ -61,7 +61,7 @@ delete from vl where id = #{id,jdbcType=VARCHAR} - + insert into vl (id, name, backend_id, is_public, dc_name, vim_id, vim_name, physicial_net, ns_id, @@ -77,7 +77,7 @@ #{routerExternal,jdbcType=VARCHAR}, #{resourceProviderType,jdbcType=VARCHAR}, #{resourceProviderId,jdbcType=VARCHAR} ) - + insert into vl @@ -192,7 +192,7 @@ - + update vl @@ -249,7 +249,7 @@ where id = #{id,jdbcType=VARCHAR} - + update vl set name = #{name,jdbcType=VARCHAR}, backend_id = #{backendId,jdbcType=VARCHAR}, diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/VmMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/VmMapper.xml index dc2376c..6c5fd68 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/VmMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/VmMapper.xml @@ -15,8 +15,8 @@ limitations under the License. --> - - + + @@ -52,13 +52,13 @@ delete from vm where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR} - + insert into vm (vm_id, vm_name, vm_status, vnf_instance_id) values (#{vmId,jdbcType=VARCHAR}, #{vmName,jdbcType=VARCHAR}, #{vmStatus,jdbcType=VARCHAR}, #{vnfInstanceId,jdbcType=VARCHAR}) - + insert into vm @@ -89,7 +89,7 @@ - + update vm @@ -104,7 +104,7 @@ where vm_id = #{vmId,jdbcType=VARCHAR} - + update vm set vm_name = #{vmName,jdbcType=VARCHAR}, vm_status = #{vmStatus,jdbcType=VARCHAR}, diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfInfoMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfInfoMapper.xml index 135ccc1..e4220fb 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfInfoMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfInfoMapper.xml @@ -15,8 +15,8 @@ limitations under the License. --> - - + + @@ -44,13 +44,13 @@ delete from vnfinfo where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR} - + insert into vnfinfo (vnf_instance_id, ns_id, vnfm_id ) values (#{vnfInstanceId,jdbcType=VARCHAR}, #{nsId,jdbcType=VARCHAR}, #{vnfmId,jdbcType=VARCHAR} ) - + insert into vnfinfo @@ -75,7 +75,7 @@ - + update vnfinfo @@ -87,7 +87,7 @@ where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR} - + update vnfinfo set ns_id = #{nsId,jdbcType=VARCHAR}, vnfm_id = #{vnfmId,jdbcType=VARCHAR} diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfMapper.xml index cd187c3..bf36b81 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfMapper.xml @@ -15,8 +15,8 @@ limitations under the License. --> - - + + @@ -65,7 +65,7 @@ delete from vnf where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR} - + insert into vnf (id, vnf_instance_id, vnf_instance_name, ns_id, ns_name, vnfm_id, vnfm_name, vnf_package_name, vnf_descriptor_name, @@ -83,7 +83,7 @@ #{maxRam,jdbcType=INTEGER}, #{maxShd,jdbcType=INTEGER}, #{maxNet,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}) - + insert into vnf @@ -222,7 +222,7 @@ - + update vnf @@ -291,7 +291,7 @@ where id = #{id,jdbcType=VARCHAR} - + update vnf set vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR}, vnf_instance_name = #{vnfInstanceName,jdbcType=VARCHAR}, diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfStatusMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfStatusMapper.xml index 08a5101..a23a39e 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfStatusMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfStatusMapper.xml @@ -15,8 +15,8 @@ limitations under the License. --> - - + + @@ -55,7 +55,7 @@ delete from vnfstatus where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR} - + insert into vnfstatus (vnf_instance_id, job_id, ns_id, vnfm_id, response_descriptor, status, progress, status_description, error_code, @@ -67,7 +67,7 @@ #{responseId,jdbcType=VARCHAR}, #{responseHistoryList,jdbcType=VARCHAR}, #{addVm,jdbcType=VARCHAR}, #{delVm,jdbcType=VARCHAR}) - + insert into vnfstatus @@ -152,7 +152,7 @@ - + update vnfstatus @@ -194,7 +194,7 @@ where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR} - + update vnfstatus set job_id = #{jobId,jdbcType=VARCHAR}, ns_id = #{nsId,jdbcType=VARCHAR}, diff --git a/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml b/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml index a24efd5..f08019e 100644 --- a/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml +++ b/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml @@ -66,217 +66,217 @@ + class="org.onap.vfc.nfvo.res.service.dao.impl.LocationDaoImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.LocationBusinessImpl"> + class="org.onap.vfc.nfvo.res.service.base.openstack.impl.LocationImpl"> - + + class="org.onap.vfc.nfvo.res.service.dao.impl.PortDaoImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.PortBusinessImpl"> + class="org.onap.vfc.nfvo.res.service.base.openstack.impl.PortImpl"> - + + class="org.onap.vfc.nfvo.res.service.dao.impl.HostDaoImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.HostBusinessImpl"> + class="org.onap.vfc.nfvo.res.service.base.openstack.impl.HostImpl"> - + + class="org.onap.vfc.nfvo.res.service.dao.impl.NetworkDaoImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.NetworkBusinessImpl"> + class="org.onap.vfc.nfvo.res.service.base.openstack.impl.NetworkImpl"> - + + class="org.onap.vfc.nfvo.res.service.dao.impl.SitesDaoImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.SitesBusinessImpl"> + class="org.onap.vfc.nfvo.res.service.base.openstack.impl.SitesImpl"> - + + class="org.onap.vfc.nfvo.res.service.dao.impl.VimDaoImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.VimBusinessImpl"> + class="org.onap.vfc.nfvo.res.service.base.openstack.impl.VimImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.LimitsBusinessImpl"> - + + class="org.onap.vfc.nfvo.res.service.dao.impl.VirtualLinkDaoImpl"> + class="org.onap.vfc.nfvo.res.service.group.impl.VirtualLinkServiceImpl"> - + + class="org.onap.vfc.nfvo.res.service.dao.impl.VnfDaoImpl"> + class="org.onap.vfc.nfvo.res.service.group.impl.VnfServiceImpl"> - + - + - + - + + class="org.onap.vfc.nfvo.res.service.dao.impl.VnfInfoDaoImpl"> + class="org.onap.vfc.nfvo.res.service.group.impl.VnfInfoServiceImpl"> - + - + - + - + - + - + + class="org.onap.vfc.nfvo.res.service.group.impl.ResOperateServiceImpl"> @@ -288,22 +288,22 @@ + class="org.onap.vfc.nfvo.res.service.group.impl.IResourceUpdateServiceImpl"> + class="org.onap.vfc.nfvo.res.service.group.impl.IResourceAddServiceImpl"> + class="org.onap.vfc.nfvo.res.service.group.impl.IResourceDelServiceImpl"> - + - + @@ -324,8 +324,8 @@ - - + + diff --git a/ResmanagementService/service/src/main/resources/spring/Resmanagement/svc_register.xml b/ResmanagementService/service/src/main/resources/spring/Resmanagement/svc_register.xml index 38394ae..9133d04 100644 --- a/ResmanagementService/service/src/main/resources/spring/Resmanagement/svc_register.xml +++ b/ResmanagementService/service/src/main/resources/spring/Resmanagement/svc_register.xml @@ -37,6 +37,6 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"> - - + + \ No newline at end of file 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 similarity index 94% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/ResourceUtilTest.java rename to 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 similarity index 88% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/VimUtilTest.java rename to 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 similarity index 99% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/JsonUtilTest.java rename to 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 similarity index 98% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/RestfulUtilTest.java rename to 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 similarity index 97% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/StringUtilTest.java rename to 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 similarity index 98% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/request/RequestUtilTest.java rename to 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 similarity index 96% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/response/ResponseUtilTest.java rename to 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 similarity index 95% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/common/util/response/RoaResponseUtilTest.java rename to 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 similarity index 97% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java rename to 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 similarity index 93% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java rename to 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 similarity index 94% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/HostImplTest.java rename to 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 similarity index 97% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/LocationImplTest.java rename to 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 similarity index 96% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/NetworkImplTest.java rename to 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 similarity index 92% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/PortImplTest.java rename to 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 similarity index 94% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/SitesImplTest.java rename to 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 similarity index 93% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/base/openstack/impl/VimImplTest.java rename to 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 similarity index 92% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/business/impl/HostBusinessImplTest.java rename to 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 similarity index 94% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/business/impl/LimitsBusinessImplTest.java rename to 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 similarity index 96% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/business/impl/LocationBusinessImplTest.java rename to 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 similarity index 98% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java rename to 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 similarity index 95% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java rename to 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 similarity index 90% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/HostDaoImplTest.java rename to 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 similarity index 83% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/LocationDaoImplTest.java rename to 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 similarity index 93% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/NetworkDaoImplTest.java rename to 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 similarity index 89% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/PortDaoImplTest.java rename to 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 similarity index 90% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/SitesDaoImplTest.java rename to 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 similarity index 84% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/VimDaoImplTest.java rename to 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 similarity index 75% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImplTest.java rename to 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 similarity index 79% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/dao/impl/VmDaoImplTest.java rename to 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 similarity index 91% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/HostEntityTest.java rename to 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 similarity index 92% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/LocationEntityTest.java rename to 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 similarity index 93% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/NetworkEntityTest.java rename to 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 similarity index 92% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/PortEntityTest.java rename to 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 similarity index 97% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/SitesEntityTest.java rename to 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 similarity index 91% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/entity/VimEntityTest.java rename to 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 similarity index 91% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java rename to 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 similarity index 91% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/HostRoaTest.java rename to 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 similarity index 85% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/LimitsRoaTest.java rename to 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 similarity index 92% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/LocationRoaTest.java rename to 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 similarity index 91% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/NetworkRoaTest.java rename to 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 similarity index 91% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/PortRoaTest.java rename to 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 similarity index 91% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/ResOperateRoaTest.java rename to 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 similarity index 96% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/SitesRoaTest.java rename to 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 similarity index 89% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/SwaggerRoaTest.java rename to 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 similarity index 90% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java rename to 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 similarity index 91% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VmRoaTest.java rename to 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 similarity index 90% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java rename to 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 similarity index 90% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VnfRoaTest.java rename to 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 similarity index 90% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java rename to 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 similarity index 89% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessageTest.java rename to 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; /** *
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 similarity index 85% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapperTest.java rename to 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; /** *
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 similarity index 86% rename from ResmanagementService/service/src/test/java/org/openo/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java rename to 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; /** -- 2.16.6