Correct maven pom groupId 83/7783/1
authorvictor.gao <victor.gao@huawei.com>
Thu, 17 Aug 2017 01:35:20 +0000 (09:35 +0800)
committervictor.gao <victor.gao@huawei.com>
Thu, 17 Aug 2017 01:35:20 +0000 (09:35 +0800)
Correct the mismatch between gerrit project directory and wiki groupid definition.

Change-Id: I35035c67dc654e7383c5e9951f1f72986c588d57
Issue-Id:VFC-86
Signed-off-by: victor.gao <victor.gao@huawei.com>
194 files changed:
ResmanagementService/deployment/pom.xml
ResmanagementService/pom.xml
ResmanagementService/service/pom.xml
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/ResourceUtil.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/ResourceUtil.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/VimUtil.java with 93% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/Constant.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/Constant.java with 97% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/HttpConstant.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/HttpConstant.java with 97% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/ParamConstant.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/ParamConstant.java with 99% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/ResponseConstant.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/ResponseConstant.java with 94% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/UrlConstant.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/constant/UrlConstant.java with 98% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/JsonUtil.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/JsonUtil.java with 98% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtil.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/RestfulUtil.java with 98% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/StringUtil.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/StringUtil.java with 99% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/request/RequestUtil.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/request/RequestUtil.java with 98% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/response/ResponseUtil.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/response/ResponseUtil.java with 98% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/response/RoaResponseUtil.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/common/util/response/RoaResponseUtil.java with 92% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/activator/ROAResmgrServicePostProcessor.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/activator/ROAResmgrServicePostProcessor.java with 92% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManager.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapter2MSBManager.java with 93% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapterMgrService.java with 91% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/inf/IResmgrAdapter2MSBManager.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/inf/IResmgrAdapter2MSBManager.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/inf/IResmgrAdapterMgrService.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/adapter/inf/IResmgrAdapterMgrService.java with 93% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/HostImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/HostImpl.java with 88% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/LocationImpl.java with 91% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/NetworkImpl.java with 90% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/PortImpl.java with 90% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/SitesImpl.java with 93% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/VimImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/VimImpl.java with 87% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Host.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Host.java with 91% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/InterfaceResManagement.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/InterfaceResManagement.java with 93% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Location.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Location.java with 94% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Network.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Network.java with 91% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Port.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Port.java with 92% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/ResManagement.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/ResManagement.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Sites.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Sites.java with 93% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Vim.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/base/openstack/inf/Vim.java with 92% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/HostBusinessImpl.java with 94% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/LimitsBusinessImpl.java with 88% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/LocationBusinessImpl.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/NetworkBusinessImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/NetworkBusinessImpl.java with 94% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/PortBusinessImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/PortBusinessImpl.java with 94% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/SitesBusinessImpl.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/impl/VimBusinessImpl.java with 87% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/HostBusiness.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/HostBusiness.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/LimitsBusiness.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/LimitsBusiness.java with 94% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/LocationBusiness.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/LocationBusiness.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/NetworkBusiness.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/NetworkBusiness.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/PortBusiness.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/PortBusiness.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/SitesBusiness.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/SitesBusiness.java with 96% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/VimBusiness.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/business/inf/VimBusiness.java with 92% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/AbstractDao.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/AbstractDao.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/HostDaoImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/HostDaoImpl.java with 87% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/LocationDaoImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/LocationDaoImpl.java with 87% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/NetworkDaoImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/NetworkDaoImpl.java with 87% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/PortDaoImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/PortDaoImpl.java with 87% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/SitesDaoImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/SitesDaoImpl.java with 86% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VimDaoImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VimDaoImpl.java with 80% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VirtualLinkDaoImpl.java with 87% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VmDaoImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VmDaoImpl.java with 90% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfDaoImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VnfDaoImpl.java with 87% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfInfoDaoImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VnfInfoDaoImpl.java with 88% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfStatusDaoImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/impl/VnfStatusDaoImpl.java with 88% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/HostDao.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/HostDao.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/LocationDao.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/LocationDao.java with 94% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/NetworkDao.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/NetworkDao.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/PortDao.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/PortDao.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/SitesDao.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/SitesDao.java with 94% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VimDao.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VimDao.java with 92% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VirtualLinkDao.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VirtualLinkDao.java with 91% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VmDao.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VmDao.java with 89% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfDao.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VnfDao.java with 91% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfInfoDao.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VnfInfoDao.java with 89% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfStatusDao.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/dao/inf/VnfStatusDao.java with 89% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/HostEntity.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/HostEntity.java with 97% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/LocationEntity.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/LocationEntity.java with 98% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/NetworkEntity.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/NetworkEntity.java with 98% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/PortEntity.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/PortEntity.java with 97% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/SitesEntity.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/SitesEntity.java with 97% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VimEntity.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VimEntity.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VirtualLinkEntity.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VirtualLinkEntity.java with 98% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VmEntity.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VmEntity.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfEntity.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VnfEntity.java with 98% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfInfoEntity.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VnfInfoEntity.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfStatusEntity.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/entity/VnfStatusEntity.java with 98% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/GrantResServiceImpl.java with 96% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/IResourceAddServiceImpl.java with 93% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceDelServiceImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/IResourceDelServiceImpl.java with 86% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceUpdateServiceImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/IResourceUpdateServiceImpl.java with 93% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/ResOperateServiceImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/ResOperateServiceImpl.java with 88% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VirtualLinkServiceImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VirtualLinkServiceImpl.java with 87% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VmServiceImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VmServiceImpl.java with 91% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfInfoServiceImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VnfInfoServiceImpl.java with 90% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfServiceImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VnfServiceImpl.java with 86% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfStatusServiceImpl.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/impl/VnfStatusServiceImpl.java with 91% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/GrantResService.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/GrantResService.java with 94% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/ResOperateService.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/ResOperateService.java with 97% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VirtualLinkService.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VirtualLinkService.java with 91% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VmService.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VmService.java with 90% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfInfoService.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VnfInfoService.java with 89% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfService.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VnfService.java with 92% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfStatusService.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/group/inf/VnfStatusService.java with 89% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/HostMapper.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/HostMapper.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/LocationMapper.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/LocationMapper.java with 94% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/NetworkMapper.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/NetworkMapper.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/PortMapper.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/PortMapper.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/SitesMapper.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/SitesMapper.java with 94% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VimMapper.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VimMapper.java with 92% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VirtualLinkMapper.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VirtualLinkMapper.java with 89% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VmMapper.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VmMapper.java with 89% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VnfInfoMapper.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VnfInfoMapper.java with 89% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VnfMapper.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VnfMapper.java with 89% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VnfStatusMapper.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/mapper/VnfStatusMapper.java with 89% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoa.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/GrantResourseRoa.java with 86% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoa.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/HostRoa.java with 88% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoa.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/LimitsRoa.java with 87% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoa.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/LocationRoa.java with 91% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoa.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/NetworkRoa.java with 89% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoa.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/PortRoa.java with 88% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoa.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/ResOperateRoa.java with 88% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoa.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/SitesRoa.java with 90% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoa.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/SwaggerRoa.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoa.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VirtualLinkRoa.java with 85% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoa.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VmRoa.java with 85% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoa.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VnfInfoRoa.java with 86% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoa.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VnfRoa.java with 85% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoa.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/VnfStatusRoa.java with 86% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessage.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ExceptionMessage.java with 95% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapper.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/GenericExceptionMapper.java with 94% similarity]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapper.java [moved from ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ServiceExceptionMapper.java with 95% similarity]
ResmanagementService/service/src/main/resources/mybatis/mysql/HostMapper.xml
ResmanagementService/service/src/main/resources/mybatis/mysql/LocationMapper.xml
ResmanagementService/service/src/main/resources/mybatis/mysql/NetworkMapper.xml
ResmanagementService/service/src/main/resources/mybatis/mysql/PortMapper.xml
ResmanagementService/service/src/main/resources/mybatis/mysql/SitesMapper.xml
ResmanagementService/service/src/main/resources/mybatis/mysql/VimMapper.xml
ResmanagementService/service/src/main/resources/mybatis/mysql/VirtualLinkMapper.xml
ResmanagementService/service/src/main/resources/mybatis/mysql/VmMapper.xml
ResmanagementService/service/src/main/resources/mybatis/mysql/VnfInfoMapper.xml
ResmanagementService/service/src/main/resources/mybatis/mysql/VnfMapper.xml
ResmanagementService/service/src/main/resources/mybatis/mysql/VnfStatusMapper.xml
ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml
ResmanagementService/service/src/main/resources/spring/Resmanagement/svc_register.xml
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/ResourceUtilTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/ResourceUtilTest.java with 93% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/VimUtilTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/VimUtilTest.java with 85% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/JsonUtilTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/JsonUtilTest.java with 99% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtilTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/RestfulUtilTest.java with 97% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/StringUtilTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/StringUtilTest.java with 96% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/request/RequestUtilTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/request/RequestUtilTest.java with 98% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/response/ResponseUtilTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/response/ResponseUtilTest.java with 95% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/response/RoaResponseUtilTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/common/util/response/RoaResponseUtilTest.java with 94% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java with 97% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/adapter/impl/ResmgrAdapterMgrServiceTest.java with 92% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/HostImplTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/HostImplTest.java with 93% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImplTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/LocationImplTest.java with 96% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImplTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/NetworkImplTest.java with 95% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImplTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/PortImplTest.java with 91% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImplTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/SitesImplTest.java with 94% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/VimImplTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/base/openstack/impl/VimImplTest.java with 93% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImplTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/HostBusinessImplTest.java with 91% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImplTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/LimitsBusinessImplTest.java with 94% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImplTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/LocationBusinessImplTest.java with 96% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/SitesBusinessImplTest.java with 97% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/business/impl/VimBusinessImplTest.java with 95% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/HostDaoImplTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/HostDaoImplTest.java with 89% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/LocationDaoImplTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/LocationDaoImplTest.java with 81% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/NetworkDaoImplTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/NetworkDaoImplTest.java with 92% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/PortDaoImplTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/PortDaoImplTest.java with 88% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/SitesDaoImplTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/SitesDaoImplTest.java with 88% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VimDaoImplTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VimDaoImplTest.java with 81% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImplTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VirtualLinkDaoImplTest.java with 72% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VmDaoImplTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/dao/impl/VmDaoImplTest.java with 76% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/HostEntityTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/HostEntityTest.java with 89% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/LocationEntityTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/LocationEntityTest.java with 91% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/NetworkEntityTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/NetworkEntityTest.java with 92% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/PortEntityTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/PortEntityTest.java with 91% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/SitesEntityTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/SitesEntityTest.java with 96% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/entity/VimEntityTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/entity/VimEntityTest.java with 90% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/GrantResourseRoaTest.java with 90% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/HostRoaTest.java with 90% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/LimitsRoaTest.java with 83% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoaTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/LocationRoaTest.java with 91% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/NetworkRoaTest.java with 90% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/PortRoaTest.java with 90% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/ResOperateRoaTest.java with 90% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/SitesRoaTest.java with 95% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoaTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/SwaggerRoaTest.java with 88% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VirtualLinkRoaTest.java with 89% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VmRoaTest.java with 90% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfInfoRoaTest.java with 89% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfRoaTest.java with 90% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/VnfStatusRoaTest.java with 89% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessageTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ExceptionMessageTest.java with 88% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapperTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/GenericExceptionMapperTest.java with 84% similarity]
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java [moved from ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/res/service/rest/exceptionmapper/ServiceExceptionMapperTest.java with 85% similarity]
pom.xml

index ed47629..926a7c6 100644 (file)
@@ -17,7 +17,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.onap.vfc.nfvo.res</groupId>
+        <groupId>org.onap.vfc.nfvo.resmanagement</groupId>
         <artifactId>resmanagement-service-root</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
index 4b3a6c1..7fe4eb1 100644 (file)
@@ -18,7 +18,7 @@
     <modelVersion>4.0.0</modelVersion>
         <parent>
         <artifactId>resmanagement</artifactId>
-        <groupId>org.onap.vfc.nfvo.res</groupId>
+        <groupId>org.onap.vfc.nfvo.resmanagement</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>resmanagement-service-root</artifactId>
index 5de8505..398a1eb 100644 (file)
@@ -17,7 +17,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.onap.vfc.nfvo.res</groupId>
+        <groupId>org.onap.vfc.nfvo.resmanagement</groupId>
         <artifactId>resmanagement-service-root</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common;
+package org.onap.vfc.nfvo.resmanagement.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.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
 import org.openo.baseservice.roa.util.restclient.RestfulParametes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util;
+package org.onap.vfc.nfvo.resmanagement.common.util;
 
-import org.onap.vfc.nfvo.res.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util;
+package org.onap.vfc.nfvo.resmanagement.common.util;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -24,9 +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.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.Constant;
+import org.onap.vfc.nfvo.resmanagement.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;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util.response;
+package org.onap.vfc.nfvo.resmanagement.common.util.response;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-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.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ResponseConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.activator;
+package org.onap.vfc.nfvo.resmanagement.service.activator;
 
-import org.onap.vfc.nfvo.res.service.adapter.inf.IResmgrAdapterMgrService;
+import org.onap.vfc.nfvo.resmanagement.service.adapter.inf.IResmgrAdapterMgrService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.adapter.impl;
+package org.onap.vfc.nfvo.resmanagement.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.onap.vfc.nfvo.resmanagement.common.constant.Constant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.service.adapter.inf.IResmgrAdapter2MSBManager;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.adapter.impl;
+package org.onap.vfc.nfvo.resmanagement.service.adapter.impl;
 
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
@@ -25,12 +25,12 @@ 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.onap.vfc.nfvo.resmanagement.common.constant.Constant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.service.adapter.inf.IResmgrAdapter2MSBManager;
+import org.onap.vfc.nfvo.resmanagement.service.adapter.inf.IResmgrAdapterMgrService;
 import org.openo.baseservice.util.impl.SystemEnvVariablesFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import 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.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Host;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.HostBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import 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.onap.vfc.nfvo.resmanagement.common.VimUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Location;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.LocationBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import 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.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Network;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.NetworkBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import 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.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Port;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.PortBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -23,14 +23,14 @@ 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.onap.vfc.nfvo.resmanagement.common.VimUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.LimitsBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.SitesBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.ResOperateService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import 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.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Vim;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.VimBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.inf;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.inf;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.inf;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.inf;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.inf;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.inf;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.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.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.HostBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.HostDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.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.onap.vfc.nfvo.resmanagement.common.VimUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.LimitsBusiness;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import 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.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.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.StringUtil;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.LocationBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.LocationDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.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.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.NetworkBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.NetworkDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.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.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.PortBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.PortDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import java.util.HashMap;
 import java.util.List;
@@ -22,11 +22,11 @@ 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.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.SitesBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.SitesDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.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.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.StringUtil;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.VimBusiness;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VimDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.inf;
+package org.onap.vfc.nfvo.resmanagement.service.business.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 /**
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.inf;
+package org.onap.vfc.nfvo.resmanagement.service.business.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 /**
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.inf;
+package org.onap.vfc.nfvo.resmanagement.service.business.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 /**
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.inf;
+package org.onap.vfc.nfvo.resmanagement.service.business.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 /**
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.inf;
+package org.onap.vfc.nfvo.resmanagement.service.business.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 /**
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.inf;
+package org.onap.vfc.nfvo.resmanagement.service.business.inf;
 
 import java.util.List;
 
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 /**
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 import java.util.Map;
 
-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;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.HostDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.HostMapper;
 
 /**
  *
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 import java.util.Map;
 
-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;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.LocationDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.LocationMapper;
 
 /**
  *
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 import java.util.Map;
 
-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;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.NetworkDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper;
 
 /**
  *
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 import java.util.Map;
 
-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;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.PortDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.PortMapper;
 
 /**
  *
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 import java.util.Map;
 
-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;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.SitesDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.SitesMapper;
 
 /**
  * DC interface.<br/>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 
-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;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VimDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VimMapper;
 
 /**
  * Vim interface.<br/>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 import java.util.Map;
 
-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;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VirtualLinkDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VirtualLinkMapper;
 
 /**
  * <br>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 import java.util.Map;
 
-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;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VmDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VmMapper;
 
 /**
  * <br>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import java.util.List;
 import java.util.Map;
 
-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;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VnfDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VnfMapper;
 
 /**
  * <br>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.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.VnfInfoEntity;
-import org.onap.vfc.nfvo.res.service.mapper.VnfInfoMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VnfInfoDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VnfInfoMapper;
 
 /**
  * <br>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.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.mapper.VnfStatusMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VnfStatusDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VnfStatusMapper;
 
 /**
  * <br>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 
 /**
  * Host info interface.<br/>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 
 /**
  *
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 
 /**
  *
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 
 /**
  * Port info interface.<br/>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 
 /**
  * Sites info interface. <br/>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 
 /**
  * Vim info interface.<br/>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
 
 /**
  * <br>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VmEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
 
 /**
  * <br>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VnfEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;
 
 /**
  * <br>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;
 
 /**
  * <br>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.inf;
+package org.onap.vfc.nfvo.resmanagement.service.dao.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;
 
 /**
  * <br>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
-import org.onap.vfc.nfvo.res.common.util.StringUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.StringUtil;
 
 import net.sf.json.JSONObject;
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import java.io.Serializable;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import java.io.Serializable;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import java.io.Serializable;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import java.io.Serializable;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import java.io.Serializable;
 
 import org.apache.commons.lang3.StringUtils;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.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.onap.vfc.nfvo.resmanagement.common.VimUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.GrantResService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.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.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.openo.baseservice.roa.util.restclient.RestfulParametes;
 import org.slf4j.Logger;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.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.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Vim;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.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.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.openo.baseservice.roa.util.restclient.RestfulParametes;
 import org.slf4j.Logger;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.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.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.Constant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.StringUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Host;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Network;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Port;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Vim;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.ResOperateService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.openo.baseservice.roa.util.restclient.RestfulParametes;
 import org.slf4j.Logger;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.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.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VirtualLinkDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VirtualLinkService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 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.onap.vfc.nfvo.res.service.group.impl.VirtualLinkServiceImpl.add.id.check"));
+                    .getMessage("org.onap.vfc.nfvo.resmanagement.service.group.impl.VirtualLinkServiceImpl.add.id.check"));
         }
         if(StringUtils.isEmpty(virtualLinkEntity.getId())) {
             virtualLinkEntity.setId(UUID.randomUUID().toString());
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.service.group.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.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.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VmDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VmService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.openo.baseservice.roa.util.restclient.RestfulParametes;
 import org.slf4j.Logger;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.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.onap.vfc.nfvo.resmanagement.service.dao.inf.VnfInfoDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VmService;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfInfoService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.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.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VnfDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfInfoService;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 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.onap.vfc.nfvo.res.service.group.impl.VnfServiceImpl.add.id.check"));
+                    .getMessage("org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfServiceImpl.add.id.check"));
         }
         if(StringUtils.isEmpty(vnfEntity.getId())) {
             vnfEntity.setId(UUID.randomUUID().toString());
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.impl;
+package org.onap.vfc.nfvo.resmanagement.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.onap.vfc.nfvo.resmanagement.service.dao.inf.VnfStatusDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfStatusService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.inf;
+package org.onap.vfc.nfvo.resmanagement.service.group.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.inf;
+package org.onap.vfc.nfvo.resmanagement.service.group.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VmEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.inf;
+package org.onap.vfc.nfvo.resmanagement.service.group.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.inf;
+package org.onap.vfc.nfvo.resmanagement.service.group.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VnfEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.group.inf;
+package org.onap.vfc.nfvo.resmanagement.service.group.inf;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import net.sf.json.JSONObject;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 
 /**
  * Host info interface.<br/>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 
 /**
  *
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 
 /**
  *
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 
 /**
  * Port info interface.<br/>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 
 /**
  * ResPool info interface.<br/>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 
 /**
  * Vim info interface.<br/>
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
 
 public interface VirtualLinkMapper {
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VmEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
 
 public interface VmMapper {
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;
 
 public interface VnfInfoMapper {
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VnfEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;
 
 public interface VnfMapper {
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.mapper;
+package org.onap.vfc.nfvo.resmanagement.service.mapper;
 
 import java.util.List;
 import java.util.Map;
 
-import org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;
 
 public interface VnfStatusMapper {
 
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
@@ -24,12 +24,12 @@ 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.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.GrantResService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -33,14 +33,14 @@ 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.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Host;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
@@ -25,9 +25,9 @@ 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.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.LimitsBusiness;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -34,18 +34,18 @@ 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.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Location;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -33,14 +33,14 @@ 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.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Network;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -33,14 +33,14 @@ 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.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Port;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
@@ -27,14 +27,14 @@ 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.onap.vfc.nfvo.resmanagement.common.VimUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.ResOperateService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -32,15 +32,15 @@ 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.onap.vfc.nfvo.resmanagement.common.VimUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -31,15 +31,15 @@ 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.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VirtualLinkService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -31,15 +31,15 @@ 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.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VmService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -31,15 +31,15 @@ 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.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfInfoService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -31,15 +31,15 @@ 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.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import java.util.HashMap;
 import java.util.List;
@@ -31,15 +31,15 @@ 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.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfStatusService;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
index 7c4c1da..5c242d0 100644 (file)
@@ -16,9 +16,9 @@ limitations under the License.
 -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.HostMapper">
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.HostMapper">
     <resultMap id="BaseResultMap"
-        type="org.onap.vfc.nfvo.res.service.entity.HostEntity">
+        type="org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity">
         <id column="ID" property="id" jdbcType="VARCHAR" />
         <result column="NAME" property="name" jdbcType="VARCHAR" />
         <result column="CPU" property="cpu" jdbcType="VARCHAR" />
@@ -58,7 +58,7 @@ limitations under the License.
         where VIM_ID = #{vimId,jdbcType=VARCHAR}
     </delete>
     <insert id="addHost"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.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})
     </insert>
     <insert id="addHostSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity">
         insert into host
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -116,7 +116,7 @@ limitations under the License.
         </trim>
     </insert>
     <update id="updateHostSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity">
         update host
         <set>
             <if test="name != null">
@@ -148,7 +148,7 @@ limitations under the License.
         </where>
     </update>
     <update id="updateHost"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.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}
     </update>
     <update id="updateHostByVimId"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity">
         update host
         <set>
             <if test="id != null">
index 22e8885..431c151 100644 (file)
@@ -16,9 +16,9 @@ limitations under the License.
 -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.LocationMapper">
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.LocationMapper">
     <resultMap id="BaseResultMap"
-        type="org.onap.vfc.nfvo.res.service.entity.LocationEntity">
+        type="org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity">
 
         <id column="ID" property="id" jdbcType="VARCHAR" />
         <result column="COUNTRY" property="country" jdbcType="VARCHAR" />
@@ -68,7 +68,7 @@ limitations under the License.
         where ID = #{id,jdbcType=VARCHAR}
     </delete>
     <insert id="addLocation"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.LocationEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.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})
     </insert>
     <insert id="addLocationSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.LocationEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity">
 
         insert into location
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -122,7 +122,7 @@ limitations under the License.
         </trim>
     </insert>
     <update id="updateLocationSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.LocationEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity">
 
         update location
         <set>
@@ -145,7 +145,7 @@ limitations under the License.
         where ID = #{id,jdbcType=VARCHAR}
     </update>
     <update id="updateLocation"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.LocationEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity">
 
         update location
         set COUNTRY = #{country,jdbcType=VARCHAR},
index dbae050..c07c4c2 100644 (file)
@@ -16,9 +16,9 @@ limitations under the License.
 -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.NetworkMapper">
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper">
     <resultMap id="BaseResultMap"
-        type="org.onap.vfc.nfvo.res.service.entity.NetworkEntity">
+        type="org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity">
         <id column="ID" property="id" jdbcType="VARCHAR" />
         <result column="NAME" property="name" jdbcType="VARCHAR" />
         <result column="TENANT_ID" property="tenantId" jdbcType="VARCHAR" />
@@ -64,7 +64,7 @@ limitations under the License.
         where VIM_ID = #{vimId,jdbcType=VARCHAR}
     </delete>
     <insert id="addNetwork"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.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.
         )
     </insert>
     <insert id="addNetworkSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity">
         insert into network
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -139,7 +139,7 @@ limitations under the License.
         </trim>
     </insert>
     <update id="updateNetworkSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity">
         update network
         <set>
             <if test="name != null">
@@ -170,7 +170,7 @@ limitations under the License.
         where ID = #{id,jdbcType=VARCHAR}
     </update>
     <update id="updateNetwork"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.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}
     </update>
     <update id="updateNetworkByVimId"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity">
         update network
         <set>
             <if test="id != null">
index 5cdb358..ab2eede 100644 (file)
@@ -16,9 +16,9 @@ limitations under the License.
 -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.PortMapper">
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.PortMapper">
     <resultMap id="BaseResultMap"
-        type="org.onap.vfc.nfvo.res.service.entity.PortEntity">
+        type="org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity">
         <id column="ID" property="id" jdbcType="VARCHAR" />
         <result column="NAME" property="name" jdbcType="VARCHAR" />
         <result column="NWTWORK_ID" property="networkId" jdbcType="VARCHAR" />
@@ -55,7 +55,7 @@ limitations under the License.
     where VIM_ID = #{vimId,jdbcType=VARCHAR}
     </delete>
     <insert id="addPort"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.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})
     </insert>
     <insert id="addPortSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity">
         insert into port
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -114,7 +114,7 @@ limitations under the License.
         </trim>
     </insert>
     <update id="updatePortSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity">
         update port
         <set>
             <if test="name != null">
@@ -139,7 +139,7 @@ limitations under the License.
         where ID = #{id,jdbcType=VARCHAR}
     </update>
     <update id="updatePort"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.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}
     </update>
     <update id="updatePortByVimId"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity">
         update port
         <set>
             <if test="id != null">
index 17fad53..aac11c6 100644 (file)
@@ -16,9 +16,9 @@ limitations under the License.
 -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.SitesMapper">
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.SitesMapper">
     <resultMap id="BaseResultMap"
-        type="org.onap.vfc.nfvo.res.service.entity.SitesEntity">
+        type="org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity">
         <id column="ID" property="id" jdbcType="VARCHAR" />
         <result column="NAME" property="name" jdbcType="VARCHAR" />
         <result column="LOCATION" property="location" jdbcType="VARCHAR" />
@@ -70,7 +70,7 @@ limitations under the License.
         #{id,jdbcType=VARCHAR}
     </delete>
     <insert id="addSite"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.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})
     </insert>
     <insert id="addSiteSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity">
         insert into site
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -175,7 +175,7 @@ limitations under the License.
         </trim>
     </insert>
     <update id="updateSiteSelective"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity">
         update site
         <set>
             <if test="name != null">
@@ -218,7 +218,7 @@ limitations under the License.
         where ID = #{id,jdbcType=VARCHAR}
     </update>
     <update id="updateSite"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity">
         update site
         set NAME = #{name,jdbcType=VARCHAR},
         LOCATION
@@ -240,7 +240,7 @@ limitations under the License.
         where ID = #{id,jdbcType=VARCHAR}
     </update>
     <update id="updateSiteByVimId"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity">
         update site
         <set>
             <if test="id != null">
index 90d09ed..0140306 100644 (file)
@@ -16,9 +16,9 @@ limitations under the License.
 -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.VimMapper">
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.VimMapper">
     <resultMap id="BaseResultMap"
-        type="org.onap.vfc.nfvo.res.service.entity.VimEntity">
+        type="org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity">
         <id column="ID" property="id" jdbcType="VARCHAR" />
     </resultMap>
     <sql id="Base_Column_List">
@@ -45,7 +45,7 @@ limitations under the License.
         where ID = #{id,jdbcType=VARCHAR}
     </delete>
     <insert id="addVim"
-        parameterType="org.onap.vfc.nfvo.res.service.entity.VimEntity">
+        parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity">
         insert into vim (ID)
         values (#{id,jdbcType=VARCHAR})
     </insert>
index c73dbed..3649d40 100644 (file)
@@ -15,8 +15,8 @@
     limitations under the License.
  -->
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.VirtualLinkMapper" >
-  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity" >
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.VirtualLinkMapper" >
+  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity" >
     <id column="id" property="id" jdbcType="VARCHAR" />
     <result column="name" property="name" jdbcType="VARCHAR" />
     <result column="backend_id" property="backendId" jdbcType="VARCHAR" />
@@ -61,7 +61,7 @@
     delete from vl
     where id = #{id,jdbcType=VARCHAR}
   </delete>
-  <insert id="insert" parameterType="org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity" >
+  <insert id="insert" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity" >
     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>
-  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity" >
+  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity" >
     insert into vl
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity" >
+  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity" >
     update vl
     <set >
       <if test="name != null" >
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity" >
+  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity" >
     update vl
     set name = #{name,jdbcType=VARCHAR},
       backend_id = #{backendId,jdbcType=VARCHAR},
index 6c5fd68..825c55f 100644 (file)
@@ -15,8 +15,8 @@
     limitations under the License.
  -->
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.VmMapper" >
-  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.res.service.entity.VmEntity" >
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.VmMapper" >
+  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity" >
     <id column="vm_id" property="vmId" jdbcType="VARCHAR" />
     <result column="vm_name" property="vmName" jdbcType="VARCHAR" />
     <result column="vm_status" property="vmStatus" jdbcType="VARCHAR" />
     delete from vm
     where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR}
   </delete>
-  <insert id="insert" parameterType="org.onap.vfc.nfvo.res.service.entity.VmEntity" >
+  <insert id="insert" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity" >
     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>
-  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VmEntity" >
+  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity" >
     insert into vm
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="vmId != null" >
@@ -89,7 +89,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VmEntity" >
+  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity" >
     update vm
     <set >
       <if test="vmName != null" >
     </set>
     where vm_id = #{vmId,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.res.service.entity.VmEntity" >
+  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity" >
     update vm
     set vm_name = #{vmName,jdbcType=VARCHAR},
       vm_status = #{vmStatus,jdbcType=VARCHAR},
index e4220fb..da12a0d 100644 (file)
@@ -15,8 +15,8 @@
     limitations under the License.
  -->
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.VnfInfoMapper" >
-  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity" >
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.VnfInfoMapper" >
+  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity" >
     <id column="vnf_instance_id" property="vnfInstanceId" jdbcType="VARCHAR" />
     <result column="ns_id" property="nsId" jdbcType="VARCHAR" />
     <result column="vnfm_id" property="vnfmId" jdbcType="VARCHAR" />
     delete from vnfinfo
     where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR}
   </delete>
-  <insert id="insert" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity" >
+  <insert id="insert" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity" >
     insert into vnfinfo (vnf_instance_id, ns_id, vnfm_id
       )
     values (#{vnfInstanceId,jdbcType=VARCHAR}, #{nsId,jdbcType=VARCHAR}, #{vnfmId,jdbcType=VARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity" >
+  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity" >
     insert into vnfinfo
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="vnfInstanceId != null" >
@@ -75,7 +75,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity" >
+  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity" >
     update vnfinfo
     <set >
       <if test="nsId != null" >
@@ -87,7 +87,7 @@
     </set>
     where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity" >
+  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity" >
     update vnfinfo
     set ns_id = #{nsId,jdbcType=VARCHAR},
       vnfm_id = #{vnfmId,jdbcType=VARCHAR}
index bf36b81..7374dd1 100644 (file)
@@ -15,8 +15,8 @@
     limitations under the License.
  -->
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.VnfMapper" >
-  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.res.service.entity.VnfEntity" >
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.VnfMapper" >
+  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity" >
     <id column="id" property="id" jdbcType="VARCHAR" />
     <result column="vnf_instance_id" property="vnfInstanceId" jdbcType="VARCHAR" />
     <result column="vnf_instance_name" property="vnfInstanceName" jdbcType="VARCHAR" />
@@ -65,7 +65,7 @@
     delete from vnf
     where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR}
   </delete>
-  <insert id="insert" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfEntity" >
+  <insert id="insert" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity" >
     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>
-  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfEntity" >
+  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity" >
     insert into vnf
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfEntity" >
+  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity" >
     update vnf
     <set >
       <if test="vnfInstanceId != null" >
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfEntity" >
+  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity" >
     update vnf
     set vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR},
       vnf_instance_name = #{vnfInstanceName,jdbcType=VARCHAR},
index a23a39e..19c4f4a 100644 (file)
@@ -15,8 +15,8 @@
     limitations under the License.
  -->
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.VnfStatusMapper" >
-  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity" >
+<mapper namespace="org.onap.vfc.nfvo.resmanagement.service.mapper.VnfStatusMapper" >
+  <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity" >
     <id column="vnf_instance_id" property="vnfInstanceId" jdbcType="VARCHAR" />
     <result column="job_id" property="jobId" jdbcType="VARCHAR" />
     <result column="ns_id" property="nsId" jdbcType="VARCHAR" />
@@ -55,7 +55,7 @@
     delete from vnfstatus
     where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR}
   </delete>
-  <insert id="insert" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity" >
+  <insert id="insert" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity" >
     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>
-  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity" >
+  <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity" >
     insert into vnfstatus
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="vnfInstanceId != null" >
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity" >
+  <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity" >
     update vnfstatus
     <set >
       <if test="jobId != null" >
     </set>
     where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity" >
+  <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity" >
     update vnfstatus
     set job_id = #{jobId,jdbcType=VARCHAR},
       ns_id = #{nsId,jdbcType=VARCHAR},
index f08019e..7dd42a3 100644 (file)
 
     <!--location -->
     <bean id="locationDao"
-        class="org.onap.vfc.nfvo.res.service.dao.impl.LocationDaoImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.LocationDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
 
     <bean id="locationBusiness"
-        class="org.onap.vfc.nfvo.res.service.business.impl.LocationBusinessImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.business.impl.LocationBusinessImpl">
         <property name="locationDao" ref="locationDao"></property>
     </bean>
 
     <bean id="location"
-        class="org.onap.vfc.nfvo.res.service.base.openstack.impl.LocationImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.LocationImpl">
         <property name="locationBusiness" ref="locationBusiness"></property>
     </bean>
 
-    <bean id="locationRoa" class="org.onap.vfc.nfvo.res.service.rest.LocationRoa">
+    <bean id="locationRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.LocationRoa">
         <property name="location" ref="location"></property>
         <property name="sites" ref="sites"></property>
     </bean>
 
     <!--port -->
     <bean id="portDao"
-        class="org.onap.vfc.nfvo.res.service.dao.impl.PortDaoImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.PortDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
 
     <bean id="portBusiness"
-        class="org.onap.vfc.nfvo.res.service.business.impl.PortBusinessImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.business.impl.PortBusinessImpl">
         <property name="portDao" ref="portDao"></property>
     </bean>
 
     <bean id="port"
-        class="org.onap.vfc.nfvo.res.service.base.openstack.impl.PortImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.PortImpl">
         <property name="portBusiness" ref="portBusiness"></property>
     </bean>
 
-    <bean id="portRoa" class="org.onap.vfc.nfvo.res.service.rest.PortRoa">
+    <bean id="portRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.PortRoa">
         <property name="port" ref="port"></property>
     </bean>
 
     <!--host -->
     <bean id="hostDao"
-        class="org.onap.vfc.nfvo.res.service.dao.impl.HostDaoImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.HostDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
 
     <bean id="hostBusiness"
-        class="org.onap.vfc.nfvo.res.service.business.impl.HostBusinessImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.business.impl.HostBusinessImpl">
         <property name="hostDao" ref="hostDao"></property>
     </bean>
 
     <bean id="host"
-        class="org.onap.vfc.nfvo.res.service.base.openstack.impl.HostImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.HostImpl">
         <property name="hostBusiness" ref="hostBusiness"></property>
     </bean>
 
-    <bean id="hostRoa" class="org.onap.vfc.nfvo.res.service.rest.HostRoa">
+    <bean id="hostRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.HostRoa">
         <property name="host" ref="host"></property>
     </bean>
 
     <!--network -->
     <bean id="networkDao"
-        class="org.onap.vfc.nfvo.res.service.dao.impl.NetworkDaoImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.NetworkDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
 
     <bean id="networkBusiness"
-        class="org.onap.vfc.nfvo.res.service.business.impl.NetworkBusinessImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.business.impl.NetworkBusinessImpl">
         <property name="networkDao" ref="networkDao"></property>
     </bean>
 
     <bean id="network"
-        class="org.onap.vfc.nfvo.res.service.base.openstack.impl.NetworkImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.NetworkImpl">
         <property name="networkBusiness" ref="networkBusiness"></property>
     </bean>
 
-    <bean id="networkRoa" class="org.onap.vfc.nfvo.res.service.rest.NetworkRoa">
+    <bean id="networkRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.NetworkRoa">
         <property name="network" ref="network"></property>
     </bean>
 
     <!--sites -->
     <bean id="sitesDao"
-        class="org.onap.vfc.nfvo.res.service.dao.impl.SitesDaoImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.SitesDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
 
     <bean id="sitesBusiness"
-        class="org.onap.vfc.nfvo.res.service.business.impl.SitesBusinessImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.business.impl.SitesBusinessImpl">
         <property name="sitesDao" ref="sitesDao"></property>
     </bean>
 
     <bean id="sites"
-        class="org.onap.vfc.nfvo.res.service.base.openstack.impl.SitesImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.SitesImpl">
         <property name="sitesBusiness" ref="sitesBusiness"></property>
         <property name="limitsBusiness" ref="limitsBusiness"></property>
         <property name="resOperateService" ref="resOperateService"></property>
     </bean>
 
-    <bean id="sitesRoa" class="org.onap.vfc.nfvo.res.service.rest.SitesRoa">
+    <bean id="sitesRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.SitesRoa">
         <property name="sites" ref="sites"></property>
     </bean>
 
     <!--vim -->
     <bean id="vimDao"
-        class="org.onap.vfc.nfvo.res.service.dao.impl.VimDaoImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.VimDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
 
     <bean id="vimBusiness"
-        class="org.onap.vfc.nfvo.res.service.business.impl.VimBusinessImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.business.impl.VimBusinessImpl">
         <property name="vimDao" ref="vimDao"></property>
     </bean>
 
     <bean id="vim"
-        class="org.onap.vfc.nfvo.res.service.base.openstack.impl.VimImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.VimImpl">
         <property name="vimBusiness" ref="vimBusiness"></property>
     </bean>
 
     <!-- limits -->
     <bean id="limitsBusiness"
-        class="org.onap.vfc.nfvo.res.service.business.impl.LimitsBusinessImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.business.impl.LimitsBusinessImpl">
     </bean>
 
-     <bean id="limitsRoa" class="org.onap.vfc.nfvo.res.service.rest.LimitsRoa">
+     <bean id="limitsRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.LimitsRoa">
         <property name="limitsBusiness" ref="limitsBusiness"></property>
     </bean>
     
     <!-- vl -->
     <bean id="virtualLinkDao"
-        class="org.onap.vfc.nfvo.res.service.dao.impl.VirtualLinkDaoImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.VirtualLinkDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
     
     <bean id="virtualLink"
-        class="org.onap.vfc.nfvo.res.service.group.impl.VirtualLinkServiceImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.group.impl.VirtualLinkServiceImpl">
         <property name="virtualLinkDao" ref="virtualLinkDao"></property>
     </bean>
 
-     <bean id="virtualLinkRoa" class="org.onap.vfc.nfvo.res.service.rest.VirtualLinkRoa">
+     <bean id="virtualLinkRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.VirtualLinkRoa">
         <property name="virtualLink" ref="virtualLink"></property>
     </bean>
     
     <!-- vnf -->
     <bean id="vnfDao"
-        class="org.onap.vfc.nfvo.res.service.dao.impl.VnfDaoImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.VnfDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
     
     <bean id="vnfService"
-        class="org.onap.vfc.nfvo.res.service.group.impl.VnfServiceImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfServiceImpl">
         <property name="vnfDao" ref="vnfDao"></property>
         <property name="vnfInfoService" ref="vnfInfoService"></property>
     </bean>
 
-    <bean id="vnfRoa" class="org.onap.vfc.nfvo.res.service.rest.VnfRoa">
+    <bean id="vnfRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.VnfRoa">
         <property name="vnfService" ref="vnfService"></property>
     </bean>
     
     <!-- vm -->
-    <bean id="vmDao" class="org.onap.vfc.nfvo.res.service.dao.impl.VmDaoImpl">
+    <bean id="vmDao" class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.VmDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
     
-    <bean id="vmService" class="org.onap.vfc.nfvo.res.service.group.impl.VmServiceImpl">
+    <bean id="vmService" class="org.onap.vfc.nfvo.resmanagement.service.group.impl.VmServiceImpl">
         <property name="vmDao" ref="vmDao"></property>
     </bean>
     
-    <bean id="vmRoa" class="org.onap.vfc.nfvo.res.service.rest.VmRoa">
+    <bean id="vmRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.VmRoa">
         <property name="vmService" ref="vmService"></property>
     </bean>
     
     <!-- vnfInfo -->
     <bean id="vnfInfoDao"
-        class="org.onap.vfc.nfvo.res.service.dao.impl.VnfInfoDaoImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.VnfInfoDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
     
     <bean id="vnfInfoService"
-        class="org.onap.vfc.nfvo.res.service.group.impl.VnfInfoServiceImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfInfoServiceImpl">
         <property name="vnfInfoDao" ref="vnfInfoDao"></property>
         <property name="vmService" ref="vmService"></property>
     </bean>
 
-    <bean id="vnfInfoRoa" class="org.onap.vfc.nfvo.res.service.rest.VnfInfoRoa">
+    <bean id="vnfInfoRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.VnfInfoRoa">
         <property name="vnfInfoService" ref="vnfInfoService"></property>
     </bean>
     
     <!-- vnfstatus -->
-    <bean id="vnfStatusDao" class="org.onap.vfc.nfvo.res.service.dao.impl.VnfStatusDaoImpl">
+    <bean id="vnfStatusDao" class="org.onap.vfc.nfvo.resmanagement.service.dao.impl.VnfStatusDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
     
-    <bean id="vnfStatusService" class="org.onap.vfc.nfvo.res.service.group.impl.VnfStatusServiceImpl">
+    <bean id="vnfStatusService" class="org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfStatusServiceImpl">
         <property name="vnfStatusDao" ref="vnfStatusDao"></property>
     </bean>
     
-    <bean id="vnfStatusRoa" class="org.onap.vfc.nfvo.res.service.rest.VnfStatusRoa">
+    <bean id="vnfStatusRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.VnfStatusRoa">
         <property name="vnfStatusService" ref="vnfStatusService"></property>
     </bean>
     
     <!-- grantResource -->
-    <bean id="grantResService" class="org.onap.vfc.nfvo.res.service.group.impl.GrantResServiceImpl">
+    <bean id="grantResService" class="org.onap.vfc.nfvo.resmanagement.service.group.impl.GrantResServiceImpl">
         <property name="sites" ref="sites"></property>
     </bean>
     
-    <bean id="grantResourseRoa" class="org.onap.vfc.nfvo.res.service.rest.GrantResourseRoa">
+    <bean id="grantResourseRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.GrantResourseRoa">
         <property name="grantResService" ref="grantResService"></property>
     </bean>
     
     <!--group_resoperate -->
     <bean id="resOperateService"
-        class="org.onap.vfc.nfvo.res.service.group.impl.ResOperateServiceImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.group.impl.ResOperateServiceImpl">
         <property name="host" ref="host"></property>
         <property name="port" ref="port"></property>
         <property name="sites" ref="sites"></property>
     </bean>
 
     <bean id="iResourceUpdateServiceImpl"
-        class="org.onap.vfc.nfvo.res.service.group.impl.IResourceUpdateServiceImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.group.impl.IResourceUpdateServiceImpl">
     </bean>
 
     <bean id="iResourceAddServiceImpl"
-        class="org.onap.vfc.nfvo.res.service.group.impl.IResourceAddServiceImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.group.impl.IResourceAddServiceImpl">
     </bean>
 
     <bean id="iResourceDelServiceImpl"
-        class="org.onap.vfc.nfvo.res.service.group.impl.IResourceDelServiceImpl">
+        class="org.onap.vfc.nfvo.resmanagement.service.group.impl.IResourceDelServiceImpl">
     </bean>
 
-    <bean id="resOperateRoa" class="org.onap.vfc.nfvo.res.service.rest.ResOperateRoa">
+    <bean id="resOperateRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.ResOperateRoa">
         <property name="resOperateService" ref="resOperateService"></property>
     </bean>
 
-    <bean id="SwaggerRoa" class="org.onap.vfc.nfvo.res.service.rest.SwaggerRoa"></bean>
+    <bean id="SwaggerRoa" class="org.onap.vfc.nfvo.resmanagement.service.rest.SwaggerRoa"></bean>
 
     <jaxrs:server id="restContainer" address="/">
         <jaxrs:serviceBeans>
      </jaxrs:serviceBeans>
         <jaxrs:providers>
             <ref bean="jsonProvider" />
-            <bean class="org.onap.vfc.nfvo.res.service.rest.exceptionmapper.ServiceExceptionMapper" />
-            <bean class="org.onap.vfc.nfvo.res.service.rest.exceptionmapper.GenericExceptionMapper" />
+            <bean class="org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper.ServiceExceptionMapper" />
+            <bean class="org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper.GenericExceptionMapper" />
         </jaxrs:providers>
     </jaxrs:server>
 </beans>
index 9133d04..e1d7493 100644 (file)
@@ -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">
-    <bean class="org.onap.vfc.nfvo.res.service.activator.ROAResmgrServicePostProcessor"></bean>
-    <bean class="org.onap.vfc.nfvo.res.service.adapter.impl.ResmgrAdapterMgrService"></bean>
+    <bean class="org.onap.vfc.nfvo.resmanagement.service.activator.ROAResmgrServicePostProcessor"></bean>
+    <bean class="org.onap.vfc.nfvo.resmanagement.service.adapter.impl.ResmgrAdapterMgrService"></bean>
 </beans>
\ No newline at end of file
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common;
+package org.onap.vfc.nfvo.resmanagement.common;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -25,7 +25,7 @@ import java.lang.reflect.Modifier;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.ResourceUtil;
+import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
 
 
 public class ResourceUtilTest {
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.common;
+package org.onap.vfc.nfvo.resmanagement.common;
 
 import static org.junit.Assert.*;
 
@@ -21,9 +21,9 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.VimUtil;
-import org.onap.vfc.nfvo.res.common.constant.UrlConstant;
-import org.onap.vfc.nfvo.res.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.common.VimUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
 import org.openo.baseservice.roa.util.restclient.RestfulOptions;
 import org.openo.baseservice.roa.util.restclient.RestfulParametes;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util;
+package org.onap.vfc.nfvo.resmanagement.common.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -24,7 +24,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import mockit.Mock;
 import mockit.MockUp;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util;
+package org.onap.vfc.nfvo.resmanagement.common.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -23,8 +23,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.constant.Constant;
-import org.onap.vfc.nfvo.res.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.common.constant.Constant;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.openo.baseservice.roa.util.restclient.RestfulOptions;
 import org.openo.baseservice.roa.util.restclient.RestfulParametes;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util;
+package org.onap.vfc.nfvo.resmanagement.common.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -24,7 +24,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.StringUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.StringUtil;
 
 public class StringUtilTest {
 
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util.request;
+package org.onap.vfc.nfvo.resmanagement.common.util.request;
 
 import static org.junit.Assert.*;
 
@@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.io.IOUtils;
 import org.apache.cxf.jaxrs.impl.HttpServletRequestFilter;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
 
 import javassist.Modifier;
 import mockit.Mock;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util.response;
+package org.onap.vfc.nfvo.resmanagement.common.util.response;
 
 import static org.junit.Assert.*;
 
@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
 
 import net.sf.json.JSONObject;
 
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.common.util.response;
+package org.onap.vfc.nfvo.resmanagement.common.util.response;
 
 import static org.junit.Assert.*;
 
@@ -23,8 +23,8 @@ import java.lang.reflect.Modifier;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.response.ResponseUtil;
-import org.onap.vfc.nfvo.res.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
 
 import mockit.Mock;
 import mockit.MockUp;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.adapter.impl;
+package org.onap.vfc.nfvo.resmanagement.service.adapter.impl;
 
 import static org.junit.Assert.assertNotNull;
 
@@ -22,8 +22,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.RestfulUtil;
-import org.onap.vfc.nfvo.res.service.adapter.impl.ResmgrAdapter2MSBManager;
+import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
+import org.onap.vfc.nfvo.resmanagement.service.adapter.impl.ResmgrAdapter2MSBManager;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
 
 import mockit.Mock;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.adapter.impl;
+package org.onap.vfc.nfvo.resmanagement.service.adapter.impl;
 
 import java.io.IOException;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.adapter.impl.ResmgrAdapterMgrService;
+import org.onap.vfc.nfvo.resmanagement.service.adapter.impl.ResmgrAdapterMgrService;
 
 import mockit.Mock;
 import mockit.MockUp;
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import static org.junit.Assert.*;
 
@@ -22,10 +22,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.HostImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.HostBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.HostDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.HostImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.HostBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.HostDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import static org.junit.Assert.assertTrue;
 
@@ -25,13 +25,13 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.LocationImpl;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.SitesImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.LocationBusinessImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.SitesBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.LocationDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.LocationImpl;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.SitesImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.LocationBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.SitesBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.LocationDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import static org.junit.Assert.*;
 
@@ -23,11 +23,11 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.NetworkImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.NetworkBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.NetworkDaoImpl;
-import org.onap.vfc.nfvo.res.service.dao.inf.NetworkDao;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.NetworkImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.NetworkBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.NetworkDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.inf.NetworkDao;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.util.JsonUtil;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.PortImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.PortBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.PortDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.PortImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.PortBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.PortDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import static org.junit.Assert.assertEquals;
 
@@ -24,9 +24,9 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.SitesImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.SitesBusinessImpl;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.SitesImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.SitesBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.base.openstack.impl;
+package org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.List;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.VimImpl;
-import org.onap.vfc.nfvo.res.service.business.impl.VimBusinessImpl;
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.VimImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.VimBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.business.impl.HostBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.HostDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.HostBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.HostDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.business.impl.LimitsBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.LimitsBusinessImpl;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.openo.baseservice.roa.util.restclient.HttpRest;
 import org.openo.baseservice.roa.util.restclient.RestfulOptions;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.business.impl.LocationBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.LocationDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.LocationBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.LocationDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -27,9 +27,9 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.business.impl.SitesBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.SitesDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.SitesBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.SitesDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.business.impl;
+package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -22,9 +22,9 @@ import static org.junit.Assert.assertTrue;
 import java.util.List;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.business.impl.VimBusinessImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.VimDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.VimBusinessImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.VimDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.HostDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-import org.onap.vfc.nfvo.res.service.mapper.HostMapper;
-import org.onap.vfc.nfvo.res.service.mapper.NetworkMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.HostDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.HostMapper;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Expectations;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.LocationDaoImpl;
-import org.onap.vfc.nfvo.res.service.dao.impl.NetworkDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-import org.onap.vfc.nfvo.res.service.mapper.LocationMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.LocationDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.NetworkDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.LocationMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
@@ -22,10 +22,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.NetworkDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-import org.onap.vfc.nfvo.res.service.mapper.NetworkMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.NetworkDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Expectations;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.PortDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
-import org.onap.vfc.nfvo.res.service.mapper.NetworkMapper;
-import org.onap.vfc.nfvo.res.service.mapper.PortMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.PortDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.PortMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Expectations;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.SitesDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
-import org.onap.vfc.nfvo.res.service.mapper.NetworkMapper;
-import org.onap.vfc.nfvo.res.service.mapper.SitesMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.SitesDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.SitesMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Expectations;
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import java.util.List;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.VimDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
-import org.onap.vfc.nfvo.res.service.mapper.VimMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.VimDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VimMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Expectations;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.VirtualLinkDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
-import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity;
-import org.onap.vfc.nfvo.res.service.mapper.SitesMapper;
-import org.onap.vfc.nfvo.res.service.mapper.VirtualLinkMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.VirtualLinkDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.SitesMapper;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VirtualLinkMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.dao.impl;
+package org.onap.vfc.nfvo.resmanagement.service.dao.impl;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.dao.impl.AbstractDao;
-import org.onap.vfc.nfvo.res.service.dao.impl.VmDaoImpl;
-import org.onap.vfc.nfvo.res.service.entity.VmEntity;
-import org.onap.vfc.nfvo.res.service.mapper.SitesMapper;
-import org.onap.vfc.nfvo.res.service.mapper.VmMapper;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
+import org.onap.vfc.nfvo.resmanagement.service.dao.impl.VmDaoImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.SitesMapper;
+import org.onap.vfc.nfvo.resmanagement.service.mapper.VmMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 import mockit.Mock;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 
 import net.sf.json.JSONObject;
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 
 import net.sf.json.JSONObject;
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 
 import net.sf.json.JSONObject;
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 
 import net.sf.json.JSONObject;
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 
 import net.sf.json.JSONObject;
 
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.entity;
+package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.service.entity.VimEntity;
+import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 
 import net.sf.json.JSONObject;
 
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.vfc.nfvo.res.service.rest;\r
+package org.onap.vfc.nfvo.resmanagement.service.rest;\r
 \r
 import static org.junit.Assert.assertNotNull;\r
 \r
@@ -22,10 +22,10 @@ import javax.servlet.http.HttpServletRequest;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;\r
-import org.onap.vfc.nfvo.res.service.group.impl.GrantResServiceImpl;\r
-import org.onap.vfc.nfvo.res.service.group.inf.GrantResService;\r
-import org.onap.vfc.nfvo.res.service.rest.GrantResourseRoa;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;\r
+import org.onap.vfc.nfvo.resmanagement.service.group.impl.GrantResServiceImpl;\r
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.GrantResService;\r
+import org.onap.vfc.nfvo.resmanagement.service.rest.GrantResourseRoa;\r
 import org.openo.baseservice.remoteservice.exception.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.vfc.nfvo.res.service.rest;\r
+package org.onap.vfc.nfvo.resmanagement.service.rest;\r
 \r
 import static org.junit.Assert.assertNotNull;\r
 \r
@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;\r
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.HostImpl;\r
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Host;\r
-import org.onap.vfc.nfvo.res.service.entity.HostEntity;\r
-import org.onap.vfc.nfvo.res.service.rest.HostRoa;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;\r
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.HostImpl;\r
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Host;\r
+import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;\r
+import org.onap.vfc.nfvo.resmanagement.service.rest.HostRoa;\r
 import org.openo.baseservice.remoteservice.exception.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.vfc.nfvo.res.service.rest;\r
+package org.onap.vfc.nfvo.resmanagement.service.rest;\r
 \r
 import static org.junit.Assert.assertNotNull;\r
 \r
@@ -22,9 +22,9 @@ import javax.servlet.http.HttpServletRequest;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.onap.vfc.nfvo.res.service.business.impl.LimitsBusinessImpl;\r
-import org.onap.vfc.nfvo.res.service.business.inf.LimitsBusiness;\r
-import org.onap.vfc.nfvo.res.service.rest.LimitsRoa;\r
+import org.onap.vfc.nfvo.resmanagement.service.business.impl.LimitsBusinessImpl;\r
+import org.onap.vfc.nfvo.resmanagement.service.business.inf.LimitsBusiness;\r
+import org.onap.vfc.nfvo.resmanagement.service.rest.LimitsRoa;\r
 import org.openo.baseservice.remoteservice.exception.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.vfc.nfvo.res.service.rest;\r
+package org.onap.vfc.nfvo.resmanagement.service.rest;\r
 \r
 import static org.junit.Assert.assertNotNull;\r
 \r
@@ -26,14 +26,14 @@ import javax.servlet.http.HttpServletRequest;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;\r
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.LocationImpl;\r
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.SitesImpl;\r
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Location;\r
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Sites;\r
-import org.onap.vfc.nfvo.res.service.entity.LocationEntity;\r
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;\r
-import org.onap.vfc.nfvo.res.service.rest.LocationRoa;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;\r
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.LocationImpl;\r
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.SitesImpl;\r
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Location;\r
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites;\r
+import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;\r
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;\r
+import org.onap.vfc.nfvo.resmanagement.service.rest.LocationRoa;\r
 import org.openo.baseservice.remoteservice.exception.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.vfc.nfvo.res.service.rest;\r
+package org.onap.vfc.nfvo.resmanagement.service.rest;\r
 \r
 import static org.junit.Assert.assertNotNull;\r
 \r
@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;\r
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.NetworkImpl;\r
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Network;\r
-import org.onap.vfc.nfvo.res.service.entity.NetworkEntity;\r
-import org.onap.vfc.nfvo.res.service.rest.NetworkRoa;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;\r
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.NetworkImpl;\r
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Network;\r
+import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;\r
+import org.onap.vfc.nfvo.resmanagement.service.rest.NetworkRoa;\r
 import org.openo.baseservice.remoteservice.exception.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.vfc.nfvo.res.service.rest;\r
+package org.onap.vfc.nfvo.resmanagement.service.rest;\r
 \r
 import static org.junit.Assert.assertNotNull;\r
 \r
@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;\r
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.PortImpl;\r
-import org.onap.vfc.nfvo.res.service.base.openstack.inf.Port;\r
-import org.onap.vfc.nfvo.res.service.entity.PortEntity;\r
-import org.onap.vfc.nfvo.res.service.rest.PortRoa;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;\r
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.PortImpl;\r
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Port;\r
+import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;\r
+import org.onap.vfc.nfvo.resmanagement.service.rest.PortRoa;\r
 import org.openo.baseservice.remoteservice.exception.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.vfc.nfvo.res.service.rest;\r
+package org.onap.vfc.nfvo.resmanagement.service.rest;\r
 \r
 import static org.junit.Assert.assertNotNull;\r
 \r
@@ -22,11 +22,11 @@ import javax.servlet.http.HttpServletRequest;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.onap.vfc.nfvo.res.common.VimUtil;\r
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;\r
-import org.onap.vfc.nfvo.res.service.group.impl.ResOperateServiceImpl;\r
-import org.onap.vfc.nfvo.res.service.group.inf.ResOperateService;\r
-import org.onap.vfc.nfvo.res.service.rest.ResOperateRoa;\r
+import org.onap.vfc.nfvo.resmanagement.common.VimUtil;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;\r
+import org.onap.vfc.nfvo.resmanagement.service.group.impl.ResOperateServiceImpl;\r
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.ResOperateService;\r
+import org.onap.vfc.nfvo.resmanagement.service.rest.ResOperateRoa;\r
 import org.openo.baseservice.remoteservice.exception.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onap.vfc.nfvo.res.service.rest;
+package org.onap.vfc.nfvo.resmanagement.service.rest;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -27,11 +27,11 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.res.common.VimUtil;
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;
-import org.onap.vfc.nfvo.res.service.base.openstack.impl.SitesImpl;
-import org.onap.vfc.nfvo.res.service.entity.SitesEntity;
-import org.onap.vfc.nfvo.res.service.rest.SitesRoa;
+import org.onap.vfc.nfvo.resmanagement.common.VimUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.SitesImpl;
+import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
+import org.onap.vfc.nfvo.resmanagement.service.rest.SitesRoa;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.springframework.mock.web.MockHttpServletRequest;
 
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.vfc.nfvo.res.service.rest;\r
+package org.onap.vfc.nfvo.resmanagement.service.rest;\r
 \r
 import static org.junit.Assert.assertNotNull;\r
 \r
@@ -23,7 +23,7 @@ import java.io.InputStream;
 \r
 import org.apache.commons.io.IOUtils;\r
 import org.junit.Test;\r
-import org.onap.vfc.nfvo.res.service.rest.SwaggerRoa;\r
+import org.onap.vfc.nfvo.resmanagement.service.rest.SwaggerRoa;\r
 \r
 import mockit.Mock;\r
 import mockit.MockUp;\r
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.vfc.nfvo.res.service.rest;\r
+package org.onap.vfc.nfvo.resmanagement.service.rest;\r
 \r
 import static org.junit.Assert.assertNotNull;\r
 \r
@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;\r
-import org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity;\r
-import org.onap.vfc.nfvo.res.service.group.impl.VirtualLinkServiceImpl;\r
-import org.onap.vfc.nfvo.res.service.group.inf.VirtualLinkService;\r
-import org.onap.vfc.nfvo.res.service.rest.VirtualLinkRoa;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;\r
+import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;\r
+import org.onap.vfc.nfvo.resmanagement.service.group.impl.VirtualLinkServiceImpl;\r
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VirtualLinkService;\r
+import org.onap.vfc.nfvo.resmanagement.service.rest.VirtualLinkRoa;\r
 import org.openo.baseservice.remoteservice.exception.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.vfc.nfvo.res.service.rest;\r
+package org.onap.vfc.nfvo.resmanagement.service.rest;\r
 \r
 import static org.junit.Assert.assertNotNull;\r
 \r
@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;\r
-import org.onap.vfc.nfvo.res.service.entity.VmEntity;\r
-import org.onap.vfc.nfvo.res.service.group.impl.VmServiceImpl;\r
-import org.onap.vfc.nfvo.res.service.group.inf.VmService;\r
-import org.onap.vfc.nfvo.res.service.rest.VmRoa;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;\r
+import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;\r
+import org.onap.vfc.nfvo.resmanagement.service.group.impl.VmServiceImpl;\r
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VmService;\r
+import org.onap.vfc.nfvo.resmanagement.service.rest.VmRoa;\r
 import org.openo.baseservice.remoteservice.exception.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.vfc.nfvo.res.service.rest;\r
+package org.onap.vfc.nfvo.resmanagement.service.rest;\r
 \r
 import static org.junit.Assert.assertNotNull;\r
 \r
@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;\r
-import org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity;\r
-import org.onap.vfc.nfvo.res.service.group.impl.VnfInfoServiceImpl;\r
-import org.onap.vfc.nfvo.res.service.group.inf.VnfInfoService;\r
-import org.onap.vfc.nfvo.res.service.rest.VnfInfoRoa;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;\r
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;\r
+import org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfInfoServiceImpl;\r
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfInfoService;\r
+import org.onap.vfc.nfvo.resmanagement.service.rest.VnfInfoRoa;\r
 import org.openo.baseservice.remoteservice.exception.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.vfc.nfvo.res.service.rest;\r
+package org.onap.vfc.nfvo.resmanagement.service.rest;\r
 \r
 import static org.junit.Assert.assertNotNull;\r
 \r
@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;\r
-import org.onap.vfc.nfvo.res.service.entity.VnfEntity;\r
-import org.onap.vfc.nfvo.res.service.group.impl.VnfServiceImpl;\r
-import org.onap.vfc.nfvo.res.service.group.inf.VnfService;\r
-import org.onap.vfc.nfvo.res.service.rest.VnfRoa;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;\r
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;\r
+import org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfServiceImpl;\r
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfService;\r
+import org.onap.vfc.nfvo.resmanagement.service.rest.VnfRoa;\r
 import org.openo.baseservice.remoteservice.exception.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
@@ -14,7 +14,7 @@
  * limitations under the License.\r
  */\r
 \r
-package org.onap.vfc.nfvo.res.service.rest;\r
+package org.onap.vfc.nfvo.resmanagement.service.rest;\r
 \r
 import static org.junit.Assert.assertNotNull;\r
 \r
@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.onap.vfc.nfvo.res.common.util.request.RequestUtil;\r
-import org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity;\r
-import org.onap.vfc.nfvo.res.service.group.impl.VnfStatusServiceImpl;\r
-import org.onap.vfc.nfvo.res.service.group.inf.VnfStatusService;\r
-import org.onap.vfc.nfvo.res.service.rest.VnfStatusRoa;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;\r
+import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;\r
+import org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfStatusServiceImpl;\r
+import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfStatusService;\r
+import org.onap.vfc.nfvo.resmanagement.service.rest.VnfStatusRoa;\r
 import org.openo.baseservice.remoteservice.exception.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
  * limitations under the License.\r
  */\r
 \r
-package org.onap.vfc.nfvo.res.service.rest.exceptionmapper;\r
+package org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper;\r
 \r
 import static org.junit.Assert.assertEquals;\r
 import static org.junit.Assert.assertNotNull;\r
 \r
 import org.junit.Test;\r
-import org.onap.vfc.nfvo.res.service.rest.exceptionmapper.ExceptionMessage;\r
+import org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper.ExceptionMessage;\r
 \r
 /**\r
  * <br>\r
  * limitations under the License.\r
  */\r
 \r
-package org.onap.vfc.nfvo.res.service.rest.exceptionmapper;\r
+package org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper;\r
 \r
 import static org.junit.Assert.assertNotNull;\r
 \r
 import javax.ws.rs.core.Response;\r
 \r
 import org.junit.Test;\r
-import org.onap.vfc.nfvo.res.service.rest.exceptionmapper.GenericExceptionMapper;\r
+import org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper.GenericExceptionMapper;\r
 \r
 /**\r
  * <br>\r
  * limitations under the License.\r
  */\r
 \r
-package org.onap.vfc.nfvo.res.service.rest.exceptionmapper;\r
+package org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper;\r
 \r
 import static org.junit.Assert.assertNotNull;\r
 \r
 import javax.ws.rs.core.Response;\r
 \r
 import org.junit.Test;\r
-import org.onap.vfc.nfvo.res.service.rest.exceptionmapper.ServiceExceptionMapper;\r
+import org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper.ServiceExceptionMapper;\r
 import org.openo.baseservice.remoteservice.exception.ServiceException;\r
 \r
 /**\r
diff --git a/pom.xml b/pom.xml
index ecb9746..fa4c32b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.onap.vfc.nfvo.res</groupId>
+    <groupId>org.onap.vfc.nfvo.resmanagement</groupId>
     <artifactId>resmanagement</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>