Update vfc svnfm driver pom 53/7153/3
authorvictor.gao <victor.gao@huawei.com>
Thu, 17 Aug 2017 14:39:16 +0000 (22:39 +0800)
committervictor.gao <victor.gao@huawei.com>
Thu, 17 Aug 2017 14:39:16 +0000 (22:39 +0800)
Update groupid and re-trigger vnfm driver build job

Change-Id: Ib5d52c98eb03d357636a2ba7b9fa5121ed1d0525
Issue-Id:VFC-81
Signed-off-by: victor.gao <victor.gao@huawei.com>
96 files changed:
huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml
huawei/vnfmadapter/VnfmadapterService/pom.xml
huawei/vnfmadapter/VnfmadapterService/service/pom.xml
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/AsyncCallback.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/AsyncCallback.java with 96% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/DownloadCsarManager.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/DownloadCsarManager.java with 98% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/RegisterConfigInfo.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/RegisterConfigInfo.java with 97% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtil.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/ResultRequestUtil.java with 95% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmException.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/VnfmException.java with 96% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmJsonUtil.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/VnfmJsonUtil.java with 97% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmUtil.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/VnfmUtil.java with 90% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/HttpRestfulHelp.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/servicetoken/HttpRestfulHelp.java with 96% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VNFRestfulUtil.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/servicetoken/VNFRestfulUtil.java with 98% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VnfmRestfulUtil.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/servicetoken/VnfmRestfulUtil.java with 98% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmService2DriverMgr.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/activator/RoaVnfmService2DriverMgr.java with 91% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmServicePostProcessor.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/activator/RoaVnfmServicePostProcessor.java with 91% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManager.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/AdapterResourceManager.java with 97% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/Driver2MSBManager.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/Driver2MSBManager.java with 93% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManager.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManager.java with 93% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/inf/IDriver2MSBManager.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/inf/IDriver2MSBManager.java with 94% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/inf/IResourceManager.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/inf/IResourceManager.java with 96% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/inf/IVnfmAdapter2DriverManager.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/inf/IVnfmAdapter2DriverManager.java with 94% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/api/internalsvc/impl/VnfmAdapter2DriverMgrService.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/api/internalsvc/impl/VnfmAdapter2DriverMgrService.java with 91% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/api/internalsvc/impl/VnfmAdapterMgrService.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/api/internalsvc/impl/VnfmAdapterMgrService.java with 91% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/api/internalsvc/inf/IVnfmAdapter2DriverMgrService.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/api/internalsvc/inf/IVnfmAdapter2DriverMgrService.java with 92% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/api/internalsvc/inf/IVnfmAdapterMgrService.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/api/internalsvc/inf/IVnfmAdapterMgrService.java with 91% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/Constant.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/constant/Constant.java with 98% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/ParamConstants.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/constant/ParamConstants.java with 98% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/UrlConstant.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/constant/UrlConstant.java with 96% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/api/ConnectInfo.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/api/ConnectInfo.java with 95% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/AbstractSslContext.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/AbstractSslContext.java with 97% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/ConnectMgrVnfm.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/ConnectMgrVnfm.java with 93% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/HttpRequests.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/HttpRequests.java with 98% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslAnonymousSocket.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslAnonymousSocket.java with 95% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslCertificateSocket.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslCertificateSocket.java with 95% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslProtocolSocketFactory.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslProtocolSocketFactory.java with 93% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/inf/InterfaceConnectMgr.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/inf/InterfaceConnectMgr.java with 88% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/inf/InterfaceVnfMgr.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/inf/InterfaceVnfMgr.java with 96% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java with 96% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/impl/VnfmDaoImpl.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/dao/impl/VnfmDaoImpl.java with 82% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/inf/AbstractDao.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/dao/inf/AbstractDao.java with 95% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/inf/VnfmDao.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/dao/inf/VnfmDao.java with 93% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/entity/Vnfm.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/entity/Vnfm.java with 97% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/mapper/VnfmMapper.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/mapper/VnfmMapper.java with 92% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgr.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/process/AuthMgr.java with 93% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/RegisterMgr.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/process/RegisterMgr.java with 89% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgr.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/process/VnfMgr.java with 95% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfResourceMgr.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/process/VnfResourceMgr.java with 96% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoa.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/AuthRoa.java with 92% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/SwaggerRoa.java with 95% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoa.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/VnfAdapterResourceRoa.java with 92% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfResourceRoa.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/VnfResourceRoa.java with 91% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/VnfRoa.java with 97% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/ExceptionMessage.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/ExceptionMessage.java with 94% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/GenericExceptionMapper.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/GenericExceptionMapper.java with 94% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapper.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapper.java with 94% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/mybatis/mysql/vnfmadapter.xml
huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/services.xml
huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/svc_register.xml
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/DownloadCsarManagerTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/DownloadCsarManagerTest.java with 92% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/FileUtil.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/FileUtil.java with 96% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtilTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/ResultRequestUtilTest.java with 89% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmUtilTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/VnfmUtilTest.java with 94% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/HttpRestfulHelpTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/servicetoken/HttpRestfulHelpTest.java with 88% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VNFRestfulUtilTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/servicetoken/VNFRestfulUtilTest.java with 98% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VnfmRestfulUtilTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/servicetoken/VnfmRestfulUtilTest.java with 97% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmServicePostProcessorTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/activator/RoaVnfmServicePostProcessorTest.java with 87% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/TestRoaVnfmService2DriverMgr.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/activator/TestRoaVnfmService2DriverMgr.java with 86% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManagerTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/AdapterResourceManagerTest.java with 96% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/Driver2MSBManagerTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/Driver2MSBManagerTest.java with 96% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java with 96% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapter2DriverMgrServiceTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapter2DriverMgrServiceTest.java with 88% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapterMgrServiceTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapterMgrServiceTest.java with 82% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/TestConstant.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/constant/TestConstant.java with 77% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/api/ConnectInfoTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/api/ConnectInfoTest.java with 95% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/AbstractSslContextTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/AbstractSslContextTest.java with 89% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/HttpRequestsTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/HttpRequestsTest.java with 92% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslAnonymousSocketTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslAnonymousSocketTest.java with 92% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslCertificateSocketTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslCertificateSocketTest.java with 91% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslProtocolSocketFactoryTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslProtocolSocketFactoryTest.java with 86% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfmTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/vnf/VnfMgrVnfmTest.java with 97% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/impl/VnfmDaoImplTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/dao/impl/VnfmDaoImplTest.java with 88% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/entity/VnfmTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/entity/VnfmTest.java with 93% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgrTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/process/AuthMgrTest.java with 86% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/RegisterMgrTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/process/RegisterMgrTest.java with 88% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgrTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/process/VnfMgrTest.java with 95% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfResourceMgrTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/process/VnfResourceMgrTest.java with 98% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoaTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/AuthRoaTest.java with 95% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoaTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/SwaggerRoaTest.java with 88% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoaTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/VnfAdapterResourceRoaTest.java with 85% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfResourceRoaTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/VnfResourceRoaTest.java with 95% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoaTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/VnfRoaTest.java with 98% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/ExceptionMessageTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/ExceptionMessageTest.java with 91% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/GenericExceptionMapperTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/GenericExceptionMapperTest.java with 85% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapperTest.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapperTest.java with 86% similarity]
huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/testutils/JsonUtil.java [moved from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/testutils/JsonUtil.java with 96% similarity]
huawei/vnfmadapter/pom.xml

index 27bfbf3..f08b641 100644 (file)
@@ -17,9 +17,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openo.nfvo</groupId>
+        <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
         <artifactId>vnfmadapter-service-root</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>hw-vnfmadapter-deployment</artifactId>
index e2222f6..abcf568 100644 (file)
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>vnfmadapter</artifactId>
-        <groupId>org.openo.nfvo</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>vnfmadapter-service-root</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <name>nfvo/drivers/vnfm/svnfm/huawei/vnfmadapter/VnfmadapterService</name>
     <packaging>pom</packaging>
 
index 8fc9f51..c4f1878 100644 (file)
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openo.nfvo</groupId>
+        <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
         <artifactId>vnfmadapter-service-root</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>vnfmadapter-service</artifactId>
     <name>nfvo/drivers/vnfm/svnfm/huawei/vnfmadapter/VnfmadapterService/service</name>
     <packaging>war</packaging>
 
-    <dependencies>
+    <repositories>
+        <repository>
+            <id>open-o</id>
+            <name>OPEN-O repository</name>
+            <url>https://nexus.open-o.org/content/repositories/public/</url>
+        </repository>
+    </repositories>
+    
+<dependencies>
     <dependency>
   <groupId>org.powermock</groupId>
   <artifactId>powermock-core</artifactId>
         <dependency>
             <groupId>org.openo.common-services.common-utilities</groupId>
             <artifactId>commonlib-cbb</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>2.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.openo.common-services.common-utilities</groupId>
             <artifactId>commonlib-restclient</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>2.0.0</version>
         </dependency>
         <dependency>
                <groupId>org.mybatis</groupId>
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.common;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -37,7 +37,7 @@ import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.common;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common;
 
 import java.io.IOException;
 import java.lang.invoke.MethodHandle;
@@ -22,10 +22,10 @@ import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 
 import org.apache.commons.httpclient.HttpMethod;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
-import org.openo.nfvo.vnfmadapter.service.constant.ParamConstants;
-import org.openo.nfvo.vnfmadapter.service.csm.connect.ConnectMgrVnfm;
-import org.openo.nfvo.vnfmadapter.service.csm.connect.HttpRequests;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.ParamConstants;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect.ConnectMgrVnfm;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect.HttpRequests;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.common;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common;
 
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken.VnfmRestfulUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.ParamConstants;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
-import org.openo.nfvo.vnfmadapter.common.servicetoken.VnfmRestfulUtil;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
-import org.openo.nfvo.vnfmadapter.service.constant.ParamConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.common.servicetoken;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -22,6 +22,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmException;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.openo.baseservice.roa.util.restclient.Restful;
 import org.openo.baseservice.roa.util.restclient.RestfulAsyncCallback;
@@ -29,8 +31,6 @@ import org.openo.baseservice.roa.util.restclient.RestfulFactory;
 import org.openo.baseservice.roa.util.restclient.RestfulOptions;
 import org.openo.baseservice.roa.util.restclient.RestfulParametes;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
-import org.openo.nfvo.vnfmadapter.common.VnfmException;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.common.servicetoken;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -22,6 +22,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmException;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.openo.baseservice.roa.util.restclient.Restful;
 import org.openo.baseservice.roa.util.restclient.RestfulAsyncCallback;
@@ -29,8 +31,6 @@ import org.openo.baseservice.roa.util.restclient.RestfulFactory;
 import org.openo.baseservice.roa.util.restclient.RestfulOptions;
 import org.openo.baseservice.roa.util.restclient.RestfulParametes;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
-import org.openo.nfvo.vnfmadapter.common.VnfmException;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.activator;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.activator;
 
-import org.openo.nfvo.vnfmadapter.service.api.internalsvc.inf.IVnfmAdapter2DriverMgrService;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.inf.IVnfmAdapter2DriverMgrService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.adapter.impl;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.impl;
 
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
@@ -26,16 +26,16 @@ import java.util.Map;
 
 import org.apache.commons.httpclient.HttpMethod;
 import org.apache.commons.httpclient.HttpStatus;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.DownloadCsarManager;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmException;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken.VNFRestfulUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.inf.IResourceManager;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.UrlConstant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect.ConnectMgrVnfm;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect.HttpRequests;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
 import org.openo.baseservice.util.impl.SystemEnvVariablesFactory;
-import org.openo.nfvo.vnfmadapter.common.DownloadCsarManager;
-import org.openo.nfvo.vnfmadapter.common.VnfmException;
-import org.openo.nfvo.vnfmadapter.common.servicetoken.VNFRestfulUtil;
-import org.openo.nfvo.vnfmadapter.service.adapter.inf.IResourceManager;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
-import org.openo.nfvo.vnfmadapter.service.constant.UrlConstant;
-import org.openo.nfvo.vnfmadapter.service.csm.connect.ConnectMgrVnfm;
-import org.openo.nfvo.vnfmadapter.service.csm.connect.HttpRequests;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.adapter.impl;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.impl;
 
 import java.util.Map;
 
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken.VNFRestfulUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.inf.IDriver2MSBManager;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
-import org.openo.nfvo.vnfmadapter.common.servicetoken.VNFRestfulUtil;
-import org.openo.nfvo.vnfmadapter.service.adapter.inf.IDriver2MSBManager;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.adapter.impl;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.impl;
 
 import java.util.Map;
 
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken.VNFRestfulUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.inf.IVnfmAdapter2DriverManager;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
-import org.openo.nfvo.vnfmadapter.common.servicetoken.VNFRestfulUtil;
-import org.openo.nfvo.vnfmadapter.service.adapter.inf.IVnfmAdapter2DriverManager;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.api.internalsvc.impl;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.impl;
 
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
@@ -25,12 +25,12 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Executors;
 
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.impl.VnfmAdapter2DriverManager;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.inf.IVnfmAdapter2DriverManager;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.inf.IVnfmAdapter2DriverMgrService;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.UrlConstant;
 import org.openo.baseservice.util.impl.SystemEnvVariablesFactory;
-import org.openo.nfvo.vnfmadapter.service.adapter.impl.VnfmAdapter2DriverManager;
-import org.openo.nfvo.vnfmadapter.service.adapter.inf.IVnfmAdapter2DriverManager;
-import org.openo.nfvo.vnfmadapter.service.api.internalsvc.inf.IVnfmAdapter2DriverMgrService;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
-import org.openo.nfvo.vnfmadapter.service.constant.UrlConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.api.internalsvc.impl;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.impl;
 
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
@@ -25,12 +25,12 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Executors;
 
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.impl.Driver2MSBManager;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.inf.IDriver2MSBManager;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.inf.IVnfmAdapterMgrService;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.UrlConstant;
 import org.openo.baseservice.util.impl.SystemEnvVariablesFactory;
-import org.openo.nfvo.vnfmadapter.service.adapter.impl.Driver2MSBManager;
-import org.openo.nfvo.vnfmadapter.service.adapter.inf.IDriver2MSBManager;
-import org.openo.nfvo.vnfmadapter.service.api.internalsvc.inf.IVnfmAdapterMgrService;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
-import org.openo.nfvo.vnfmadapter.service.constant.UrlConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.vnfmadapter.service.csm.api;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.api;
 
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
 
 /**
  * Connection Information
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.csm.connect;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect;
 
 import net.sf.json.JSONObject;
 import org.apache.http.conn.ssl.SSLContextBuilder;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
 import org.openo.baseservice.util.impl.SystemEnvVariablesFactory;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpRequest;
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.csm.connect;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect;
 
 import java.io.IOException;
 
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpMethod;
 import org.apache.commons.httpclient.HttpStatus;
-import org.openo.nfvo.vnfmadapter.common.VnfmException;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
-import org.openo.nfvo.vnfmadapter.service.constant.ParamConstants;
-import org.openo.nfvo.vnfmadapter.service.csm.api.ConnectInfo;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmException;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.ParamConstants;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.api.ConnectInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.csm.connect;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -35,8 +35,8 @@ import org.apache.commons.httpclient.methods.PutMethod;
 import org.apache.commons.httpclient.methods.StringRequestEntity;
 import org.apache.commons.httpclient.protocol.Protocol;
 import org.apache.commons.lang.StringUtils;
-import org.openo.nfvo.vnfmadapter.common.VnfmException;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmException;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpRequest;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.csm.connect;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -27,7 +27,7 @@ import org.apache.commons.httpclient.ConnectTimeoutException;
 import org.apache.commons.httpclient.params.HttpConnectionParams;
 import org.apache.commons.httpclient.protocol.ControllerThreadSocketFactory;
 import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
-import org.openo.nfvo.vnfmadapter.common.VnfmException;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.vnfmadapter.service.csm.connect;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect;
 
 import org.apache.commons.httpclient.ConnectTimeoutException;
 import org.apache.commons.httpclient.params.HttpConnectionParams;
 import org.apache.commons.httpclient.protocol.ControllerThreadSocketFactory;
 import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
-import org.openo.nfvo.vnfmadapter.common.VnfmException;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.csm.connect;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
-import org.openo.nfvo.vnfmadapter.common.VnfmException;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmException;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.csm.vnf;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.vnf;
 
 import net.sf.json.JSONArray;
-import org.openo.nfvo.vnfmadapter.common.ResultRequestUtil;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
-import org.openo.nfvo.vnfmadapter.service.constant.ParamConstants;
-import org.openo.nfvo.vnfmadapter.service.csm.inf.InterfaceVnfMgr;
+
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.ResultRequestUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.ParamConstants;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.inf.InterfaceVnfMgr;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.dao.impl;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.dao.impl;
 
 import java.util.List;
 
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.dao.inf.AbstractDao;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.dao.inf.VnfmDao;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.entity.Vnfm;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.mapper.VnfmMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.nfvo.vnfmadapter.service.dao.inf.AbstractDao;
-import org.openo.nfvo.vnfmadapter.service.dao.inf.VnfmDao;
-import org.openo.nfvo.vnfmadapter.service.entity.Vnfm;
-import org.openo.nfvo.vnfmadapter.service.mapper.VnfmMapper;
 
 /**
  * VNFM DAO
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.dao.inf;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.dao.inf;
 
 import java.util.List;
 
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.entity.Vnfm;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.nfvo.vnfmadapter.service.entity.Vnfm;
 
 /**
  * VNFM DAO
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.mapper;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.mapper;
 
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
-import org.openo.nfvo.vnfmadapter.service.entity.Vnfm;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.entity.Vnfm;
 
 /**
  * VNFM mapper.</br>
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.process;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.RegisterConfigInfo;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken.VnfmRestfulUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.ParamConstants;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
-import org.openo.nfvo.vnfmadapter.common.RegisterConfigInfo;
-import org.openo.nfvo.vnfmadapter.common.servicetoken.VnfmRestfulUtil;
-import org.openo.nfvo.vnfmadapter.service.constant.ParamConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.process;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.impl.AdapterResourceManager;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.vnf.VnfMgrVnfm;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.dao.inf.VnfmDao;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.entity.Vnfm;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.nfvo.vnfmadapter.common.VnfmUtil;
-import org.openo.nfvo.vnfmadapter.service.adapter.impl.AdapterResourceManager;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
-import org.openo.nfvo.vnfmadapter.service.csm.vnf.VnfMgrVnfm;
-import org.openo.nfvo.vnfmadapter.service.dao.inf.VnfmDao;
-import org.openo.nfvo.vnfmadapter.service.entity.Vnfm;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.process;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken.VnfmRestfulUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.ParamConstants;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
-import org.openo.nfvo.vnfmadapter.common.servicetoken.VnfmRestfulUtil;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
-import org.openo.nfvo.vnfmadapter.service.constant.ParamConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.rest;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -30,10 +30,10 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.openo.nfvo.vnfmadapter.common.VnfmJsonUtil;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
-import org.openo.nfvo.vnfmadapter.service.constant.ParamConstants;
-import org.openo.nfvo.vnfmadapter.service.process.AuthMgr;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmJsonUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.ParamConstants;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.AuthMgr;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.rest;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
@@ -24,7 +24,7 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import org.openo.nfvo.vnfmadapter.service.adapter.impl.AdapterResourceManager;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.impl.AdapterResourceManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.rest;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
@@ -25,9 +25,9 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import org.openo.nfvo.vnfmadapter.common.VnfmJsonUtil;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
-import org.openo.nfvo.vnfmadapter.service.process.VnfResourceMgr;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmJsonUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.VnfResourceMgr;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.rest;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -33,10 +33,10 @@ import javax.ws.rs.core.MediaType;
 
 import org.apache.commons.collections.map.UnmodifiableMap;
 import org.apache.commons.lang3.StringUtils;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmJsonUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.VnfMgr;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.nfvo.vnfmadapter.common.VnfmJsonUtil;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
-import org.openo.nfvo.vnfmadapter.service.process.VnfMgr;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index d9b7295..35c8686 100644 (file)
@@ -15,8 +15,8 @@
     limitations under the License.
  -->
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.openo.nfvo.vnfmadapter.service.mapper.VnfmMapper">
-    <resultMap type="org.openo.nfvo.vnfmadapter.service.entity.Vnfm"
+<mapper namespace="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.mapper.VnfmMapper">
+    <resultMap type="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.entity.Vnfm"
         id="VnfmResultMap">
         <result property="id" javaType="String" column="ID" jdbcType="VARCHAR" />
         <result property="version" javaType="String" column="VERSION" jdbcType="VARCHAR" />
         ID, VERSION, VNFDID, VNFPACKAGEID
     </sql>
 
-    <insert id="insertVnfm" parameterType="org.openo.nfvo.vnfmadapter.service.entity.Vnfm">
+    <insert id="insertVnfm" parameterType="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.entity.Vnfm">
         INSERT INTO VNFM (ID, VERSION, VNFDID, VNFPACKAGEID)
         VALUES(#{id},#{version},#{vnfdId},#{vnfPackageId})
     </insert>
 
-    <update id="updateVnfm" parameterType="org.openo.nfvo.vnfmadapter.service.entity.Vnfm">
+    <update id="updateVnfm" parameterType="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.entity.Vnfm">
         UPDATE VNFM
         <set>
             <if test="id != null">
@@ -70,7 +70,7 @@
         SELECT COUNT(*) FROM VNFM
     </select>
 
-    <select id="getVnfmById" parameterType="java.lang.String" resultType="org.openo.nfvo.vnfmadapter.service.entity.Vnfm">
+    <select id="getVnfmById" parameterType="java.lang.String" resultType="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.entity.Vnfm">
         SELECT * FROM VNFM
         WHERE id = #{id}
     </select>
index fb73cd4..5824074 100644 (file)
     </bean>
 
     <bean id="vnfmDao"
-        class="org.openo.nfvo.vnfmadapter.service.dao.impl.VnfmDaoImpl">
+        class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.dao.impl.VnfmDaoImpl">
         <property name="session" ref="session"></property>
     </bean>
 
-    <bean id="vnfMgr" class="org.openo.nfvo.vnfmadapter.service.process.VnfMgr">
+    <bean id="vnfMgr" class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.VnfMgr">
         <property name="vnfmDao" ref="vnfmDao"></property>
     </bean>
 
-    <bean id="VnfRoa" class="org.openo.nfvo.vnfmadapter.service.rest.VnfRoa">
+    <bean id="VnfRoa" class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.VnfRoa">
         <property name="vnfMgr" ref="vnfMgr"></property>
     </bean>
 
     <bean id="vnfResourceMgr"
-        class="org.openo.nfvo.vnfmadapter.service.process.VnfResourceMgr">
+        class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.VnfResourceMgr">
     </bean>
 
-    <bean id="VnfResourceRoa" class="org.openo.nfvo.vnfmadapter.service.rest.VnfResourceRoa">
+    <bean id="VnfResourceRoa" class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.VnfResourceRoa">
         <property name="vnfResourceMgr" ref="vnfResourceMgr"></property>
     </bean>
 
-    <bean id="authMgr" class="org.openo.nfvo.vnfmadapter.service.process.AuthMgr" />
+    <bean id="authMgr" class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.AuthMgr" />
 
-    <bean id="AuthRoa" class="org.openo.nfvo.vnfmadapter.service.rest.AuthRoa">
+    <bean id="AuthRoa" class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.AuthRoa">
         <property name="authMgr" ref="authMgr"></property>
     </bean>
 
-    <bean id="VnfAdaResRoa" class="org.openo.nfvo.vnfmadapter.service.rest.VnfAdapterResourceRoa">
+    <bean id="VnfAdaResRoa" class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.VnfAdapterResourceRoa">
     </bean>
 
-    <bean id="SwaggerRoa" class="org.openo.nfvo.vnfmadapter.service.rest.SwaggerRoa"></bean>
+    <bean id="SwaggerRoa" class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.SwaggerRoa"></bean>
 
-    <!-- bean id="registerMgr" class="org.openo.nfvo.vnfmadapter.service.process.RegisterMgr"
+    <!-- bean id="registerMgr" class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.RegisterMgr"
         init-method="register" destroy-method="unRegister">
     </bean-->
 
         </jaxrs:serviceBeans>
         <jaxrs:providers>
             <ref bean="jsonProvider" />
-            <bean class="org.openo.nfvo.vnfmadapter.service.rest.exceptionmapper.ServiceExceptionMapper" />
-            <bean class="org.openo.nfvo.vnfmadapter.service.rest.exceptionmapper.GenericExceptionMapper" />
+            <bean class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.exceptionmapper.ServiceExceptionMapper" />
+            <bean class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.exceptionmapper.GenericExceptionMapper" />
         </jaxrs:providers>
     </jaxrs:server>
 </beans>
index 8fa5e0d..1635b67 100644 (file)
@@ -36,8 +36,8 @@
     http://cxf.apache.org/schemas/configuration/http-conf.xsd
     http://www.springframework.org/schema/aop
     http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
-    <bean class="org.openo.nfvo.vnfmadapter.service.activator.RoaVnfmServicePostProcessor"></bean>
-    <bean class="org.openo.nfvo.vnfmadapter.service.api.internalsvc.impl.VnfmAdapterMgrService"></bean>
-    <bean class="org.openo.nfvo.vnfmadapter.service.activator.RoaVnfmService2DriverMgr"></bean>
-    <bean class="org.openo.nfvo.vnfmadapter.service.api.internalsvc.impl.VnfmAdapter2DriverMgrService"></bean>
+    <bean class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.activator.RoaVnfmServicePostProcessor"></bean>
+    <bean class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.impl.VnfmAdapterMgrService"></bean>
+    <bean class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.activator.RoaVnfmService2DriverMgr"></bean>
+    <bean class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.impl.VnfmAdapter2DriverMgrService"></bean>
 </beans>
\ No newline at end of file
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.vnfmadapter.common;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.ProtocolVersion;
@@ -21,6 +21,8 @@ import org.apache.http.StatusLine;
 import org.apache.http.message.BasicHttpResponse;
 import org.apache.http.message.BasicStatusLine;
 import org.junit.Test;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.DownloadCsarManager;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmJsonUtil;
 import org.springframework.mock.web.MockHttpServletRequest;
 
 import javax.servlet.http.HttpServletRequest;
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.common;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.openo.nfvo.vnfmadapter.service.csm.connect.ConnectMgrVnfm;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.ResultRequestUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect.ConnectMgrVnfm;
 
 import mockit.Mock;
 import mockit.MockUp;
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.common;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken.VnfmRestfulUtil;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
-import org.openo.nfvo.vnfmadapter.common.servicetoken.VnfmRestfulUtil;
 
 import mockit.Mock;
 import mockit.MockUp;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.common.servicetoken;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -25,8 +25,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken.VNFRestfulUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.testutils.JsonUtil;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
-import org.openo.nfvo.vnfmadapter.testutils.JsonUtil;
 
 import mockit.Mock;
 import mockit.MockUp;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.common.servicetoken;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -24,8 +24,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken.VnfmRestfulUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
 
 import mockit.Mock;
 import mockit.MockUp;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.vnfmadapter.service.activator;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.activator;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openo.nfvo.vnfmadapter.service.api.internalsvc.impl.VnfmAdapterMgrService;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.activator.RoaVnfmServicePostProcessor;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.impl.VnfmAdapterMgrService;
 
 /**
  * Created by QuanZhong on 2017/3/17.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.vnfmadapter.service.activator;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.activator;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openo.nfvo.vnfmadapter.service.api.internalsvc.impl.VnfmAdapter2DriverMgrService;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.activator.RoaVnfmService2DriverMgr;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.impl.VnfmAdapter2DriverMgrService;
 
 /**
  * Created by QuanZhong on 2017/3/17.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.adapter.impl;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -25,10 +25,11 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.DownloadCsarManager;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken.VNFRestfulUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.impl.AdapterResourceManager;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.testutils.JsonUtil;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
-import org.openo.nfvo.vnfmadapter.common.DownloadCsarManager;
-import org.openo.nfvo.vnfmadapter.common.servicetoken.VNFRestfulUtil;
-import org.openo.nfvo.vnfmadapter.testutils.JsonUtil;
 
 import mockit.Mock;
 import mockit.MockUp;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.adapter.impl;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.impl;
 
 import static org.junit.Assert.assertTrue;
 
@@ -24,9 +24,10 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken.VNFRestfulUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.impl.Driver2MSBManager;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.testutils.JsonUtil;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
-import org.openo.nfvo.vnfmadapter.common.servicetoken.VNFRestfulUtil;
-import org.openo.nfvo.vnfmadapter.testutils.JsonUtil;
 
 import mockit.Mock;
 import mockit.MockUp;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.adapter.impl;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.impl;
 
 import static org.junit.Assert.assertTrue;
 
@@ -24,9 +24,10 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken.VNFRestfulUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.impl.VnfmAdapter2DriverManager;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.testutils.JsonUtil;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
-import org.openo.nfvo.vnfmadapter.common.servicetoken.VNFRestfulUtil;
-import org.openo.nfvo.vnfmadapter.testutils.JsonUtil;
 
 import mockit.Mock;
 import mockit.MockUp;
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.ai.internalsvc.impl;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.ai.internalsvc.impl;
 
 import mockit.Mock;
 import mockit.MockUp;
 import org.junit.Test;
-import org.openo.nfvo.vnfmadapter.service.api.internalsvc.impl.VnfmAdapter2DriverMgrService;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.impl.VnfmAdapter2DriverMgrService;
 
 import java.io.IOException;
 
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.ai.internalsvc.impl;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.ai.internalsvc.impl;
 
 import mockit.Mock;
 import mockit.MockUp;
 import net.sf.json.JSONObject;
 import org.junit.Test;
-import org.openo.nfvo.vnfmadapter.service.api.internalsvc.impl.VnfmAdapterMgrService;
-import org.openo.nfvo.vnfmadapter.service.process.VnfMgr;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.impl.VnfmAdapterMgrService;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.VnfMgr;
 
 import java.io.IOException;
 
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.vnfmadapter.service.constant;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant;
 
 import junit.framework.Assert;
 import org.junit.Test;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.ParamConstants;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.UrlConstant;
 
-import java.util.List;
+import static org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant.AUTHLIST;
 
-import static org.openo.nfvo.vnfmadapter.service.constant.Constant.AUTHLIST;
+import java.util.List;
 
 /**
  * Created by QuanZhong on 2017/3/17.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.csm.connect;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect;
 
 import static org.junit.Assert.*;
 
@@ -23,7 +23,8 @@ import java.util.List;
 
 import org.apache.commons.httpclient.Header;
 import org.junit.Test;
-import org.openo.nfvo.vnfmadapter.common.VnfmException;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmException;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect.HttpRequests;
 
 public class HttpRequestsTest {
 
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.csm.connect;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -23,6 +23,7 @@ import java.net.Socket;
 import org.apache.commons.httpclient.ConnectTimeoutException;
 import org.apache.commons.httpclient.params.HttpConnectionParams;
 import org.junit.Test;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect.SslAnonymousSocket;
 
 public class SslAnonymousSocketTest {
 
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.csm.connect;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect;
 
 import org.apache.commons.httpclient.params.HttpConnectionParams;
 import org.junit.Test;
-import org.openo.nfvo.vnfmadapter.common.VnfmException;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmException;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect.SslCertificateSocket;
 
 import java.io.IOException;
 
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.csm.connect;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect;
 
 import static org.junit.Assert.*;
 
 import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
 import org.junit.Test;
-import org.openo.nfvo.vnfmadapter.common.VnfmException;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmException;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect.SslProtocolSocketFactory;
 
 public class SslProtocolSocketFactoryTest {
 
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.csm.vnf;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.vnf;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.openo.nfvo.vnfmadapter.common.ResultRequestUtil;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.ResultRequestUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.vnf.VnfMgrVnfm;
 
 import mockit.Mock;
 import mockit.MockUp;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.vnfmadapter.service.dao.impl;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.dao.impl;
 
 import junit.framework.Assert;
 import org.junit.Test;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.dao.impl.VnfmDaoImpl;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.entity.Vnfm;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.nfvo.vnfmadapter.service.entity.Vnfm;
 
 /**
  * Created by QuanZhong on 2017/3/17.
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.process;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken.VnfmRestfulUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.AuthMgr;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
-import org.openo.nfvo.vnfmadapter.common.servicetoken.VnfmRestfulUtil;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
 
 import mockit.Mock;
 import mockit.MockUp;
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.process;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process;
 
 import org.junit.Test;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken.VnfmRestfulUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.RegisterMgr;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
-import org.openo.nfvo.vnfmadapter.common.servicetoken.VnfmRestfulUtil;
 
 import mockit.Mock;
 import mockit.MockUp;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.process;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process;
 
 import static org.junit.Assert.assertEquals;
 
@@ -22,15 +22,16 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.ResultRequestUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.impl.AdapterResourceManager;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.vnf.VnfMgrVnfm;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.dao.impl.VnfmDaoImpl;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.dao.inf.VnfmDao;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.entity.Vnfm;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.VnfMgr;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.nfvo.vnfmadapter.common.ResultRequestUtil;
-import org.openo.nfvo.vnfmadapter.common.VnfmUtil;
-import org.openo.nfvo.vnfmadapter.service.adapter.impl.AdapterResourceManager;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
-import org.openo.nfvo.vnfmadapter.service.csm.vnf.VnfMgrVnfm;
-import org.openo.nfvo.vnfmadapter.service.dao.impl.VnfmDaoImpl;
-import org.openo.nfvo.vnfmadapter.service.dao.inf.VnfmDao;
-import org.openo.nfvo.vnfmadapter.service.entity.Vnfm;
 
 import mockit.Mock;
 import mockit.MockUp;
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.process;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken.VnfmRestfulUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.VnfResourceMgr;
 import org.openo.baseservice.roa.util.restclient.RestfulResponse;
-import org.openo.nfvo.vnfmadapter.common.servicetoken.VnfmRestfulUtil;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
 
 import mockit.Mock;
 import mockit.MockUp;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.rest;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest;
 
 import static org.junit.Assert.assertEquals;
 
@@ -24,9 +24,10 @@ import javax.servlet.http.HttpServletResponse;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.openo.nfvo.vnfmadapter.common.VnfmJsonUtil;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
-import org.openo.nfvo.vnfmadapter.service.process.AuthMgr;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmJsonUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.AuthMgr;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.AuthRoa;
 
 import mockit.Mock;
 import mockit.MockUp;
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.rest;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-import org.openo.nfvo.vnfmadapter.service.adapter.impl.AdapterResourceManager;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.impl.AdapterResourceManager;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.VnfAdapterResourceRoa;
 
 import mockit.Mock;
 import mockit.MockUp;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.rest;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest;
 
 import static org.junit.Assert.assertEquals;
 
@@ -23,10 +23,11 @@ import javax.servlet.http.HttpServletRequest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.openo.nfvo.vnfmadapter.common.VnfmJsonUtil;
-import org.openo.nfvo.vnfmadapter.common.VnfmUtil;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
-import org.openo.nfvo.vnfmadapter.service.process.VnfResourceMgr;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmJsonUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.VnfResourceMgr;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.VnfResourceRoa;
 
 import mockit.Mock;
 import mockit.MockUp;
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.rest;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -25,10 +25,11 @@ import javax.servlet.http.HttpServletResponse;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmJsonUtil;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.VnfMgr;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.VnfRoa;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.nfvo.vnfmadapter.common.VnfmJsonUtil;
-import org.openo.nfvo.vnfmadapter.service.constant.Constant;
-import org.openo.nfvo.vnfmadapter.service.process.VnfMgr;
 
 import mockit.Mock;
 import mockit.MockUp;
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.rest.exceptionmapper;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.exceptionmapper;
 
 import static org.junit.Assert.assertNotNull;
 
 import javax.ws.rs.core.Response;
 
 import org.junit.Test;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.exceptionmapper.GenericExceptionMapper;
 
 /**
  * <br>
  * limitations under the License.
  */
 
-package org.openo.nfvo.vnfmadapter.service.rest.exceptionmapper;
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.exceptionmapper;
 
 import static org.junit.Assert.assertNotNull;
 
 import javax.ws.rs.core.Response;
 
 import org.junit.Test;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.exceptionmapper.ServiceExceptionMapper;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
 
 /**
index bd06c4c..8536f34 100644 (file)
  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.onap.nfvo</groupId>
+        <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.onap.nfvo</groupId>
+    <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
     <artifactId>vnfmadapter</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>