summaryrefslogtreecommitdiffstats
path: root/ResmanagementService
diff options
context:
space:
mode:
Diffstat (limited to 'ResmanagementService')
-rw-r--r--ResmanagementService/service/pom.xml5
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/mocoserver/VimDriverSuccessServer.java2
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITHostRoaFail.java2
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITHostRoaSuccess.java2
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITLimitsRoa.java2
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITLocationRoaFail.java2
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITLocationRoaSuccess.java2
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITNetworkRoaFail.java2
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITNetworkRoaSuccess.java2
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITPortRoaFail.java2
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITPortRoaSuccess.java2
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITResOperateRoaFail.java2
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITResOperateRoaSuccess.java2
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITSitesRoaFail.java2
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITSitesRoaSuccess.java2
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/AddSuccessChecker.java2
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/FailureChecker.java2
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/GetSuccessChecker.java2
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/MyChecker.java6
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/MyTestManager.java4
-rw-r--r--ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/SuccessChecker.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/ResourceUtil.java4
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java4
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/Constant.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/HttpConstant.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/ParamConstant.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/ResponseConstant.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/UrlConstant.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/JsonUtil.java24
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtil.java24
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/StringUtil.java18
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/request/RequestUtil.java8
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/response/ResponseUtil.java12
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/response/RoaResponseUtil.java10
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/activator/ROAResmgrServicePostProcessor.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManager.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/inf/IResmgrAdapter2MSBManager.java6
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/inf/IResmgrAdapterMgrService.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/HostImpl.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImpl.java4
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImpl.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImpl.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImpl.java4
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/VimImpl.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Host.java8
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/InterfaceResManagement.java4
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Location.java16
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Network.java8
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Port.java10
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/ResManagement.java8
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Sites.java14
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Vim.java10
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImpl.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImpl.java4
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImpl.java6
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/NetworkBusinessImpl.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/PortBusinessImpl.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImpl.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImpl.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/HostBusiness.java20
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/LimitsBusiness.java4
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/LocationBusiness.java20
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/NetworkBusiness.java20
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/PortBusiness.java20
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/SitesBusiness.java20
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/VimBusiness.java10
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/AbstractDao.java4
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/HostDaoImpl.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/LocationDaoImpl.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/NetworkDaoImpl.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/PortDaoImpl.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/SitesDaoImpl.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VimDaoImpl.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImpl.java10
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VmDaoImpl.java14
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfDaoImpl.java10
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfInfoDaoImpl.java12
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfStatusDaoImpl.java12
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/HostDao.java20
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/LocationDao.java20
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/NetworkDao.java20
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/PortDao.java20
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/SitesDao.java18
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VimDao.java10
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VirtualLinkDao.java10
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VmDao.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfDao.java10
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfInfoDao.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfStatusDao.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/HostEntity.java4
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/LocationEntity.java4
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/NetworkEntity.java4
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/PortEntity.java4
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/SitesEntity.java10
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VimEntity.java14
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VirtualLinkEntity.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfEntity.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java10
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java8
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceDelServiceImpl.java4
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceUpdateServiceImpl.java4
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/ResOperateServiceImpl.java10
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VirtualLinkServiceImpl.java10
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VmServiceImpl.java12
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfInfoServiceImpl.java12
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfServiceImpl.java12
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfStatusServiceImpl.java10
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/GrantResService.java4
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/ResOperateService.java12
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VirtualLinkService.java8
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VmService.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfInfoService.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfService.java8
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfStatusService.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/HostMapper.java20
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/LocationMapper.java20
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/NetworkMapper.java20
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/PortMapper.java20
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/SitesMapper.java18
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VimMapper.java10
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoa.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoa.java12
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoa.java4
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoa.java22
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoa.java12
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoa.java12
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoa.java8
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoa.java14
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoa.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoa.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoa.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoa.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoa.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoa.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessage.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapper.java2
-rw-r--r--ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapper.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoaTest.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.java9
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoaTest.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessageTest.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapperTest.java2
-rw-r--r--ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java2
159 files changed, 526 insertions, 524 deletions
diff --git a/ResmanagementService/service/pom.xml b/ResmanagementService/service/pom.xml
index e4eec82..215bb96 100644
--- a/ResmanagementService/service/pom.xml
+++ b/ResmanagementService/service/pom.xml
@@ -32,6 +32,11 @@
<version>4.3</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-jaxrs</artifactId>
+ <version>1.9.12</version>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/mocoserver/VimDriverSuccessServer.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/mocoserver/VimDriverSuccessServer.java
index 1d6123f..4bad660 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/mocoserver/VimDriverSuccessServer.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/mocoserver/VimDriverSuccessServer.java
@@ -24,7 +24,7 @@ import org.openo.sdno.testframework.moco.MocoHttpServer;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 28, 2016
+ * @version VFC 1.0 Sep 28, 2016
*/
public class VimDriverSuccessServer extends MocoHttpServer {
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITHostRoaFail.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITHostRoaFail.java
index 17803e1..30d3529 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITHostRoaFail.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITHostRoaFail.java
@@ -28,7 +28,7 @@ import org.openo.nfvo.resmanagement.util.MyTestManager;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 24, 2016
+ * @version VFC 1.0 Sep 24, 2016
*/
public class ITHostRoaFail extends MyTestManager {
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITHostRoaSuccess.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITHostRoaSuccess.java
index 4cf8239..918ba48 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITHostRoaSuccess.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITHostRoaSuccess.java
@@ -28,7 +28,7 @@ import org.openo.nfvo.resmanagement.util.MyTestManager;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 20, 2016
+ * @version VFC 1.0 Sep 20, 2016
*/
public class ITHostRoaSuccess extends MyTestManager {
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITLimitsRoa.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITLimitsRoa.java
index d2387db..bb4e081 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITLimitsRoa.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITLimitsRoa.java
@@ -31,7 +31,7 @@ import org.openo.nfvo.resmanagement.util.MyTestManager;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 28, 2016
+ * @version VFC 1.0 Sep 28, 2016
*/
public class ITLimitsRoa extends MyTestManager {
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITLocationRoaFail.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITLocationRoaFail.java
index 64bc2ed..687e809 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITLocationRoaFail.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITLocationRoaFail.java
@@ -28,7 +28,7 @@ import org.openo.nfvo.resmanagement.util.MyTestManager;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 27, 2016
+ * @version VFC 1.0 Sep 27, 2016
*/
public class ITLocationRoaFail extends MyTestManager {
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITLocationRoaSuccess.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITLocationRoaSuccess.java
index 995dac3..5624469 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITLocationRoaSuccess.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITLocationRoaSuccess.java
@@ -28,7 +28,7 @@ import org.openo.nfvo.resmanagement.util.MyTestManager;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 26, 2016
+ * @version VFC 1.0 Sep 26, 2016
*/
public class ITLocationRoaSuccess extends MyTestManager {
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITNetworkRoaFail.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITNetworkRoaFail.java
index d672037..9b756e0 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITNetworkRoaFail.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITNetworkRoaFail.java
@@ -28,7 +28,7 @@ import org.openo.nfvo.resmanagement.util.MyTestManager;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 27, 2016
+ * @version VFC 1.0 Sep 27, 2016
*/
public class ITNetworkRoaFail extends MyTestManager {
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITNetworkRoaSuccess.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITNetworkRoaSuccess.java
index 21f169d..974934a 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITNetworkRoaSuccess.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITNetworkRoaSuccess.java
@@ -28,7 +28,7 @@ import org.openo.nfvo.resmanagement.util.MyTestManager;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 27, 2016
+ * @version VFC 1.0 Sep 27, 2016
*/
public class ITNetworkRoaSuccess extends MyTestManager {
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITPortRoaFail.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITPortRoaFail.java
index 8a30dc8..8b22d48 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITPortRoaFail.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITPortRoaFail.java
@@ -28,7 +28,7 @@ import org.openo.nfvo.resmanagement.util.MyTestManager;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 26, 2016
+ * @version VFC 1.0 Sep 26, 2016
*/
public class ITPortRoaFail extends MyTestManager {
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITPortRoaSuccess.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITPortRoaSuccess.java
index 945f1a8..6eeaa5e 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITPortRoaSuccess.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITPortRoaSuccess.java
@@ -28,7 +28,7 @@ import org.openo.nfvo.resmanagement.util.MyTestManager;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 26, 2016
+ * @version VFC 1.0 Sep 26, 2016
*/
public class ITPortRoaSuccess extends MyTestManager {
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITResOperateRoaFail.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITResOperateRoaFail.java
index 4e340f3..ed39591 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITResOperateRoaFail.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITResOperateRoaFail.java
@@ -28,7 +28,7 @@ import org.openo.nfvo.resmanagement.util.MyTestManager;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 15, 2016
+ * @version VFC 1.0 Oct 15, 2016
*/
public class ITResOperateRoaFail extends MyTestManager {
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITResOperateRoaSuccess.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITResOperateRoaSuccess.java
index 5e424ef..935c420 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITResOperateRoaSuccess.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITResOperateRoaSuccess.java
@@ -31,7 +31,7 @@ import org.openo.nfvo.resmanagement.util.MyTestManager;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 15, 2016
+ * @version VFC 1.0 Oct 15, 2016
*/
public class ITResOperateRoaSuccess extends MyTestManager {
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITSitesRoaFail.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITSitesRoaFail.java
index 4e33e1c..33a790e 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITSitesRoaFail.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITSitesRoaFail.java
@@ -28,7 +28,7 @@ import org.openo.nfvo.resmanagement.util.MyTestManager;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 27, 2016
+ * @version VFC 1.0 Sep 27, 2016
*/
public class ITSitesRoaFail extends MyTestManager {
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITSitesRoaSuccess.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITSitesRoaSuccess.java
index fef1430..4fc3468 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITSitesRoaSuccess.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITSitesRoaSuccess.java
@@ -28,7 +28,7 @@ import org.openo.nfvo.resmanagement.util.MyTestManager;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 27, 2016
+ * @version VFC 1.0 Sep 27, 2016
*/
public class ITSitesRoaSuccess extends MyTestManager {
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/AddSuccessChecker.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/AddSuccessChecker.java
index 48bc3a2..25f78d1 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/AddSuccessChecker.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/AddSuccessChecker.java
@@ -27,7 +27,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 21, 2016
+ * @version VFC 1.0 Sep 21, 2016
*/
public class AddSuccessChecker implements IChecker {
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/FailureChecker.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/FailureChecker.java
index dc9f7e8..de3f5ef 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/FailureChecker.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/FailureChecker.java
@@ -27,7 +27,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 16, 2016
+ * @version VFC 1.0 Aug 16, 2016
*/
public class FailureChecker implements IChecker {
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/GetSuccessChecker.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/GetSuccessChecker.java
index 87e9a51..9bd29fb 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/GetSuccessChecker.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/GetSuccessChecker.java
@@ -27,7 +27,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 21, 2016
+ * @version VFC 1.0 Sep 21, 2016
*/
public class GetSuccessChecker implements IChecker {
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/MyChecker.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/MyChecker.java
index 00fd5b6..14fe81a 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/MyChecker.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/MyChecker.java
@@ -25,7 +25,7 @@ import org.openo.sdno.testframework.http.model.HttpResponse;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 21, 2016
+ * @version VFC 1.0 Sep 21, 2016
*/
public class MyChecker extends DefaultChecker {
@@ -37,7 +37,7 @@ public class MyChecker extends DefaultChecker {
* </p>
*
* @param expectedResponse
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public MyChecker(HttpResponse expectedResponse) {
super(expectedResponse);
@@ -49,7 +49,7 @@ public class MyChecker extends DefaultChecker {
*
* @param response
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public boolean check(HttpResponse response) {
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/MyTestManager.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/MyTestManager.java
index 2e6f0b5..95824e1 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/MyTestManager.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/MyTestManager.java
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 21, 2016
+ * @version VFC 1.0 Sep 21, 2016
*/
public class MyTestManager extends TestManager {
@@ -59,7 +59,7 @@ public class MyTestManager extends TestManager {
* @param file
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public HttpResponse execTestCase(File file) throws ServiceException {
diff --git a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/SuccessChecker.java b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/SuccessChecker.java
index 7817e76..9d46ded 100644
--- a/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/SuccessChecker.java
+++ b/ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/SuccessChecker.java
@@ -27,7 +27,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 16, 2016
+ * @version VFC 1.0 Aug 16, 2016
*/
public class SuccessChecker implements IChecker {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/ResourceUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/ResourceUtil.java
index 4259574..db94a17 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/ResourceUtil.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/ResourceUtil.java
@@ -22,7 +22,7 @@ package org.onap.vfc.nfvo.resmanagement.common;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 25, 2016
+ * @version VFC 1.0 Aug 25, 2016
*/
public class ResourceUtil {
@@ -35,7 +35,7 @@ public class ResourceUtil {
*
* @param key
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static String getMessage(String key) {
return key;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java
index e623d75..92ab459 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java
@@ -32,7 +32,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 30, 2016
+ * @version VFC 1.0 Oct 30, 2016
*/
public class VimUtil {
@@ -123,7 +123,7 @@ public class VimUtil {
* @param tenant
* @param vimId
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static String getTenantIdByName(String tenant, String vimId) {
JSONArray tenants = VimUtil.getTenants(vimId);
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/Constant.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/Constant.java
index 57bd3cc..570598a 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/Constant.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/Constant.java
@@ -22,7 +22,7 @@ package org.onap.vfc.nfvo.resmanagement.common.constant;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 25, 2016
+ * @version VFC 1.0 Aug 25, 2016
*/
public class Constant {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/HttpConstant.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/HttpConstant.java
index 354f887..a977849 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/HttpConstant.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/HttpConstant.java
@@ -23,7 +23,7 @@ package org.onap.vfc.nfvo.resmanagement.common.constant;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class HttpConstant {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/ParamConstant.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/ParamConstant.java
index 3b958c5..27e8d49 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/ParamConstant.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/ParamConstant.java
@@ -23,7 +23,7 @@ package org.onap.vfc.nfvo.resmanagement.common.constant;
* </p>
*
* @author
- * @version NFVO 0.5 2016-3-17
+ * @version VFC 1.0 2016-3-17
*/
public class ParamConstant {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/ResponseConstant.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/ResponseConstant.java
index fd877c3..dfc0985 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/ResponseConstant.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/ResponseConstant.java
@@ -24,7 +24,7 @@ import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 25, 2016
+ * @version VFC 1.0 Aug 25, 2016
*/
public class ResponseConstant {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/UrlConstant.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/UrlConstant.java
index 68dc312..e76f235 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/UrlConstant.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/UrlConstant.java
@@ -23,7 +23,7 @@ package org.onap.vfc.nfvo.resmanagement.common.constant;
* </p>
*
* @author
- * @version NFVO 0.5 2016-3-17
+ * @version VFC 1.0 2016-3-17
*/
public class UrlConstant {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/JsonUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/JsonUtil.java
index faf63f7..f6bf1ac 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/JsonUtil.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/JsonUtil.java
@@ -31,7 +31,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public final class JsonUtil {
@@ -57,7 +57,7 @@ public final class JsonUtil {
* @param jsonObj
* @param fieldName
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static String getJsonFieldStr(JSONObject jsonObj, String fieldName) {
return (String)getJsonFieldObject(jsonObj, fieldName, TYPE_STRING);
@@ -70,7 +70,7 @@ public final class JsonUtil {
* @param jsonObj
* @param fieldName
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static Integer getJsonFieldInt(JSONObject jsonObj, String fieldName) {
return (Integer)getJsonFieldObject(jsonObj, fieldName, TYPE_INT);
@@ -83,7 +83,7 @@ public final class JsonUtil {
* @param jsonObj
* @param fieldName
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static JSONArray getJsonFieldArr(JSONObject jsonObj, String fieldName) {
return (JSONArray)getJsonFieldObject(jsonObj, fieldName, TYPE_JSONA);
@@ -96,7 +96,7 @@ public final class JsonUtil {
* @param jsonObj
* @param fieldName
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static JSONObject getJsonFieldJson(JSONObject jsonObj, String fieldName) {
return (JSONObject)getJsonFieldObject(jsonObj, fieldName, TYPE_JSONO);
@@ -109,7 +109,7 @@ public final class JsonUtil {
* @param jsonObj
* @param fieldName
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static Long getJsonFieldLong(JSONObject jsonObj, String fieldName) {
return (Long)getJsonFieldObject(jsonObj, fieldName, TYPE_LONG);
@@ -123,7 +123,7 @@ public final class JsonUtil {
* @param fieldName
* @param classType
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
private static Object getJsonFieldObject(JSONObject jsonObj, String fieldName, int classType) {
try {
@@ -164,7 +164,7 @@ public final class JsonUtil {
*
* @param jsonObject
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static boolean isNullJson(JSONObject jsonObject) {
if(null == jsonObject || jsonObject.isEmpty()) {
@@ -180,7 +180,7 @@ public final class JsonUtil {
* @param json
* @param key
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static String getStrValueByjson(JSONObject json, String key) {
JSONArray names = json.names();
@@ -221,7 +221,7 @@ public final class JsonUtil {
* @param json
* @param key
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static JSONObject getJsonValueByjson(JSONObject json, String key) {
JSONObject resultJson = new JSONObject();
@@ -242,7 +242,7 @@ public final class JsonUtil {
* @param parentKey
* @param key
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static String getStrValueByJson(JSONObject json, String parentKey, String key) {
if(parentKey.isEmpty()) {
@@ -262,7 +262,7 @@ public final class JsonUtil {
*
* @param obj
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static JSONObject getResponseData(JSONObject obj) {
JSONObject result = new JSONObject();
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtil.java
index 8607111..aa7c948 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtil.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtil.java
@@ -47,7 +47,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class RestfulUtil {
@@ -76,7 +76,7 @@ public class RestfulUtil {
* @param url
* @param type
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static JSONObject getResponseObj(String url, String type) {
return getResponseObj(url, new RestfulParametes(), type);
@@ -89,7 +89,7 @@ public class RestfulUtil {
* @param parametes
* @param type
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static JSONObject getResponseObj(String url, RestfulParametes parametes, String type) {
try {
@@ -112,7 +112,7 @@ public class RestfulUtil {
* @param restParametes
* @param type
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static String getResponseContent(String url, RestfulParametes restParametes, String type) {
return getResponseContent(url, restParametes, null, type);
@@ -126,7 +126,7 @@ public class RestfulUtil {
* @param opt
* @param type
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static Map<String, Object> getResponseMap(String url, RestfulParametes restParametes, RestfulOptions opt,
String type) {
@@ -140,7 +140,7 @@ public class RestfulUtil {
* @param url
* @param type
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static Map<String, Object> getResponseContentMap(String url, String type) {
RestfulResponse response = restfulResponse(url, new RestfulParametes(), null, type);
@@ -164,7 +164,7 @@ public class RestfulUtil {
* @param opt
* @param type
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static String getResponseContent(String url, RestfulParametes restParametes, RestfulOptions opt,
String type) {
@@ -189,7 +189,7 @@ public class RestfulUtil {
* @param restParametes
* @param type
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static RestfulResponse getRestfulResponse(String url, RestfulParametes restParametes, String type) {
return restfulResponse(url, restParametes, null, type);
@@ -224,7 +224,7 @@ public class RestfulUtil {
* @param methodName, Restful's method.
* @param objects, method param array.
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static RestfulResponse getRestRes(String methodName, Object... objects) {
try {
@@ -270,7 +270,7 @@ public class RestfulUtil {
* @param url
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static JSONArray getResponseRes(RestfulParametes restParametes, String url) throws ServiceException {
String result = getResponseContent(url, restParametes, RestfulUtil.TYPE_GET);
@@ -300,7 +300,7 @@ public class RestfulUtil {
* @param iResName
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static JSONArray getResponseRes(RestfulParametes restParametes, String url, String iResName)
throws ServiceException {
@@ -336,7 +336,7 @@ public class RestfulUtil {
* @param paramsMap
* @param params
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
String url = paramsMap.get("url");
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/StringUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/StringUtil.java
index e7f4943..c932669 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/StringUtil.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/StringUtil.java
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public final class StringUtil {
@@ -45,7 +45,7 @@ public final class StringUtil {
*
* @param str
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static boolean isValidString(String str) {
if(null == str || str.isEmpty()) {
@@ -60,7 +60,7 @@ public final class StringUtil {
*
* @param strs
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static boolean isAnyLargeThanZero(String... strs) {
for(String str : strs) {
@@ -78,7 +78,7 @@ public final class StringUtil {
*
* @param strs
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static boolean isInteger(String... strs) {
try {
@@ -102,7 +102,7 @@ public final class StringUtil {
*
* @param strs
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static boolean isNumeric(String... strs) {
try {
@@ -128,7 +128,7 @@ public final class StringUtil {
* @param used
* @param drTotal
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static boolean compareZeroByFloat(String tatol, String used, String drTotal) {
Float ftotal = (float)0;
@@ -158,7 +158,7 @@ public final class StringUtil {
* @param used
* @param drTotal
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static boolean compareZeroByInteger(String tatol, String used, String drTotal) {
Integer ftotal = (int)0;
@@ -185,7 +185,7 @@ public final class StringUtil {
*
* @param data
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static String numFormat(String data) {
if(null != data && !("".equals(data))) {
@@ -206,7 +206,7 @@ public final class StringUtil {
*
* @param inputStr
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static boolean checkXss(String inputStr) {
return inputStr.matches("[A-Za-z0-9_.']+");
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/request/RequestUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/request/RequestUtil.java
index 8ae59b1..e7f194d 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/request/RequestUtil.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/request/RequestUtil.java
@@ -38,7 +38,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 2016-3-17
+ * @version VFC 1.0 2016-3-17
*/
public final class RequestUtil {
@@ -49,7 +49,7 @@ public final class RequestUtil {
* <p>
* </p>
*
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
private RequestUtil() {
}
@@ -94,7 +94,7 @@ public final class RequestUtil {
* @param context
* The http context
* @return JSONObject The body of all request in json format
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static JSONObject getAllJsonRequestBody(HttpServletRequest context) {
JSONObject requestBody = getJsonRequestBody(context);
@@ -113,7 +113,7 @@ public final class RequestUtil {
* @param context
* The http context
* @return Map context header
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@SuppressWarnings("unchecked")
private static Map<String, String> getContextHeader(HttpServletRequest context) {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/response/ResponseUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/response/ResponseUtil.java
index 6658b29..33f5325 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/response/ResponseUtil.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/response/ResponseUtil.java
@@ -32,7 +32,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public final class ResponseUtil {
@@ -47,7 +47,7 @@ public final class ResponseUtil {
* @param msg
* The request message
* @return JSONObject The response for http request
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static JSONObject genHttpResponse(int retCode, String msg) {
return genHttpResponse(null, createCodeMap(-1, retCode), msg, null);
@@ -63,7 +63,7 @@ public final class ResponseUtil {
* @param map
* Other request info of this request
* @return JSONObject The response for http request
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static JSONObject genHttpResponse(int retCode, String msg, Map<String, Object> map) {
return genHttpResponse(null, createCodeMap(-1, retCode), msg, map);
@@ -81,7 +81,7 @@ public final class ResponseUtil {
* @param msg
* The message of request
* @return JSONObject The response for http request
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static JSONObject genHttpResponse(HttpServletRequest context, int httpStatusCode, int retCode, String msg) {
return genHttpResponse(context, createCodeMap(httpStatusCode, retCode), msg, null);
@@ -96,7 +96,7 @@ public final class ResponseUtil {
* @param msg, The message of request
* @param map, Other message of request
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static JSONObject genHttpResponse(HttpServletRequest context, Map<String, Integer> codeMap, String msg,
Map<String, Object> map) {
@@ -122,7 +122,7 @@ public final class ResponseUtil {
* @param retCode
* The http request return code
* @return Map
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
private static Map<String, Integer> createCodeMap(int httpStatusCode, int retCode) {
Map<String, Integer> codeMap = new HashMap<>(5);
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/response/RoaResponseUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/response/RoaResponseUtil.java
index a54891b..fcb94a6 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/response/RoaResponseUtil.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/response/RoaResponseUtil.java
@@ -35,7 +35,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 2016-3-17
+ * @version VFC 1.0 2016-3-17
*/
public final class RoaResponseUtil {
@@ -51,7 +51,7 @@ public final class RoaResponseUtil {
* @param list
* The basic response for get method
* @return JSONObject The response for http request
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static <T> JSONObject get(List<T> list) {
Map<String, Object> map = new HashMap<String, Object>(10);
@@ -66,7 +66,7 @@ public final class RoaResponseUtil {
* @param result
* The result
* @return JSONObject
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static JSONObject add(int result) {
LOGGER.info("function=add; msg=add result{}", result);
@@ -83,7 +83,7 @@ public final class RoaResponseUtil {
* @param result
* The result
* @return JSONObject The response for http request
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static JSONObject update(int result) {
LOGGER.info("function=update; msg=update result{}", result);
@@ -100,7 +100,7 @@ public final class RoaResponseUtil {
* @param result
* The result
* @return delete JSONObject of the response for http request
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static JSONObject delete(int result) {
LOGGER.info("function=delete; msg=delete result{}", result);
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/activator/ROAResmgrServicePostProcessor.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/activator/ROAResmgrServicePostProcessor.java
index 2525064..f554116 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/activator/ROAResmgrServicePostProcessor.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/activator/ROAResmgrServicePostProcessor.java
@@ -28,7 +28,7 @@ import org.springframework.beans.factory.config.DestructionAwareBeanPostProcesso
* </p>
*
* @author
- * @version NFVO 0.5 Sep 22, 2016
+ * @version VFC 1.0 Sep 22, 2016
*/
public class ROAResmgrServicePostProcessor implements DestructionAwareBeanPostProcessor {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManager.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManager.java
index 5cf7627..7d2466e 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManager.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManager.java
@@ -34,7 +34,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 22, 2016
+ * @version VFC 1.0 Sep 22, 2016
*/
public class ResmgrAdapter2MSBManager implements IResmgrAdapter2MSBManager {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java
index f75ec06..ead1f5d 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java
@@ -43,7 +43,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 22, 2016
+ * @version VFC 1.0 Sep 22, 2016
*/
public class ResmgrAdapterMgrService implements IResmgrAdapterMgrService {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/inf/IResmgrAdapter2MSBManager.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/inf/IResmgrAdapter2MSBManager.java
index 509c9af..cf860e4 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/inf/IResmgrAdapter2MSBManager.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/inf/IResmgrAdapter2MSBManager.java
@@ -26,7 +26,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 22, 2016
+ * @version VFC 1.0 Sep 22, 2016
*/
public interface IResmgrAdapter2MSBManager {
@@ -36,7 +36,7 @@ public interface IResmgrAdapter2MSBManager {
* @param paramsMap
* @param driverInfo
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
JSONObject registerResmgr(Map<String, String> paramsMap, JSONObject driverInfo);
@@ -45,7 +45,7 @@ public interface IResmgrAdapter2MSBManager {
*
* @param paramsMap
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
JSONObject unregisterResmgr(Map<String, String> paramsMap);
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/inf/IResmgrAdapterMgrService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/inf/IResmgrAdapterMgrService.java
index 4e4d035..86eca33 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/inf/IResmgrAdapterMgrService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/inf/IResmgrAdapterMgrService.java
@@ -22,7 +22,7 @@ package org.onap.vfc.nfvo.resmanagement.service.adapter.inf;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 22, 2016
+ * @version VFC 1.0 Sep 22, 2016
*/
public interface IResmgrAdapterMgrService {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/HostImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/HostImpl.java
index 505bd50..b7fd16f 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/HostImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/HostImpl.java
@@ -33,7 +33,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class HostImpl implements Host {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImpl.java
index d083f33..3b349cf 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImpl.java
@@ -42,7 +42,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class LocationImpl implements Location {
@@ -151,7 +151,7 @@ public class LocationImpl implements Location {
* @param total
* @param used
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public JSONObject computingSite(JSONObject total, JSONObject used) {
String vcpus = JsonUtil.getJsonFieldStr(total, ParamConstant.PARAM_VCPUS);
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImpl.java
index be82396..0d1a0a8 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImpl.java
@@ -35,7 +35,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class NetworkImpl implements Network {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImpl.java
index f1ab242..37c51df 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImpl.java
@@ -35,7 +35,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class PortImpl implements Port {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImpl.java
index b7d55c9..2f85b2c 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImpl.java
@@ -43,7 +43,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
*/
public class SitesImpl implements Sites {
@@ -84,7 +84,7 @@ public class SitesImpl implements Sites {
*
* @param json
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public void sendToMonitor(JSONObject jsonObject) throws ServiceException {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/VimImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/VimImpl.java
index abd9d39..1069842 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/VimImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/VimImpl.java
@@ -33,7 +33,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
*/
public class VimImpl implements Vim {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Host.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Host.java
index 0c07119..d0be162 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Host.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Host.java
@@ -30,7 +30,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 25, 2016
+ * @version VFC 1.0 Aug 25, 2016
*/
public interface Host extends InterfaceResManagement {
@@ -40,7 +40,7 @@ public interface Host extends InterfaceResManagement {
* @param jsonObject
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateStatusByVimId(JSONObject jsonObject) throws ServiceException;
@@ -50,7 +50,7 @@ public interface Host extends InterfaceResManagement {
* @param condition
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<HostEntity> getList(Map<String, Object> condition) throws ServiceException;
@@ -60,7 +60,7 @@ public interface Host extends InterfaceResManagement {
* @param resPoolEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int update(HostEntity resPoolEntity) throws ServiceException;
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/InterfaceResManagement.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/InterfaceResManagement.java
index 2540a78..9f38737 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/InterfaceResManagement.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/InterfaceResManagement.java
@@ -24,7 +24,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 25, 2016
+ * @version VFC 1.0 Aug 25, 2016
*/
public interface InterfaceResManagement extends ResManagement {
@@ -34,7 +34,7 @@ public interface InterfaceResManagement extends ResManagement {
* @param vimId
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteResByVimId(String vimId) throws ServiceException;
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Location.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Location.java
index 9f5ba16..7cc1828 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Location.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Location.java
@@ -30,7 +30,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public interface Location extends ResManagement {
@@ -40,7 +40,7 @@ public interface Location extends ResManagement {
* @param id
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
Map<String, Object> get(String id) throws ServiceException;
@@ -50,7 +50,7 @@ public interface Location extends ResManagement {
* @param condition
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<LocationEntity> get(Map<String, Object> condition) throws ServiceException;
@@ -60,7 +60,7 @@ public interface Location extends ResManagement {
* @param condition
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
LocationEntity getLocation(Map<String, Object> condition) throws ServiceException;
@@ -70,7 +70,7 @@ public interface Location extends ResManagement {
* @param locationInfo
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<JSONObject> getLocationInfo(List<LocationEntity> locationInfo) throws ServiceException;
@@ -79,7 +79,7 @@ public interface Location extends ResManagement {
*
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<String> getCountry() throws ServiceException;
@@ -89,7 +89,7 @@ public interface Location extends ResManagement {
* @param condition
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<String> getLocationByCountry(Map<String, Object> condition) throws ServiceException;
@@ -98,7 +98,7 @@ public interface Location extends ResManagement {
*
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<String> getCloudservice() throws ServiceException;
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Network.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Network.java
index ce089b6..59577f9 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Network.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Network.java
@@ -31,7 +31,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public interface Network extends InterfaceResManagement {
@@ -42,7 +42,7 @@ public interface Network extends InterfaceResManagement {
* @param jsonObject
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateStatusByVimId(JSONObject jsonObject) throws ServiceException;
@@ -53,7 +53,7 @@ public interface Network extends InterfaceResManagement {
* @param condition
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<NetworkEntity> getList(Map<String, Object> condition) throws ServiceException;
@@ -62,7 +62,7 @@ public interface Network extends InterfaceResManagement {
*
* @param entity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int add(NetworkEntity entity) throws ServiceException;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Port.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Port.java
index 3a5bf90..272017f 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Port.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Port.java
@@ -30,7 +30,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 25, 2016
+ * @version VFC 1.0 Aug 25, 2016
*/
public interface Port extends InterfaceResManagement {
@@ -40,7 +40,7 @@ public interface Port extends InterfaceResManagement {
* @param jsonObject
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateStatusByVimId(JSONObject jsonObject) throws ServiceException;
@@ -50,7 +50,7 @@ public interface Port extends InterfaceResManagement {
* @param condition
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<PortEntity> getList(Map<String, Object> condition) throws ServiceException;
@@ -60,7 +60,7 @@ public interface Port extends InterfaceResManagement {
* @param resPoolEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int update(PortEntity resPoolEntity) throws ServiceException;
@@ -70,7 +70,7 @@ public interface Port extends InterfaceResManagement {
* @param portEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int add(PortEntity portEntity) throws ServiceException;
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/ResManagement.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/ResManagement.java
index ff19217..81fba4e 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/ResManagement.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/ResManagement.java
@@ -26,7 +26,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 25, 2016
+ * @version VFC 1.0 Aug 25, 2016
*/
public interface ResManagement {
@@ -36,7 +36,7 @@ public interface ResManagement {
* @param jsonObject
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int add(JSONObject jsonObject) throws ServiceException;
@@ -46,7 +46,7 @@ public interface ResManagement {
* @param jsonObject
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int update(JSONObject jsonObject) throws ServiceException;
@@ -59,7 +59,7 @@ public interface ResManagement {
* @param id
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int delete(String id) throws ServiceException;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Sites.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Sites.java
index 04a4af4..6bc2172 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Sites.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Sites.java
@@ -30,7 +30,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 25, 2016
+ * @version VFC 1.0 Aug 25, 2016
*/
public interface Sites extends InterfaceResManagement {
@@ -40,7 +40,7 @@ public interface Sites extends InterfaceResManagement {
* @param jsonObject
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateStatusByVimId(JSONObject jsonObject) throws ServiceException;
@@ -50,7 +50,7 @@ public interface Sites extends InterfaceResManagement {
* @param condition
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<SitesEntity> getList(Map<String, Object> condition) throws ServiceException;
@@ -60,7 +60,7 @@ public interface Sites extends InterfaceResManagement {
* @param condition
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
SitesEntity get(Map<String, Object> condition) throws ServiceException;
@@ -70,7 +70,7 @@ public interface Sites extends InterfaceResManagement {
* @param jsonObject
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateResource(JSONObject jsonObject) throws ServiceException;
@@ -80,7 +80,7 @@ public interface Sites extends InterfaceResManagement {
* @param sitesEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int update(SitesEntity sitesEntity) throws ServiceException;
@@ -89,7 +89,7 @@ public interface Sites extends InterfaceResManagement {
*
* @param json
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
void sendToMonitor(JSONObject json) throws ServiceException;
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Vim.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Vim.java
index 7dfb79b..20f5cca 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Vim.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Vim.java
@@ -30,7 +30,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 25, 2016
+ * @version VFC 1.0 Aug 25, 2016
*/
public interface Vim extends ResManagement {
@@ -40,7 +40,7 @@ public interface Vim extends ResManagement {
* @param id
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
VimEntity getVim(String id) throws ServiceException;
@@ -49,7 +49,7 @@ public interface Vim extends ResManagement {
*
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<VimEntity> getList() throws ServiceException;
@@ -60,7 +60,7 @@ public interface Vim extends ResManagement {
* @param condition
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<JSONObject> getVimInfo(Map<String, Object> condition) throws ServiceException;
@@ -70,7 +70,7 @@ public interface Vim extends ResManagement {
* @param vimId
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int add(String vimId) throws ServiceException;
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImpl.java
index 62acb04..822baa5 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImpl.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class HostBusinessImpl implements HostBusiness {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImpl.java
index 1fd6d09..08b7af1 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImpl.java
@@ -33,7 +33,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class LimitsBusinessImpl implements LimitsBusiness {
@@ -45,7 +45,7 @@ public class LimitsBusinessImpl implements LimitsBusiness {
* @param vimId
* @param tenantId
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
private JSONObject getResponse(String vimId, String tenantId) {
LOGGER.info("function=getResponse; vimId={}, tenantId={}", vimId, tenantId);
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImpl.java
index e068056..3e2f047 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImpl.java
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class LocationBusinessImpl implements LocationBusiness {
@@ -54,7 +54,7 @@ public class LocationBusinessImpl implements LocationBusiness {
* @param locationEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public boolean checkLocation(LocationEntity locationEntity) throws ServiceException {
String location = locationEntity.getLocation();
@@ -74,7 +74,7 @@ public class LocationBusinessImpl implements LocationBusiness {
* @param locationEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public boolean checkLatitude(LocationEntity locationEntity) throws ServiceException {
String latitu = locationEntity.getLatitude();
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/NetworkBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/NetworkBusinessImpl.java
index 1a001e3..3606f0b 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/NetworkBusinessImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/NetworkBusinessImpl.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class NetworkBusinessImpl implements NetworkBusiness {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/PortBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/PortBusinessImpl.java
index fc42543..d87463a 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/PortBusinessImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/PortBusinessImpl.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class PortBusinessImpl implements PortBusiness {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImpl.java
index 7d610cf..6869f96 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImpl.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
*/
public class SitesBusinessImpl implements SitesBusiness {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImpl.java
index 03a08d4..6e5d143 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImpl.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
*/
public class VimBusinessImpl implements VimBusiness {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/HostBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/HostBusiness.java
index db2f01e..a10aee6 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/HostBusiness.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/HostBusiness.java
@@ -28,7 +28,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 31, 2016
+ * @version VFC 1.0 Aug 31, 2016
*/
public interface HostBusiness {
@@ -38,7 +38,7 @@ public interface HostBusiness {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
HostEntity getHost(String id);
@@ -48,7 +48,7 @@ public interface HostBusiness {
*
* @param condition
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<HostEntity> getHosts(Map<String, Object> condition);
@@ -59,7 +59,7 @@ public interface HostBusiness {
* @param id
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteHost(String id) throws ServiceException;
@@ -70,7 +70,7 @@ public interface HostBusiness {
* @param vimId
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteHostByVimId(String vimId) throws ServiceException;
@@ -81,7 +81,7 @@ public interface HostBusiness {
* @param hostEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addHost(HostEntity hostEntity) throws ServiceException;
@@ -92,7 +92,7 @@ public interface HostBusiness {
* @param hostEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addHostSelective(HostEntity hostEntity) throws ServiceException;
@@ -103,7 +103,7 @@ public interface HostBusiness {
* @param hostEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateHostSelective(HostEntity hostEntity) throws ServiceException;
@@ -114,7 +114,7 @@ public interface HostBusiness {
* @param hostEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateHost(HostEntity hostEntity) throws ServiceException;
@@ -125,7 +125,7 @@ public interface HostBusiness {
* @param hostEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateHostByVimId(HostEntity hostEntity) throws ServiceException;
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/LimitsBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/LimitsBusiness.java
index 42408df..09c4398 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/LimitsBusiness.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/LimitsBusiness.java
@@ -26,7 +26,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public interface LimitsBusiness {
@@ -35,7 +35,7 @@ public interface LimitsBusiness {
*
* @param paramJson
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
JSONObject getLimits(String vimId) throws ServiceException;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/LocationBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/LocationBusiness.java
index d75d0aa..716f4ae 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/LocationBusiness.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/LocationBusiness.java
@@ -29,7 +29,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public interface LocationBusiness {
@@ -40,7 +40,7 @@ public interface LocationBusiness {
* @param location
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
LocationEntity getLocation(String location) throws ServiceException;
@@ -51,7 +51,7 @@ public interface LocationBusiness {
* @param condition
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<LocationEntity> getLocations(Map<String, Object> condition) throws ServiceException;
@@ -62,7 +62,7 @@ public interface LocationBusiness {
* @param location
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteLocation(String location) throws ServiceException;
@@ -73,7 +73,7 @@ public interface LocationBusiness {
* @param locationEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addLocation(LocationEntity locationEntity) throws ServiceException;
@@ -84,7 +84,7 @@ public interface LocationBusiness {
* @param locationEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addLocationSelective(LocationEntity locationEntity) throws ServiceException;
@@ -95,7 +95,7 @@ public interface LocationBusiness {
* @param locationEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateLocationSelective(LocationEntity locationEntity) throws ServiceException;
@@ -106,7 +106,7 @@ public interface LocationBusiness {
* @param locationEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateLocation(LocationEntity locationEntity) throws ServiceException;
@@ -116,7 +116,7 @@ public interface LocationBusiness {
*
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<String> getCountry() throws ServiceException;
@@ -127,7 +127,7 @@ public interface LocationBusiness {
* @param condition
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<String> getLocationByCountry(Map<String, Object> condition) throws ServiceException;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/NetworkBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/NetworkBusiness.java
index be4bf29..1d2dcde 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/NetworkBusiness.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/NetworkBusiness.java
@@ -29,7 +29,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public interface NetworkBusiness {
@@ -39,7 +39,7 @@ public interface NetworkBusiness {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
NetworkEntity getNetwork(String id);
@@ -49,7 +49,7 @@ public interface NetworkBusiness {
*
* @param condition
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<NetworkEntity> getNetworks(Map<String, Object> condition);
@@ -60,7 +60,7 @@ public interface NetworkBusiness {
* @param id
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteNetwork(String id) throws ServiceException;
@@ -71,7 +71,7 @@ public interface NetworkBusiness {
* @param vimId
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteNetworkByVimId(String vimId) throws ServiceException;
@@ -82,7 +82,7 @@ public interface NetworkBusiness {
* @param networkEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addNetwork(NetworkEntity networkEntity) throws ServiceException;
@@ -93,7 +93,7 @@ public interface NetworkBusiness {
* @param networkEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addNetworkSelective(NetworkEntity networkEntity) throws ServiceException;
@@ -104,7 +104,7 @@ public interface NetworkBusiness {
* @param networkEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateNetworkSelective(NetworkEntity networkEntity) throws ServiceException;
@@ -115,7 +115,7 @@ public interface NetworkBusiness {
* @param networkEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateNetwork(NetworkEntity networkEntity) throws ServiceException;
@@ -126,7 +126,7 @@ public interface NetworkBusiness {
* @param networkEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateNetworkByVimId(NetworkEntity networkEntity) throws ServiceException;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/PortBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/PortBusiness.java
index 92c8dae..80e413f 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/PortBusiness.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/PortBusiness.java
@@ -28,7 +28,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 31, 2016
+ * @version VFC 1.0 Aug 31, 2016
*/
public interface PortBusiness {
@@ -38,7 +38,7 @@ public interface PortBusiness {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
PortEntity getPort(String id);
@@ -48,7 +48,7 @@ public interface PortBusiness {
*
* @param condition
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<PortEntity> getPorts(Map<String, Object> condition);
@@ -59,7 +59,7 @@ public interface PortBusiness {
* @param id
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deletePort(String id) throws ServiceException;
@@ -70,7 +70,7 @@ public interface PortBusiness {
* @param vimId
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deletePortByVimId(String vimId) throws ServiceException;
@@ -81,7 +81,7 @@ public interface PortBusiness {
* @param portEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addPort(PortEntity portEntity) throws ServiceException;
@@ -92,7 +92,7 @@ public interface PortBusiness {
* @param portEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addPortSelective(PortEntity portEntity) throws ServiceException;
@@ -103,7 +103,7 @@ public interface PortBusiness {
* @param portEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updatePortSelective(PortEntity portEntity) throws ServiceException;
@@ -114,7 +114,7 @@ public interface PortBusiness {
* @param portEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updatePort(PortEntity portEntity) throws ServiceException;
@@ -125,7 +125,7 @@ public interface PortBusiness {
* @param portEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updatePortByVimId(PortEntity portEntity) throws ServiceException;
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/SitesBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/SitesBusiness.java
index bfa95f0..5acabba 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/SitesBusiness.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/SitesBusiness.java
@@ -28,7 +28,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
*/
public interface SitesBusiness {
@@ -38,7 +38,7 @@ public interface SitesBusiness {
* @param id
* @return The get result
* @throws ServiceException When get failed.
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
SitesEntity getSite(String id) throws ServiceException;
@@ -47,7 +47,7 @@ public interface SitesBusiness {
*
* @param condition
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<SitesEntity> getSites(Map<String, Object> condition);
@@ -57,7 +57,7 @@ public interface SitesBusiness {
* @param id
* @return The delete result
* @throws ServiceException When delete failed.
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteSite(String id) throws ServiceException;
@@ -67,7 +67,7 @@ public interface SitesBusiness {
* @param sitesEntity
* @return The add result
* @throws ServiceException When add failed.
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addSite(SitesEntity sitesEntity) throws ServiceException;
@@ -77,7 +77,7 @@ public interface SitesBusiness {
* @param sitesEntity
* @return The add result
* @throws ServiceException When add failed.
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addSiteSelective(SitesEntity sitesEntity) throws ServiceException;
@@ -87,7 +87,7 @@ public interface SitesBusiness {
* @param sitesEntity
* @return The update result
* @throws ServiceException When update failed.
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateSiteSelective(SitesEntity sitesEntity) throws ServiceException;
@@ -97,7 +97,7 @@ public interface SitesBusiness {
* @param sitesEntity
* @return The update result
* @throws ServiceException When update failed.
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateSite(SitesEntity sitesEntity) throws ServiceException;
@@ -107,7 +107,7 @@ public interface SitesBusiness {
* @param sitesEntity
* @return The update result
* @throws ServiceException When update failed.
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateSiteByVimId(SitesEntity sitesEntity) throws ServiceException;
@@ -117,7 +117,7 @@ public interface SitesBusiness {
* @param sitesEntity
* @return The update result
* @throws ServiceException When update failed.
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateSiteResource(SitesEntity sitesEntity) throws ServiceException;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/VimBusiness.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/VimBusiness.java
index 9fb267d..041da80 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/VimBusiness.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/VimBusiness.java
@@ -27,7 +27,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
*/
public interface VimBusiness {
@@ -36,7 +36,7 @@ public interface VimBusiness {
*
* @param id
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
VimEntity getVim(String id);
@@ -45,7 +45,7 @@ public interface VimBusiness {
*
* @param id
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<VimEntity> getVims();
@@ -55,7 +55,7 @@ public interface VimBusiness {
* @param id
* @return the delete result
* @throws ServiceException When delete failed.
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteVim(String id) throws ServiceException;
@@ -65,7 +65,7 @@ public interface VimBusiness {
* @param id
* @return the add result
* @throws ServiceException When add failed.
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addVim(String id) throws ServiceException;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/AbstractDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/AbstractDao.java
index 84171d3..00a52bf 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/AbstractDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/AbstractDao.java
@@ -25,7 +25,7 @@ import org.apache.ibatis.session.SqlSession;
* </p>
*
* @author
- * @version NFVO 0.5 2016-3-17
+ * @version VFC 1.0 2016-3-17
*/
public class AbstractDao {
@@ -49,7 +49,7 @@ public class AbstractDao {
* @param type
* The type of Class
* @return Mapper
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public <T> T getMapperManager(Class<T> type) {
return (T)getSession().getMapper(type);
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/HostDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/HostDaoImpl.java
index e72f426..babe64d 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/HostDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/HostDaoImpl.java
@@ -31,7 +31,7 @@ import org.onap.vfc.nfvo.resmanagement.service.mapper.HostMapper;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class HostDaoImpl extends AbstractDao implements HostDao {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/LocationDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/LocationDaoImpl.java
index 7901331..aefeabf 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/LocationDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/LocationDaoImpl.java
@@ -31,7 +31,7 @@ import org.onap.vfc.nfvo.resmanagement.service.mapper.LocationMapper;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class LocationDaoImpl extends AbstractDao implements LocationDao {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/NetworkDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/NetworkDaoImpl.java
index 612aba6..7ae961d 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/NetworkDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/NetworkDaoImpl.java
@@ -31,7 +31,7 @@ import org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class NetworkDaoImpl extends AbstractDao implements NetworkDao {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/PortDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/PortDaoImpl.java
index 3854152..70e9ee4 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/PortDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/PortDaoImpl.java
@@ -31,7 +31,7 @@ import org.onap.vfc.nfvo.resmanagement.service.mapper.PortMapper;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class PortDaoImpl extends AbstractDao implements PortDao {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/SitesDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/SitesDaoImpl.java
index 0aec201..7f96af7 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/SitesDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/SitesDaoImpl.java
@@ -30,7 +30,7 @@ import org.onap.vfc.nfvo.resmanagement.service.mapper.SitesMapper;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 25, 2016
+ * @version VFC 1.0 Aug 25, 2016
*/
public class SitesDaoImpl extends AbstractDao implements SitesDao {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VimDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VimDaoImpl.java
index e450300..8f2e128 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VimDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VimDaoImpl.java
@@ -29,7 +29,7 @@ import org.onap.vfc.nfvo.resmanagement.service.mapper.VimMapper;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 25, 2016
+ * @version VFC 1.0 Aug 25, 2016
*/
public class VimDaoImpl extends AbstractDao implements VimDao {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImpl.java
index e93b9ad..db64539 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImpl.java
@@ -29,7 +29,7 @@ import org.onap.vfc.nfvo.resmanagement.service.mapper.VirtualLinkMapper;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 28, 2016
+ * @version VFC 1.0 Oct 28, 2016
*/
public class VirtualLinkDaoImpl extends AbstractDao implements VirtualLinkDao {
@@ -38,7 +38,7 @@ public class VirtualLinkDaoImpl extends AbstractDao implements VirtualLinkDao {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public VirtualLinkEntity getVl(String id) {
@@ -50,7 +50,7 @@ public class VirtualLinkDaoImpl extends AbstractDao implements VirtualLinkDao {
*
* @param condition
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public List<VirtualLinkEntity> getVls(Map<String, Object> condition) {
@@ -62,7 +62,7 @@ public class VirtualLinkDaoImpl extends AbstractDao implements VirtualLinkDao {
*
* @param virtualLinkEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int addVl(VirtualLinkEntity virtualLinkEntity) {
@@ -74,7 +74,7 @@ public class VirtualLinkDaoImpl extends AbstractDao implements VirtualLinkDao {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int deleteVlById(String id) {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VmDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VmDaoImpl.java
index 5e7d34a..0729d45 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VmDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VmDaoImpl.java
@@ -29,7 +29,7 @@ import org.onap.vfc.nfvo.resmanagement.service.mapper.VmMapper;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 28, 2016
+ * @version VFC 1.0 Oct 28, 2016
*/
public class VmDaoImpl extends AbstractDao implements VmDao {
@@ -38,7 +38,7 @@ public class VmDaoImpl extends AbstractDao implements VmDao {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public VmEntity getVm(String id) {
@@ -50,7 +50,7 @@ public class VmDaoImpl extends AbstractDao implements VmDao {
*
* @param condition
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public List<VmEntity> getVms(Map<String, Object> condition) {
@@ -62,7 +62,7 @@ public class VmDaoImpl extends AbstractDao implements VmDao {
*
* @param vmEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int addVm(VmEntity vmEntity) {
@@ -74,7 +74,7 @@ public class VmDaoImpl extends AbstractDao implements VmDao {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int deleteVmById(String id) {
@@ -86,7 +86,7 @@ public class VmDaoImpl extends AbstractDao implements VmDao {
*
* @param vmEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int updateVm(VmEntity vmEntity) {
@@ -98,7 +98,7 @@ public class VmDaoImpl extends AbstractDao implements VmDao {
*
* @param vnfInstanceId
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int deleteVmByVnfId(String vnfInstanceId) {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfDaoImpl.java
index 565089a..fbae480 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfDaoImpl.java
@@ -29,7 +29,7 @@ import org.onap.vfc.nfvo.resmanagement.service.mapper.VnfMapper;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 28, 2016
+ * @version VFC 1.0 Oct 28, 2016
*/
public class VnfDaoImpl extends AbstractDao implements VnfDao {
@@ -38,7 +38,7 @@ public class VnfDaoImpl extends AbstractDao implements VnfDao {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public VnfEntity getVnf(String id) {
@@ -50,7 +50,7 @@ public class VnfDaoImpl extends AbstractDao implements VnfDao {
*
* @param condition
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public List<VnfEntity> getVnfs(Map<String, Object> condition) {
@@ -62,7 +62,7 @@ public class VnfDaoImpl extends AbstractDao implements VnfDao {
*
* @param vnfEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int addVnf(VnfEntity vnfEntity) {
@@ -74,7 +74,7 @@ public class VnfDaoImpl extends AbstractDao implements VnfDao {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int deleteVnfById(String id) {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfInfoDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfInfoDaoImpl.java
index f2369c3..29b87a9 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfInfoDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfInfoDaoImpl.java
@@ -29,7 +29,7 @@ import org.onap.vfc.nfvo.resmanagement.service.mapper.VnfInfoMapper;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 28, 2016
+ * @version VFC 1.0 Oct 28, 2016
*/
public class VnfInfoDaoImpl extends AbstractDao implements VnfInfoDao {
@@ -38,7 +38,7 @@ public class VnfInfoDaoImpl extends AbstractDao implements VnfInfoDao {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public VnfInfoEntity getVnfInfo(String id) {
@@ -50,7 +50,7 @@ public class VnfInfoDaoImpl extends AbstractDao implements VnfInfoDao {
*
* @param condition
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public List<VnfInfoEntity> getVnfInfos(Map<String, Object> condition) {
@@ -62,7 +62,7 @@ public class VnfInfoDaoImpl extends AbstractDao implements VnfInfoDao {
*
* @param vmEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int addVnfInfo(VnfInfoEntity vnfInfoEntity) {
@@ -74,7 +74,7 @@ public class VnfInfoDaoImpl extends AbstractDao implements VnfInfoDao {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int deleteVnfInfoById(String id) {
@@ -86,7 +86,7 @@ public class VnfInfoDaoImpl extends AbstractDao implements VnfInfoDao {
*
* @param vnfInfoEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int updateVnfInfo(VnfInfoEntity vnfInfoEntity) {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfStatusDaoImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfStatusDaoImpl.java
index 4026e9e..d916727 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfStatusDaoImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VnfStatusDaoImpl.java
@@ -29,7 +29,7 @@ import org.onap.vfc.nfvo.resmanagement.service.mapper.VnfStatusMapper;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 29, 2016
+ * @version VFC 1.0 Oct 29, 2016
*/
public class VnfStatusDaoImpl extends AbstractDao implements VnfStatusDao {
@@ -38,7 +38,7 @@ public class VnfStatusDaoImpl extends AbstractDao implements VnfStatusDao {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public VnfStatusEntity getVnfStatus(String id) {
@@ -50,7 +50,7 @@ public class VnfStatusDaoImpl extends AbstractDao implements VnfStatusDao {
*
* @param condition
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public List<VnfStatusEntity> getVnfStatuss(Map<String, Object> condition) {
@@ -62,7 +62,7 @@ public class VnfStatusDaoImpl extends AbstractDao implements VnfStatusDao {
*
* @param vnfStatusEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int addVnfStatus(VnfStatusEntity vnfStatusEntity) {
@@ -74,7 +74,7 @@ public class VnfStatusDaoImpl extends AbstractDao implements VnfStatusDao {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int deleteVnfStatusById(String id) {
@@ -86,7 +86,7 @@ public class VnfStatusDaoImpl extends AbstractDao implements VnfStatusDao {
*
* @param vnfStatusEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int updateVnfStatus(VnfStatusEntity vnfStatusEntity) {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/HostDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/HostDao.java
index 79e32a1..c67fa3d 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/HostDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/HostDao.java
@@ -27,7 +27,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
*/
public interface HostDao {
@@ -36,7 +36,7 @@ public interface HostDao {
*
* @param id
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
HostEntity getHost(String id);
@@ -45,7 +45,7 @@ public interface HostDao {
*
* @param condition
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<HostEntity> getHosts(Map<String, Object> condition);
@@ -54,7 +54,7 @@ public interface HostDao {
*
* @param id
* @return The delete result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteHost(String id);
@@ -63,7 +63,7 @@ public interface HostDao {
*
* @param vimId
* @return The delete result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteHostByVimId(String vimId);
@@ -72,7 +72,7 @@ public interface HostDao {
*
* @param hostEntity
* @return The add result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addHost(HostEntity hostEntity);
@@ -81,7 +81,7 @@ public interface HostDao {
*
* @param hostEntity
* @return The add result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addHostSelective(HostEntity hostEntity);
@@ -90,7 +90,7 @@ public interface HostDao {
*
* @param hostEntity
* @return The update result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateHostSelective(HostEntity hostEntity);
@@ -99,7 +99,7 @@ public interface HostDao {
*
* @param hostEntity
* @return The update result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateHost(HostEntity hostEntity);
@@ -108,7 +108,7 @@ public interface HostDao {
*
* @param hostEntity
* @return The update result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateHostByVimId(HostEntity hostEntity);
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/LocationDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/LocationDao.java
index e40cb13..e36bcf2 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/LocationDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/LocationDao.java
@@ -28,7 +28,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public interface LocationDao {
@@ -38,7 +38,7 @@ public interface LocationDao {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
LocationEntity getLocation(String id);
@@ -48,7 +48,7 @@ public interface LocationDao {
*
* @param condition
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<LocationEntity> getLocations(Map<String, Object> condition);
@@ -58,7 +58,7 @@ public interface LocationDao {
*
* @param location
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteLocation(String location);
@@ -68,7 +68,7 @@ public interface LocationDao {
*
* @param sodoResEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addLocation(LocationEntity sodoResEntity);
@@ -78,7 +78,7 @@ public interface LocationDao {
*
* @param sodoResEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addLocationSelective(LocationEntity sodoResEntity);
@@ -88,7 +88,7 @@ public interface LocationDao {
*
* @param sodoResEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateLocationSelective(LocationEntity sodoResEntity);
@@ -98,7 +98,7 @@ public interface LocationDao {
*
* @param sodoResEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateLocation(LocationEntity sodoResEntity);
@@ -107,7 +107,7 @@ public interface LocationDao {
* Get Country.<br>
*
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<String> getCountry();
@@ -117,7 +117,7 @@ public interface LocationDao {
*
* @param condition
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<String> getLocationByCountry(Map<String, Object> condition);
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/NetworkDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/NetworkDao.java
index ed6ce69..d84462c 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/NetworkDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/NetworkDao.java
@@ -28,7 +28,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public interface NetworkDao {
@@ -38,7 +38,7 @@ public interface NetworkDao {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
NetworkEntity getNetwork(String id);
@@ -48,7 +48,7 @@ public interface NetworkDao {
*
* @param condition
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<NetworkEntity> getNetworks(Map<String, Object> condition);
@@ -58,7 +58,7 @@ public interface NetworkDao {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteNetwork(String id);
@@ -68,7 +68,7 @@ public interface NetworkDao {
*
* @param vimId
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteNetworkByVimId(String vimId);
@@ -78,7 +78,7 @@ public interface NetworkDao {
*
* @param networkEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addNetwork(NetworkEntity networkEntity);
@@ -88,7 +88,7 @@ public interface NetworkDao {
*
* @param networkEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addNetworkSelective(NetworkEntity networkEntity);
@@ -98,7 +98,7 @@ public interface NetworkDao {
*
* @param networkEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateNetworkSelective(NetworkEntity networkEntity);
@@ -108,7 +108,7 @@ public interface NetworkDao {
*
* @param networkEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateNetwork(NetworkEntity networkEntity);
@@ -118,7 +118,7 @@ public interface NetworkDao {
*
* @param networkEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateNetworkByVimId(NetworkEntity networkEntity);
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/PortDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/PortDao.java
index 3514194..fffdba9 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/PortDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/PortDao.java
@@ -27,7 +27,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
*/
public interface PortDao {
@@ -36,7 +36,7 @@ public interface PortDao {
*
* @param id
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
PortEntity getPort(String id);
@@ -45,7 +45,7 @@ public interface PortDao {
*
* @param condition
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<PortEntity> getPorts(Map<String, Object> condition);
@@ -54,7 +54,7 @@ public interface PortDao {
*
* @param id
* @return The delete result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deletePort(String id);
@@ -63,7 +63,7 @@ public interface PortDao {
*
* @param vimId
* @return The delete result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deletePortByVimId(String vimId);
@@ -72,7 +72,7 @@ public interface PortDao {
*
* @param portEntity
* @return The add result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addPort(PortEntity portEntity);
@@ -81,7 +81,7 @@ public interface PortDao {
*
* @param portEntity
* @return The add result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addPortSelective(PortEntity portEntity);
@@ -90,7 +90,7 @@ public interface PortDao {
*
* @param portEntity
* @return The update result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updatePortSelective(PortEntity portEntity);
@@ -99,7 +99,7 @@ public interface PortDao {
*
* @param portEntity
* @return The update result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updatePort(PortEntity portEntity);
@@ -108,7 +108,7 @@ public interface PortDao {
*
* @param portEntity
* @return The update result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updatePortByVimId(PortEntity portEntity);
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/SitesDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/SitesDao.java
index b085c8d..d6a4d85 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/SitesDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/SitesDao.java
@@ -27,7 +27,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
*/
public interface SitesDao {
@@ -36,7 +36,7 @@ public interface SitesDao {
*
* @param id
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
SitesEntity getSite(String id);
@@ -45,7 +45,7 @@ public interface SitesDao {
*
* @param condition
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<SitesEntity> getSites(Map<String, Object> condition);
@@ -54,7 +54,7 @@ public interface SitesDao {
*
* @param id
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteSite(String id);
@@ -63,7 +63,7 @@ public interface SitesDao {
*
* @param sitesEntity
* @return The delete result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addSite(SitesEntity sitesEntity);
@@ -72,7 +72,7 @@ public interface SitesDao {
*
* @param sitesEntity
* @return The add result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addSiteSelective(SitesEntity sitesEntity);
@@ -81,7 +81,7 @@ public interface SitesDao {
*
* @param sitesEntity
* @return The add result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateSiteSelective(SitesEntity sitesEntity);
@@ -90,7 +90,7 @@ public interface SitesDao {
*
* @param sitesEntity
* @return The update result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateSite(SitesEntity sitesEntity);
@@ -99,7 +99,7 @@ public interface SitesDao {
*
* @param sitesEntity
* @return The update result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateSiteByVimId(SitesEntity sitesEntity);
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VimDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VimDao.java
index fd4cd80..a94d1a8 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VimDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VimDao.java
@@ -26,7 +26,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
*/
public interface VimDao {
@@ -35,7 +35,7 @@ public interface VimDao {
*
* @param id
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
VimEntity getVim(String id);
@@ -43,7 +43,7 @@ public interface VimDao {
* It is used to get Vims info.<br/>
*
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<VimEntity> getVims();
@@ -52,7 +52,7 @@ public interface VimDao {
*
* @param id
* @return The delete result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteVim(String id);
@@ -61,7 +61,7 @@ public interface VimDao {
*
* @param vimEntity
* @return The add result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addVim(VimEntity vimEntity);
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VirtualLinkDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VirtualLinkDao.java
index 04c0bc1..1953739 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VirtualLinkDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VirtualLinkDao.java
@@ -27,7 +27,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 28, 2016
+ * @version VFC 1.0 Oct 28, 2016
*/
public interface VirtualLinkDao {
@@ -36,7 +36,7 @@ public interface VirtualLinkDao {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
VirtualLinkEntity getVl(String id);
@@ -45,7 +45,7 @@ public interface VirtualLinkDao {
*
* @param condition
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<VirtualLinkEntity> getVls(Map<String, Object> condition);
@@ -54,7 +54,7 @@ public interface VirtualLinkDao {
*
* @param virtualLinkEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addVl(VirtualLinkEntity virtualLinkEntity);
@@ -63,7 +63,7 @@ public interface VirtualLinkDao {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteVlById(String id);
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VmDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VmDao.java
index 5572cee..51e1964 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VmDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VmDao.java
@@ -27,7 +27,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 28, 2016
+ * @version VFC 1.0 Oct 28, 2016
*/
public interface VmDao {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfDao.java
index 4a34f22..b0de5cf 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfDao.java
@@ -27,7 +27,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 28, 2016
+ * @version VFC 1.0 Oct 28, 2016
*/
public interface VnfDao {
@@ -36,7 +36,7 @@ public interface VnfDao {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
VnfEntity getVnf(String id);
@@ -45,7 +45,7 @@ public interface VnfDao {
*
* @param condition
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<VnfEntity> getVnfs(Map<String, Object> condition);
@@ -54,7 +54,7 @@ public interface VnfDao {
*
* @param vnfEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addVnf(VnfEntity vnfEntity);
@@ -63,7 +63,7 @@ public interface VnfDao {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteVnfById(String id);
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfInfoDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfInfoDao.java
index e96c636..53930df 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfInfoDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfInfoDao.java
@@ -27,7 +27,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 28, 2016
+ * @version VFC 1.0 Oct 28, 2016
*/
public interface VnfInfoDao {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfStatusDao.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfStatusDao.java
index 852ea98..bcaf1e4 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfStatusDao.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/dao/inf/VnfStatusDao.java
@@ -27,7 +27,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 29, 2016
+ * @version VFC 1.0 Oct 29, 2016
*/
public interface VnfStatusDao {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/HostEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/HostEntity.java
index ce3dfd3..65514b7 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/HostEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/HostEntity.java
@@ -27,7 +27,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 31, 2016
+ * @version VFC 1.0 Aug 31, 2016
*/
public class HostEntity {
@@ -149,7 +149,7 @@ public class HostEntity {
*
* @param jsonObject
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static HostEntity toEntity(JSONObject jsonObject) {
HostEntity hostEntity = new HostEntity();
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/LocationEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/LocationEntity.java
index c84574f..0cda9d7 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/LocationEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/LocationEntity.java
@@ -28,7 +28,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class LocationEntity {
@@ -209,7 +209,7 @@ public class LocationEntity {
*
* @param jsonObject
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static LocationEntity toEntity(JSONObject jsonObject) {
LocationEntity sodoresesEntity = new LocationEntity();
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/NetworkEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/NetworkEntity.java
index 47625b5..1bef6dd 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/NetworkEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/NetworkEntity.java
@@ -28,7 +28,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class NetworkEntity {
@@ -238,7 +238,7 @@ public class NetworkEntity {
*
* @param jsonObject
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static NetworkEntity toEntity(JSONObject jsonObject) {
NetworkEntity sitesEntity = new NetworkEntity();
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/PortEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/PortEntity.java
index 08c16a7..5431c0b 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/PortEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/PortEntity.java
@@ -27,7 +27,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 31, 2016
+ * @version VFC 1.0 Aug 31, 2016
*/
public class PortEntity {
@@ -149,7 +149,7 @@ public class PortEntity {
*
* @param jsonObject
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static PortEntity toEntity(JSONObject jsonObject) {
PortEntity portEntity = new PortEntity();
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/SitesEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/SitesEntity.java
index c294338..e0dd307 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/SitesEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/SitesEntity.java
@@ -29,7 +29,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class SitesEntity {
@@ -205,7 +205,7 @@ public class SitesEntity {
*
* @param jsonObject
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static SitesEntity toEntity(JSONObject jsonObject) {
SitesEntity sitesEntity = new SitesEntity();
@@ -251,7 +251,7 @@ public class SitesEntity {
*
* @param siteEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static boolean checkResourceIsZero(SitesEntity siteEntity) {
@@ -269,7 +269,7 @@ public class SitesEntity {
*
* @param siteEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static boolean checkResource(SitesEntity siteEntity) {
String cpu = siteEntity.getTotalCPU();
@@ -294,7 +294,7 @@ public class SitesEntity {
* Format data.<br>
*
* @param siteEntity
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static void dataFramat(SitesEntity siteEntity) {
siteEntity.setTotalCPU(StringUtil.numFormat(siteEntity.getTotalCPU()));
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VimEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VimEntity.java
index 85bccc2..13be332 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VimEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VimEntity.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 Huawei Technologies Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,13 +22,12 @@ import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
import net.sf.json.JSONObject;
/**
- *
* Virtualised infrastructure manager entity class.<br>
* <p>
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class VimEntity {
@@ -61,7 +60,7 @@ public class VimEntity {
* value of the database column vim.ID
*
* @param id
- * the value for vim.ID
+ * the value for vim.ID
*/
public void setId(String id) {
this.id = id == null ? null : id.trim();
@@ -76,12 +75,11 @@ public class VimEntity {
}
/**
- *
* To Entity.<br>
*
* @param jsonObject
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static VimEntity toEntity(JSONObject jsonObject) {
VimEntity vimEntity = new VimEntity();
@@ -91,12 +89,12 @@ public class VimEntity {
}
/**
- *
* To String.<br>
*
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
+ @Override
public String toString() {
JSONObject resJson = new JSONObject();
resJson.put("id", StringUtils.trimToEmpty(this.getId()));
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VirtualLinkEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VirtualLinkEntity.java
index 5c7c137..340a9be 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VirtualLinkEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VirtualLinkEntity.java
@@ -234,7 +234,7 @@ public class VirtualLinkEntity implements Serializable {
*
* @param jsonObject
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static VirtualLinkEntity toEntity(JSONObject jsonObject) {
VirtualLinkEntity virtualLinkEntity = new VirtualLinkEntity();
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfEntity.java
index f22db1f..88497fc 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfEntity.java
@@ -278,7 +278,7 @@ public class VnfEntity implements Serializable {
*
* @param jsonObject
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static VnfEntity toEntity(JSONObject jsonObject) {
VnfEntity vnfEntity = new VnfEntity();
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java
index 136b542..99ffe1a 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java
@@ -32,7 +32,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 29, 2016
+ * @version VFC 1.0 Oct 29, 2016
*/
public class GrantResServiceImpl implements GrantResService {
@@ -46,7 +46,7 @@ public class GrantResServiceImpl implements GrantResService {
* @param object
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public JSONObject grantResource(JSONObject object) throws ServiceException {
@@ -118,7 +118,7 @@ public class GrantResServiceImpl implements GrantResService {
*
* @param addResource
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
private JSONObject getGrantResource(JSONArray resource) {
int cpuNum = 0;
@@ -150,7 +150,7 @@ public class GrantResServiceImpl implements GrantResService {
*
* @param object
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
private JSONArray parseResource(JSONObject object, String key) {
JSONArray newResources = new JSONArray();
@@ -175,7 +175,7 @@ public class GrantResServiceImpl implements GrantResService {
*
* @param vimJson
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
private JSONObject parseVim(JSONObject vimJson) {
LOGGER.info("function=grantResource; vimJson: {}", vimJson.toString());
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java
index 989f5e4..66d87d9 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java
@@ -39,7 +39,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class IResourceAddServiceImpl {
@@ -51,7 +51,7 @@ public class IResourceAddServiceImpl {
* @param restParametes
* @param iResMap
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Transactional(rollbackFor = ServiceException.class)
public void addIRes(RestfulParametes restParametes, Map<String, InterfaceResManagement> iResMap)
@@ -88,7 +88,7 @@ public class IResourceAddServiceImpl {
* @param url
* @param iResName
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static void addHostResource(Map<String, InterfaceResManagement> iResMap, RestfulParametes restParametes,
String url, String iResName) throws ServiceException {
@@ -125,7 +125,7 @@ public class IResourceAddServiceImpl {
* @param hostObj
* @param hostName
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public static JSONObject hostDataParse(JSONObject hostObj, String hostName) {
LOGGER.warn("function=hostDataParse; hostObj={}, hostName={}", hostObj, hostName);
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceDelServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceDelServiceImpl.java
index ce16169..a0217ad 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceDelServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceDelServiceImpl.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class IResourceDelServiceImpl {
@@ -49,7 +49,7 @@ public class IResourceDelServiceImpl {
* @param vim
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public int deleteIRes(String vimId, Map<String, InterfaceResManagement> iResMap, Vim vim) throws ServiceException {
Map<String, Object> map = new HashMap<>(10);
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceUpdateServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceUpdateServiceImpl.java
index 02d0558..f8006c3 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceUpdateServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceUpdateServiceImpl.java
@@ -38,7 +38,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class IResourceUpdateServiceImpl {
@@ -52,7 +52,7 @@ public class IResourceUpdateServiceImpl {
* @param iResMap
* @param sites
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Transactional(rollbackFor = ServiceException.class)
public void updateIRes(String vimId, RestfulParametes restParametes, Map<String, InterfaceResManagement> iResMap)
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/ResOperateServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/ResOperateServiceImpl.java
index 56b3c2c..453c5cd 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/ResOperateServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/ResOperateServiceImpl.java
@@ -52,7 +52,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public class ResOperateServiceImpl implements ResOperateService {
@@ -187,7 +187,7 @@ public class ResOperateServiceImpl implements ResOperateService {
* Set iResource Add service implemtation.<br>
*
* @param iResourceAddServiceImpl
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public void setiResourceAddServiceImpl(IResourceAddServiceImpl iResourceAddServiceImpl) {
this.iResourceAddServiceImpl = iResourceAddServiceImpl;
@@ -197,7 +197,7 @@ public class ResOperateServiceImpl implements ResOperateService {
* Set iResource update service implementation.<br>
*
* @param iResourceUpdateServiceImpl
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public void setiResourceUpdateServiceImpl(IResourceUpdateServiceImpl iResourceUpdateServiceImpl) {
this.iResourceUpdateServiceImpl = iResourceUpdateServiceImpl;
@@ -207,7 +207,7 @@ public class ResOperateServiceImpl implements ResOperateService {
* Set iresource delete service implementation.<br>
*
* @param iResourceDelServiceImpl
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
public void setiResourceDelServiceImpl(IResourceDelServiceImpl iResourceDelServiceImpl) {
this.iResourceDelServiceImpl = iResourceDelServiceImpl;
@@ -218,7 +218,7 @@ public class ResOperateServiceImpl implements ResOperateService {
*
* @param string
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public void sendMsgMonitor(String operateType, String vimId) throws ServiceException {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VirtualLinkServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VirtualLinkServiceImpl.java
index 9efb312..838a45c 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VirtualLinkServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VirtualLinkServiceImpl.java
@@ -37,7 +37,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 27, 2016
+ * @version VFC 1.0 Oct 27, 2016
*/
public class VirtualLinkServiceImpl implements VirtualLinkService {
@@ -51,7 +51,7 @@ public class VirtualLinkServiceImpl implements VirtualLinkService {
* @param virtualLinkEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public JSONObject addVl(VirtualLinkEntity virtualLinkEntity) throws ServiceException {
@@ -81,7 +81,7 @@ public class VirtualLinkServiceImpl implements VirtualLinkService {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
private boolean checkId(String id) {
VirtualLinkEntity vl = virtualLinkDao.getVl(id);
@@ -97,7 +97,7 @@ public class VirtualLinkServiceImpl implements VirtualLinkService {
* @param map
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public List<VirtualLinkEntity> getList(Map<String, Object> map) throws ServiceException {
@@ -110,7 +110,7 @@ public class VirtualLinkServiceImpl implements VirtualLinkService {
* @param id
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int delete(String id) throws ServiceException {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VmServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VmServiceImpl.java
index a078369..5931ea6 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VmServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VmServiceImpl.java
@@ -42,7 +42,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 29, 2016
+ * @version VFC 1.0 Oct 29, 2016
*/
public class VmServiceImpl implements VmService {
@@ -56,7 +56,7 @@ public class VmServiceImpl implements VmService {
* @param vmEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public JSONObject addVm(VmEntity vmEntity) throws ServiceException {
@@ -87,7 +87,7 @@ public class VmServiceImpl implements VmService {
*
* @param vmId
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
private boolean checkId(String vmId) {
VmEntity vm = vmDao.getVm(vmId);
@@ -132,7 +132,7 @@ public class VmServiceImpl implements VmService {
* @param map
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public List<VmEntity> getList(Map<String, Object> map) throws ServiceException {
@@ -145,7 +145,7 @@ public class VmServiceImpl implements VmService {
* @param id
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int delete(String id) throws ServiceException {
@@ -161,7 +161,7 @@ public class VmServiceImpl implements VmService {
*
* @param vnfInstanceId
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int deleteByVnfId(String vnfInstanceId) throws ServiceException {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfInfoServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfInfoServiceImpl.java
index f87862b..dce3c25 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfInfoServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfInfoServiceImpl.java
@@ -37,7 +37,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 28, 2016
+ * @version VFC 1.0 Oct 28, 2016
*/
public class VnfInfoServiceImpl implements VnfInfoService {
@@ -53,7 +53,7 @@ public class VnfInfoServiceImpl implements VnfInfoService {
* @param object
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public JSONObject addVnfInfo(JSONObject object) throws ServiceException {
@@ -85,7 +85,7 @@ public class VnfInfoServiceImpl implements VnfInfoService {
*
* @param vnfInstanceId
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
private boolean checkId(String vnfInstanceId) {
VnfInfoEntity vnf = vnfInfoDao.getVnfInfo(vnfInstanceId);
@@ -100,7 +100,7 @@ public class VnfInfoServiceImpl implements VnfInfoService {
*
* @param object
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
private void saveVm(JSONObject object) throws ServiceException {
String vnfInstanceId = object.getString("vnfInstanceId");
@@ -119,7 +119,7 @@ public class VnfInfoServiceImpl implements VnfInfoService {
* @param map
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public List<VnfInfoEntity> getList(Map<String, Object> map) throws ServiceException {
@@ -132,7 +132,7 @@ public class VnfInfoServiceImpl implements VnfInfoService {
* @param id
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int delete(String id) throws ServiceException {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfServiceImpl.java
index 6f7c889..4bcdf04 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfServiceImpl.java
@@ -38,7 +38,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 28, 2016
+ * @version VFC 1.0 Oct 28, 2016
*/
public class VnfServiceImpl implements VnfService {
@@ -54,7 +54,7 @@ public class VnfServiceImpl implements VnfService {
* @param vnfEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public JSONObject addVnf(VnfEntity vnfEntity) throws ServiceException {
@@ -83,7 +83,7 @@ public class VnfServiceImpl implements VnfService {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
private boolean checkId(String id) {
VnfEntity vnf = vnfDao.getVnf(id);
@@ -99,7 +99,7 @@ public class VnfServiceImpl implements VnfService {
* @param map
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public List<VnfEntity> getList(Map<String, Object> map) throws ServiceException {
@@ -112,7 +112,7 @@ public class VnfServiceImpl implements VnfService {
* @param id
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int delete(String id) throws ServiceException {
@@ -125,7 +125,7 @@ public class VnfServiceImpl implements VnfService {
*
* @param id
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
private void deleteVnfInfo(String vnfInstanceId) throws ServiceException {
vnfInfoService.delete(vnfInstanceId);
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfStatusServiceImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfStatusServiceImpl.java
index 30d82fc..b445913 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfStatusServiceImpl.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfStatusServiceImpl.java
@@ -34,7 +34,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 29, 2016
+ * @version VFC 1.0 Oct 29, 2016
*/
public class VnfStatusServiceImpl implements VnfStatusService {
@@ -48,7 +48,7 @@ public class VnfStatusServiceImpl implements VnfStatusService {
* @param object
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public JSONObject addVnfStatus(JSONObject object) throws ServiceException {
@@ -75,7 +75,7 @@ public class VnfStatusServiceImpl implements VnfStatusService {
*
* @param vnfInstanceId
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
private boolean checkId(String vnfInstanceId) {
VnfStatusEntity vnfStatus = vnfStatusDao.getVnfStatus(vnfInstanceId);
@@ -91,7 +91,7 @@ public class VnfStatusServiceImpl implements VnfStatusService {
* @param map
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public List<VnfStatusEntity> getList(Map<String, Object> map) throws ServiceException {
@@ -104,7 +104,7 @@ public class VnfStatusServiceImpl implements VnfStatusService {
* @param id
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@Override
public int delete(String id) throws ServiceException {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/GrantResService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/GrantResService.java
index 92941a6..c48256e 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/GrantResService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/GrantResService.java
@@ -26,7 +26,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 29, 2016
+ * @version VFC 1.0 Oct 29, 2016
*/
public interface GrantResService {
@@ -35,7 +35,7 @@ public interface GrantResService {
*
* @param object
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
JSONObject grantResource(JSONObject object) throws ServiceException;
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/ResOperateService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/ResOperateService.java
index b4f9c06..007b6d1 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/ResOperateService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/ResOperateService.java
@@ -26,7 +26,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public interface ResOperateService {
@@ -37,7 +37,7 @@ public interface ResOperateService {
* @param vimId
* @param header
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
void updateIRes(String tenantId, String vimId, JSONObject header) throws ServiceException;
@@ -45,7 +45,7 @@ public interface ResOperateService {
* Update all iResource.<br>
*
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
void updateAllIRes() throws ServiceException;
@@ -56,7 +56,7 @@ public interface ResOperateService {
* @param vimId
* @param header
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
void addIRes(String tenantId, String vimId, JSONObject header) throws ServiceException;
@@ -66,7 +66,7 @@ public interface ResOperateService {
* @param vimId
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteIRes(String vimId) throws ServiceException;
@@ -76,7 +76,7 @@ public interface ResOperateService {
* @param operateType
* @param vimId
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
void sendMsgMonitor(String operateType, String vimId) throws ServiceException;
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VirtualLinkService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VirtualLinkService.java
index 2bec012..6b48090 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VirtualLinkService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VirtualLinkService.java
@@ -30,7 +30,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 27, 2016
+ * @version VFC 1.0 Oct 27, 2016
*/
public interface VirtualLinkService {
@@ -40,7 +40,7 @@ public interface VirtualLinkService {
* @param virtualLinkEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
JSONObject addVl(VirtualLinkEntity virtualLinkEntity) throws ServiceException;
@@ -49,7 +49,7 @@ public interface VirtualLinkService {
*
* @param map
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<VirtualLinkEntity> getList(Map<String, Object> map) throws ServiceException;
@@ -58,7 +58,7 @@ public interface VirtualLinkService {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int delete(String id) throws ServiceException;
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VmService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VmService.java
index 785a95f..1fe8660 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VmService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VmService.java
@@ -30,7 +30,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 29, 2016
+ * @version VFC 1.0 Oct 29, 2016
*/
public interface VmService {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfInfoService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfInfoService.java
index 3feadae..d1feded 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfInfoService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfInfoService.java
@@ -30,7 +30,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 28, 2016
+ * @version VFC 1.0 Oct 28, 2016
*/
public interface VnfInfoService {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfService.java
index c81d4e8..b72c98f 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfService.java
@@ -30,7 +30,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 28, 2016
+ * @version VFC 1.0 Oct 28, 2016
*/
public interface VnfService {
@@ -40,7 +40,7 @@ public interface VnfService {
* @param vnfEntity
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
JSONObject addVnf(VnfEntity vnfEntity) throws ServiceException;
@@ -50,7 +50,7 @@ public interface VnfService {
* @param map
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<VnfEntity> getList(Map<String, Object> map) throws ServiceException;
@@ -60,7 +60,7 @@ public interface VnfService {
* @param id
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int delete(String id) throws ServiceException;
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfStatusService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfStatusService.java
index 8ac4b62..57b99bf 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfStatusService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfStatusService.java
@@ -30,7 +30,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 29, 2016
+ * @version VFC 1.0 Oct 29, 2016
*/
public interface VnfStatusService {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/HostMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/HostMapper.java
index 6372c33..3785dfe 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/HostMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/HostMapper.java
@@ -27,7 +27,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
*/
public interface HostMapper {
@@ -36,7 +36,7 @@ public interface HostMapper {
*
* @param id
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
HostEntity getHost(String id);
@@ -45,7 +45,7 @@ public interface HostMapper {
*
* @param condition
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<HostEntity> getHosts(Map<String, Object> condition);
@@ -54,7 +54,7 @@ public interface HostMapper {
*
* @param id
* @return The delete result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteHost(String id);
@@ -63,7 +63,7 @@ public interface HostMapper {
*
* @param vimId
* @return The delete result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteHostByVimId(String vimId);
@@ -72,7 +72,7 @@ public interface HostMapper {
*
* @param hostEntity
* @return The add result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addHost(HostEntity hostEntity);
@@ -81,7 +81,7 @@ public interface HostMapper {
*
* @param hostEntity
* @return The add result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addHostSelective(HostEntity hostEntity);
@@ -90,7 +90,7 @@ public interface HostMapper {
*
* @param hostEntity
* @return The update result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateHostSelective(HostEntity hostEntity);
@@ -99,7 +99,7 @@ public interface HostMapper {
*
* @param hostEntity
* @return The update result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateHost(HostEntity hostEntity);
@@ -108,7 +108,7 @@ public interface HostMapper {
*
* @param hostEntity
* @return The update result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateHostByVimId(HostEntity hostEntity);
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/LocationMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/LocationMapper.java
index 4af0e3d..67abc34 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/LocationMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/LocationMapper.java
@@ -28,7 +28,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public interface LocationMapper {
@@ -38,7 +38,7 @@ public interface LocationMapper {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
LocationEntity getLocation(String id);
@@ -47,7 +47,7 @@ public interface LocationMapper {
* Get Country.<br>
*
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<String> getCountry();
@@ -57,7 +57,7 @@ public interface LocationMapper {
*
* @param condition
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<String> getLocationByCountry(Map<String, Object> condition);
@@ -67,7 +67,7 @@ public interface LocationMapper {
*
* @param condition
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<LocationEntity> getLocations(Map<String, Object> condition);
@@ -77,7 +77,7 @@ public interface LocationMapper {
*
* @param location
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteLocation(String location);
@@ -87,7 +87,7 @@ public interface LocationMapper {
*
* @param locationEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addLocation(LocationEntity locationEntity);
@@ -97,7 +97,7 @@ public interface LocationMapper {
*
* @param locationEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addLocationSelective(LocationEntity locationEntity);
@@ -107,7 +107,7 @@ public interface LocationMapper {
*
* @param locationEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateLocationSelective(LocationEntity locationEntity);
@@ -117,7 +117,7 @@ public interface LocationMapper {
*
* @param locationEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateLocation(LocationEntity locationEntity);
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/NetworkMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/NetworkMapper.java
index c18233d..4a3409e 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/NetworkMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/NetworkMapper.java
@@ -28,7 +28,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
public interface NetworkMapper {
@@ -38,7 +38,7 @@ public interface NetworkMapper {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
NetworkEntity getNetwork(String id);
@@ -48,7 +48,7 @@ public interface NetworkMapper {
*
* @param condition
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<NetworkEntity> getNetworks(Map<String, Object> condition);
@@ -58,7 +58,7 @@ public interface NetworkMapper {
*
* @param id
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteNetwork(String id);
@@ -68,7 +68,7 @@ public interface NetworkMapper {
*
* @param vimId
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteNetworkByVimId(String vimId);
@@ -78,7 +78,7 @@ public interface NetworkMapper {
*
* @param networkEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addNetwork(NetworkEntity networkEntity);
@@ -88,7 +88,7 @@ public interface NetworkMapper {
*
* @param networkEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addNetworkSelective(NetworkEntity networkEntity);
@@ -98,7 +98,7 @@ public interface NetworkMapper {
*
* @param networkEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateNetworkSelective(NetworkEntity networkEntity);
@@ -108,7 +108,7 @@ public interface NetworkMapper {
*
* @param networkEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateNetwork(NetworkEntity networkEntity);
@@ -118,7 +118,7 @@ public interface NetworkMapper {
*
* @param networkEntity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateNetworkByVimId(NetworkEntity networkEntity);
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/PortMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/PortMapper.java
index cff6e7f..3602e63 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/PortMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/PortMapper.java
@@ -27,7 +27,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
*/
public interface PortMapper {
@@ -36,7 +36,7 @@ public interface PortMapper {
*
* @param id
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
PortEntity getPort(String id);
@@ -45,7 +45,7 @@ public interface PortMapper {
*
* @param condition
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<PortEntity> getPorts(Map<String, Object> condition);
@@ -54,7 +54,7 @@ public interface PortMapper {
*
* @param id
* @return The delete result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deletePort(String id);
@@ -63,7 +63,7 @@ public interface PortMapper {
*
* @param vimId
* @return The delete result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deletePortByVimId(String vimId);
@@ -72,7 +72,7 @@ public interface PortMapper {
*
* @param portEntity
* @return The add result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addPort(PortEntity portEntity);
@@ -81,7 +81,7 @@ public interface PortMapper {
*
* @param portEntity
* @return The add result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addPortSelective(PortEntity portEntity);
@@ -90,7 +90,7 @@ public interface PortMapper {
*
* @param portEntity
* @return The update result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updatePortSelective(PortEntity portEntity);
@@ -99,7 +99,7 @@ public interface PortMapper {
*
* @param portEntity
* @return The update result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updatePort(PortEntity portEntity);
@@ -108,7 +108,7 @@ public interface PortMapper {
*
* @param portEntity
* @return The update result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updatePortByVimId(PortEntity portEntity);
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/SitesMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/SitesMapper.java
index e92f753..768f412 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/SitesMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/SitesMapper.java
@@ -27,7 +27,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
*/
public interface SitesMapper {
@@ -36,7 +36,7 @@ public interface SitesMapper {
*
* @param id
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
SitesEntity getSite(String id);
@@ -46,7 +46,7 @@ public interface SitesMapper {
*
* @param map
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<SitesEntity> getSites(Map<String, Object> map);
@@ -55,7 +55,7 @@ public interface SitesMapper {
*
* @param id
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteSite(String id);
@@ -65,7 +65,7 @@ public interface SitesMapper {
*
* @param entity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addSite(SitesEntity entity);
@@ -75,7 +75,7 @@ public interface SitesMapper {
*
* @param entity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addSiteSelective(SitesEntity entity);
@@ -85,7 +85,7 @@ public interface SitesMapper {
*
* @param entity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateSiteSelective(SitesEntity entity);
@@ -95,7 +95,7 @@ public interface SitesMapper {
*
* @param entity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateSite(SitesEntity entity);
@@ -105,7 +105,7 @@ public interface SitesMapper {
*
* @param entity
* @return
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int updateSiteByVimId(SitesEntity entity);
}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VimMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VimMapper.java
index 05fdfc2..bfb0640 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VimMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/VimMapper.java
@@ -26,7 +26,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
*/
public interface VimMapper {
@@ -35,7 +35,7 @@ public interface VimMapper {
*
* @param id
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
VimEntity getVim(String id);
@@ -43,7 +43,7 @@ public interface VimMapper {
* It is used to get Vims info.<br/>
*
* @return The get result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
List<VimEntity> getVims();
@@ -52,7 +52,7 @@ public interface VimMapper {
*
* @param id
* @return The delete result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int deleteVim(String id);
@@ -61,7 +61,7 @@ public interface VimMapper {
*
* @param vimEntity
* @return The add result
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
int addVim(VimEntity vimEntity);
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoa.java
index 1ed375d..19b4441 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoa.java
@@ -42,7 +42,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 29, 2016
+ * @version VFC 1.0 Oct 29, 2016
*/
@Path(UrlConstant.GRANTRES_URL)
@Produces(MediaType.APPLICATION_JSON)
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoa.java
index a00d25b..64a8113 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoa.java
@@ -54,7 +54,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
@Path(UrlConstant.HOST_URL)
@Produces(MediaType.APPLICATION_JSON)
@@ -72,7 +72,7 @@ public class HostRoa {
* @param context
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@GET
public JSONObject getHosts(@Context HttpServletRequest context) throws ServiceException {
@@ -92,7 +92,7 @@ public class HostRoa {
* @param id
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@GET
@Path("/{hostId}")
@@ -115,7 +115,7 @@ public class HostRoa {
* @param context
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@POST
public JSONObject addHost(@Context HttpServletRequest context) throws ServiceException {
@@ -139,7 +139,7 @@ public class HostRoa {
* @param id
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@DELETE
public JSONObject deleteHost(@Context HttpServletRequest context, @QueryParam(ParamConstant.PARAM_ID) String id)
@@ -161,7 +161,7 @@ public class HostRoa {
* @param context
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@PUT
public JSONObject updateHost(@Context HttpServletRequest context) throws ServiceException {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoa.java
index 6f6d97f..91d3dce 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoa.java
@@ -40,7 +40,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
@Path(UrlConstant.LIMITS_URL)
@Consumes(MediaType.APPLICATION_JSON)
@@ -58,7 +58,7 @@ public class LimitsRoa {
* @param vimId
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@GET
public JSONObject getLimits(@Context HttpServletRequest context,
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoa.java
index 745b487..f73726f 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoa.java
@@ -58,7 +58,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
@Path(UrlConstant.LOCATION_URL)
@Produces(MediaType.APPLICATION_JSON)
@@ -77,7 +77,7 @@ public class LocationRoa {
* @param context
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@GET
public JSONObject getLocationsbase(@Context HttpServletRequest context) throws ServiceException {
@@ -96,7 +96,7 @@ public class LocationRoa {
* @param id
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@GET
@Path("/{locationId}")
@@ -118,7 +118,7 @@ public class LocationRoa {
* @param context
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@GET
@Path("/country")
@@ -135,7 +135,7 @@ public class LocationRoa {
* @param country
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@GET
@Path("/locationbycountry")
@@ -155,7 +155,7 @@ public class LocationRoa {
* @param context
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@GET
@Path("/cloudservice")
@@ -172,7 +172,7 @@ public class LocationRoa {
* @param locations
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@GET
@Path("/site")
@@ -195,7 +195,7 @@ public class LocationRoa {
* @param context
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@POST
@Consumes(MediaType.APPLICATION_JSON)
@@ -220,7 +220,7 @@ public class LocationRoa {
* @param locations
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@DELETE
@Path("/{location}")
@@ -244,7 +244,7 @@ public class LocationRoa {
* @param context
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@DELETE
@Consumes(MediaType.APPLICATION_JSON)
@@ -278,7 +278,7 @@ public class LocationRoa {
* @param context
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@PUT
@Consumes(MediaType.APPLICATION_JSON)
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoa.java
index 1995c66..07834b5 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoa.java
@@ -54,7 +54,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
@Path(UrlConstant.NETWORKS_URL)
@Consumes({MediaType.APPLICATION_JSON})
@@ -72,7 +72,7 @@ public class NetworkRoa {
* @param context
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@GET
public JSONObject getNetworks(@Context HttpServletRequest context) throws ServiceException {
@@ -92,7 +92,7 @@ public class NetworkRoa {
* @param id
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@GET
@Path("/{networkId}")
@@ -115,7 +115,7 @@ public class NetworkRoa {
* @param context
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@POST
@Consumes({MediaType.APPLICATION_JSON})
@@ -141,7 +141,7 @@ public class NetworkRoa {
* @param id
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@DELETE
@Consumes({MediaType.APPLICATION_JSON})
@@ -165,7 +165,7 @@ public class NetworkRoa {
* @param context
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@PUT
@Consumes({MediaType.APPLICATION_JSON})
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoa.java
index 0f8f7b7..06d972d 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoa.java
@@ -54,7 +54,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
@Path(UrlConstant.PORT_URL)
@Produces(MediaType.APPLICATION_JSON)
@@ -72,7 +72,7 @@ public class PortRoa {
* @param context
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@GET
public JSONObject getPorts(@Context HttpServletRequest context) throws ServiceException {
@@ -92,7 +92,7 @@ public class PortRoa {
* @param id
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@GET
@Path("/{portId}")
@@ -115,7 +115,7 @@ public class PortRoa {
* @param context
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@POST
public JSONObject addPort(@Context HttpServletRequest context) throws ServiceException {
@@ -139,7 +139,7 @@ public class PortRoa {
* @param id
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@DELETE
public JSONObject deletePort(@Context HttpServletRequest context, @QueryParam(ParamConstant.PARAM_ID) String id)
@@ -161,7 +161,7 @@ public class PortRoa {
* @param context
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@PUT
public JSONObject updatePort(@Context HttpServletRequest context) throws ServiceException {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoa.java
index e1c2fa4..0c838d9 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoa.java
@@ -47,7 +47,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 10, 2016
+ * @version VFC 1.0 Sep 10, 2016
*/
@Path(UrlConstant.RESOPERATE_URL)
@Consumes(MediaType.APPLICATION_JSON)
@@ -66,7 +66,7 @@ public class ResOperateRoa {
* @param vimId
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@PUT
@Path(UrlConstant.MODRES_URL)
@@ -97,7 +97,7 @@ public class ResOperateRoa {
* @param vimId
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@POST
@Path(UrlConstant.ADDRES_URL)
@@ -126,7 +126,7 @@ public class ResOperateRoa {
* @param vimId
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@DELETE
@Consumes(MediaType.APPLICATION_JSON)
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoa.java
index 4892d8e..6613ac4 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoa.java
@@ -54,7 +54,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
*/
@Path(UrlConstant.SITES_URL)
@Consumes(MediaType.APPLICATION_JSON)
@@ -71,7 +71,7 @@ public class SitesRoa {
* @param context
* @return the get result
* @throws ServiceException When get failed.
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@GET
public JSONObject getSites(@Context HttpServletRequest context) throws ServiceException {
@@ -90,7 +90,7 @@ public class SitesRoa {
* @param id
* @return the get result
* @throws ServiceException When get failed.
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@GET
@Path("/{datacenterId}")
@@ -113,7 +113,7 @@ public class SitesRoa {
* @param id
* @return the add result
* @throws ServiceException When add failed.
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@POST
public JSONObject addSites(@Context HttpServletRequest context) throws ServiceException {
@@ -137,7 +137,7 @@ public class SitesRoa {
* @param id
* @return the delete result
* @throws ServiceException When delete failed.
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@DELETE
@Path("/{datacenterId}")
@@ -160,7 +160,7 @@ public class SitesRoa {
* @param id
* @return the update result
* @throws ServiceException When update failed.
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@PUT
public JSONObject updateSites(@Context HttpServletRequest context) throws ServiceException {
@@ -183,7 +183,7 @@ public class SitesRoa {
* @param context
* @return
* @throws ServiceException
- * @since NFVO 0.5
+ * @since VFC 1.0
*/
@PUT
@Path("/grant")
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoa.java
index 3651102..ac3fa4f 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoa.java
@@ -29,7 +29,7 @@ import org.apache.commons.io.IOUtils;
* Swagger API Doc.<br/>
*
* @author
- * @version NFVO 0.5 Oct 24, 2016
+ * @version VFC 1.0 Oct 24, 2016
*/
@Path("/v1")
@Produces({MediaType.APPLICATION_JSON})
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoa.java
index 7f470b4..0845687 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoa.java
@@ -52,7 +52,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 27, 2016
+ * @version VFC 1.0 Oct 27, 2016
*/
@Path(UrlConstant.VL_URL)
@Produces(MediaType.APPLICATION_JSON)
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoa.java
index 732c818..8de8fb7 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoa.java
@@ -52,7 +52,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 29, 2016
+ * @version VFC 1.0 Oct 29, 2016
*/
@Path(UrlConstant.VM_URL)
@Produces(MediaType.APPLICATION_JSON)
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoa.java
index 468f394..07992f4 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoa.java
@@ -52,7 +52,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 28, 2016
+ * @version VFC 1.0 Oct 28, 2016
*/
@Path(UrlConstant.VNFINFO_URL)
@Produces(MediaType.APPLICATION_JSON)
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoa.java
index e972992..ec9b3c6 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoa.java
@@ -52,7 +52,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 28, 2016
+ * @version VFC 1.0 Oct 28, 2016
*/
@Path(UrlConstant.VNF_URL)
@Produces(MediaType.APPLICATION_JSON)
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoa.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoa.java
index 763aa36..9ecf7a4 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoa.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoa.java
@@ -52,7 +52,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Oct 29, 2016
+ * @version VFC 1.0 Oct 29, 2016
*/
@Path(UrlConstant.VNFSTATUS_URL)
@Produces(MediaType.APPLICATION_JSON)
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessage.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessage.java
index 3ded1e0..f913072 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessage.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessage.java
@@ -22,7 +22,7 @@ import org.apache.http.HttpStatus;
* Exception response model.<br>
*
* @author
- * @version NFVO 0.5 Sep 27, 2016
+ * @version VFC 1.0 Sep 27, 2016
*/
public class ExceptionMessage {
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapper.java
index 4614d87..5e54770 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapper.java
@@ -26,7 +26,7 @@ import javax.ws.rs.ext.Provider;
*
*
* @author
- * @version NFVO 0.5 Sep 27, 2016
+ * @version VFC 1.0 Sep 27, 2016
*/
@Provider
public class GenericExceptionMapper implements ExceptionMapper<Exception>{
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapper.java
index c726255..6da40c6 100644
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapper.java
@@ -27,7 +27,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
* ServiceException response provider.<br>
*
* @author
- * @version NFVO 0.5 Sep 27, 2016
+ * @version VFC 1.0 Sep 27, 2016
*/
@Provider
public class ServiceExceptionMapper implements ExceptionMapper<ServiceException>{
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java
index 356da82..89e5574 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java
@@ -36,7 +36,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 24, 2016
+ * @version VFC 1.0 Sep 24, 2016
*/
public class ResmgrAdapter2MSBManagerTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java
index 0d0e24e..3ddaf26 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java
@@ -30,7 +30,7 @@ import mockit.MockUp;
* </p>
*
* @author
- * @version NFVO 0.5 Sep 24, 2016
+ * @version VFC 1.0 Sep 24, 2016
*/
public class ResmgrAdapterMgrServiceTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java
index b0095b2..e825afa 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java
@@ -41,7 +41,7 @@ import mockit.MockUp;
* </p>
*
* @author
- * @version NFVO 0.5 2016年8月16日
+ * @version VFC 1.0 2016年8月16日
*/
public class SitesBusinessImplTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java
index d5e8bdb..02854e5 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java
@@ -36,7 +36,7 @@ import mockit.MockUp;
* </p>
*
* @author
- * @version NFVO 0.5 2016年8月18日
+ * @version VFC 1.0 2016年8月18日
*/
public class VimBusinessImplTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java
index 7df1ee2..47ca5b2 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java
@@ -39,7 +39,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Mar 16, 2017
+ * @version VFC 1.0 Mar 16, 2017
*/
public class GrantResourseRoaTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.java
index e2c402a..dc0350f 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.java
@@ -44,7 +44,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
*/
public class HostRoaTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.java
index d92bd31..228ab22 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.java
@@ -38,7 +38,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
*/
public class LimitsRoaTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoaTest.java
index 05b80ec..fe34dcd 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoaTest.java
@@ -47,7 +47,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
*/
public class LocationRoaTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.java
index 13e6815..8e13d64 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.java
@@ -44,7 +44,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
*/
public class NetworkRoaTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.java
index 0feca60..f7bc0bb 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.java
@@ -44,7 +44,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
*/
public class PortRoaTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.java
index 4f4fb27..53bf6c2 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.java
@@ -40,7 +40,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Mar 16, 2017
+ * @version VFC 1.0 Mar 16, 2017
*/
public class ResOperateRoaTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.java
index 42e5592..f6b7850 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.java
@@ -29,10 +29,9 @@ import org.junit.Before;
import org.junit.Test;
import org.onap.vfc.nfvo.resmanagement.common.VimUtil;
import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
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.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
import org.springframework.mock.web.MockHttpServletRequest;
import mockit.Mock;
@@ -46,7 +45,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 2016年8月16日
+ * @version VFC 1.0 2016年8月16日
*/
public class SitesRoaTest {
@@ -145,7 +144,7 @@ public class SitesRoaTest {
};
JSONObject result = sitesRoa.deleteSites(null, "123");
JSONObject expectedResult = new JSONObject();
- expectedResult.put("msg", "org.openo.nfvo.resmanage.common.del.success");
+ expectedResult.put("msg", "delete success");
assertEquals(expectedResult.toString(), result.toString());
}
@@ -182,7 +181,7 @@ public class SitesRoaTest {
};
JSONObject result = sitesRoa.updateSites(null);
JSONObject expectedResult = new JSONObject();
- expectedResult.put("msg", "org.openo.nfvo.resmanage.common.update.success");
+ expectedResult.put("msg", "update success");
assertEquals(expectedResult.toString(), result.toString());
}
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoaTest.java
index eccc4d9..fb7a1fe 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoaTest.java
@@ -34,7 +34,7 @@ import mockit.MockUp;
* </p>
*
* @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
*/
public class SwaggerRoaTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java
index 23e2591..e791f31 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java
@@ -44,7 +44,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
*/
public class VirtualLinkRoaTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.java
index 8ecd1d5..de8e3ce 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.java
@@ -44,7 +44,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
*/
public class VmRoaTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java
index 5de4276..bf16a72 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java
@@ -44,7 +44,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
*/
public class VnfInfoRoaTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.java
index 216c0fc..d934e6e 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.java
@@ -44,7 +44,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Feb 10, 2017
+ * @version VFC 1.0 Feb 10, 2017
*/
public class VnfRoaTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java
index 4d8cbca..f8a5ec0 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java
@@ -44,7 +44,7 @@ import net.sf.json.JSONObject;
* </p>
*
* @author
- * @version NFVO 0.5 Feb 10, 2017
+ * @version VFC 1.0 Feb 10, 2017
*/
public class VnfStatusRoaTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessageTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessageTest.java
index c3a3c33..680ec03 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessageTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessageTest.java
@@ -28,7 +28,7 @@ import org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper.ExceptionMes
* </p>
*
* @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
*/
public class ExceptionMessageTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapperTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapperTest.java
index e6b4916..b2be916 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapperTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapperTest.java
@@ -29,7 +29,7 @@ import org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper.GenericExcep
* </p>
*
* @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
*/
public class GenericExceptionMapperTest {
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java
index dd2bc29..dbe78e3 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java
@@ -30,7 +30,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
* </p>
*
* @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
*/
public class ServiceExceptionMapperTest {