From 0523050a87a5f0a1801c9cd9dcf8b67b5818b4e1 Mon Sep 17 00:00:00 2001 From: "victor.gao" Date: Thu, 17 Aug 2017 22:39:16 +0800 Subject: [PATCH] Update vfc svnfm driver pom Update groupid and re-trigger vnfm driver build job Change-Id: Ib5d52c98eb03d357636a2ba7b9fa5121ed1d0525 Issue-Id:VFC-81 Signed-off-by: victor.gao --- .../VnfmadapterService/deployment/pom.xml | 4 ++-- huawei/vnfmadapter/VnfmadapterService/pom.xml | 6 +++--- .../vnfmadapter/VnfmadapterService/service/pom.xml | 18 +++++++++++----- .../svnfm}/vnfmadapter/common/AsyncCallback.java | 2 +- .../vnfmadapter/common/DownloadCsarManager.java | 4 ++-- .../vnfmadapter/common/RegisterConfigInfo.java | 2 +- .../vnfmadapter/common/ResultRequestUtil.java | 10 ++++----- .../svnfm}/vnfmadapter/common/VnfmException.java | 2 +- .../svnfm}/vnfmadapter/common/VnfmJsonUtil.java | 2 +- .../vnfm/svnfm}/vnfmadapter/common/VnfmUtil.java | 8 ++++---- .../common/servicetoken/HttpRestfulHelp.java | 2 +- .../common/servicetoken/VNFRestfulUtil.java | 6 +++--- .../common/servicetoken/VnfmRestfulUtil.java | 6 +++--- .../activator/RoaVnfmService2DriverMgr.java | 4 ++-- .../activator/RoaVnfmServicePostProcessor.java | 4 ++-- .../adapter/impl/AdapterResourceManager.java | 18 ++++++++-------- .../service/adapter/impl/Driver2MSBManager.java | 8 ++++---- .../adapter/impl/VnfmAdapter2DriverManager.java | 8 ++++---- .../service/adapter/inf/IDriver2MSBManager.java | 2 +- .../service/adapter/inf/IResourceManager.java | 2 +- .../adapter/inf/IVnfmAdapter2DriverManager.java | 2 +- .../impl/VnfmAdapter2DriverMgrService.java | 12 +++++------ .../internalsvc/impl/VnfmAdapterMgrService.java | 12 +++++------ .../inf/IVnfmAdapter2DriverMgrService.java | 2 +- .../internalsvc/inf/IVnfmAdapterMgrService.java | 2 +- .../vnfmadapter/service/constant/Constant.java | 2 +- .../service/constant/ParamConstants.java | 2 +- .../vnfmadapter/service/constant/UrlConstant.java | 2 +- .../vnfmadapter/service/csm/api/ConnectInfo.java | 4 ++-- .../service/csm/connect/AbstractSslContext.java | 4 ++-- .../service/csm/connect/ConnectMgrVnfm.java | 10 ++++----- .../service/csm/connect/HttpRequests.java | 6 +++--- .../service/csm/connect/SslAnonymousSocket.java | 4 ++-- .../service/csm/connect/SslCertificateSocket.java | 4 ++-- .../csm/connect/SslProtocolSocketFactory.java | 6 +++--- .../service/csm/inf/InterfaceConnectMgr.java | 4 ++-- .../service/csm/inf/InterfaceVnfMgr.java | 2 +- .../vnfmadapter/service/csm/vnf/VnfMgrVnfm.java | 11 +++++----- .../vnfmadapter/service/dao/impl/VnfmDaoImpl.java | 10 ++++----- .../vnfmadapter/service/dao/inf/AbstractDao.java | 2 +- .../vnfmadapter/service/dao/inf/VnfmDao.java | 4 ++-- .../svnfm}/vnfmadapter/service/entity/Vnfm.java | 2 +- .../vnfmadapter/service/mapper/VnfmMapper.java | 4 ++-- .../vnfmadapter/service/process/AuthMgr.java | 4 ++-- .../vnfmadapter/service/process/RegisterMgr.java | 8 ++++---- .../svnfm}/vnfmadapter/service/process/VnfMgr.java | 14 ++++++------- .../service/process/VnfResourceMgr.java | 8 ++++---- .../svnfm}/vnfmadapter/service/rest/AuthRoa.java | 10 ++++----- .../vnfmadapter/service/rest/SwaggerRoa.java | 2 +- .../service/rest/VnfAdapterResourceRoa.java | 4 ++-- .../vnfmadapter/service/rest/VnfResourceRoa.java | 8 ++++---- .../svnfm}/vnfmadapter/service/rest/VnfRoa.java | 8 ++++---- .../rest/exceptionmapper/ExceptionMessage.java | 2 +- .../exceptionmapper/GenericExceptionMapper.java | 2 +- .../exceptionmapper/ServiceExceptionMapper.java | 2 +- .../main/resources/mybatis/mysql/vnfmadapter.xml | 10 ++++----- .../main/resources/spring/Vnfmadapter/services.xml | 24 +++++++++++----------- .../resources/spring/Vnfmadapter/svc_register.xml | 8 ++++---- .../common/DownloadCsarManagerTest.java | 4 +++- .../vnfm/svnfm}/vnfmadapter/common/FileUtil.java | 2 +- .../vnfmadapter/common/ResultRequestUtilTest.java | 5 +++-- .../svnfm}/vnfmadapter/common/VnfmUtilTest.java | 5 +++-- .../common/servicetoken/HttpRestfulHelpTest.java | 3 ++- .../common/servicetoken/VNFRestfulUtilTest.java | 5 +++-- .../common/servicetoken/VnfmRestfulUtilTest.java | 5 +++-- .../activator/RoaVnfmServicePostProcessorTest.java | 5 +++-- .../activator/TestRoaVnfmService2DriverMgr.java | 5 +++-- .../adapter/impl/AdapterResourceManagerTest.java | 9 ++++---- .../adapter/impl/Driver2MSBManagerTest.java | 7 ++++--- .../impl/VnfmAdapter2DriverManagerTest.java | 7 ++++--- .../impl/VnfmAdapter2DriverMgrServiceTest.java | 4 ++-- .../impl/VnfmAdapterMgrServiceTest.java | 6 +++--- .../vnfmadapter/service/constant/TestConstant.java | 8 +++++--- .../service/csm/api/ConnectInfoTest.java | 3 ++- .../csm/connect/AbstractSslContextTest.java | 3 ++- .../service/csm/connect/HttpRequestsTest.java | 5 +++-- .../csm/connect/SslAnonymousSocketTest.java | 3 ++- .../csm/connect/SslCertificateSocketTest.java | 5 +++-- .../csm/connect/SslProtocolSocketFactoryTest.java | 5 +++-- .../service/csm/vnf/VnfMgrVnfmTest.java | 7 ++++--- .../service/dao/impl/VnfmDaoImplTest.java | 5 +++-- .../vnfmadapter/service/entity/VnfmTest.java | 3 ++- .../vnfmadapter/service/process/AuthMgrTest.java | 7 ++++--- .../service/process/RegisterMgrTest.java | 5 +++-- .../vnfmadapter/service/process/VnfMgrTest.java | 19 +++++++++-------- .../service/process/VnfResourceMgrTest.java | 7 ++++--- .../vnfmadapter/service/rest/AuthRoaTest.java | 9 ++++---- .../vnfmadapter/service/rest/SwaggerRoaTest.java | 3 ++- .../service/rest/VnfAdapterResourceRoaTest.java | 5 +++-- .../service/rest/VnfResourceRoaTest.java | 11 +++++----- .../vnfmadapter/service/rest/VnfRoaTest.java | 9 ++++---- .../rest/exceptionmapper/ExceptionMessageTest.java | 3 ++- .../GenericExceptionMapperTest.java | 3 ++- .../ServiceExceptionMapperTest.java | 3 ++- .../svnfm}/vnfmadapter/testutils/JsonUtil.java | 2 +- huawei/vnfmadapter/pom.xml | 4 ++-- 96 files changed, 299 insertions(+), 255 deletions(-) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/common/AsyncCallback.java (96%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/common/DownloadCsarManager.java (98%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/common/RegisterConfigInfo.java (97%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/common/ResultRequestUtil.java (95%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/common/VnfmException.java (96%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/common/VnfmJsonUtil.java (97%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/common/VnfmUtil.java (90%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/common/servicetoken/HttpRestfulHelp.java (96%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/common/servicetoken/VNFRestfulUtil.java (98%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/common/servicetoken/VnfmRestfulUtil.java (98%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/activator/RoaVnfmService2DriverMgr.java (91%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/activator/RoaVnfmServicePostProcessor.java (91%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/adapter/impl/AdapterResourceManager.java (97%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/adapter/impl/Driver2MSBManager.java (93%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManager.java (93%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/adapter/inf/IDriver2MSBManager.java (94%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/adapter/inf/IResourceManager.java (96%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/adapter/inf/IVnfmAdapter2DriverManager.java (94%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/api/internalsvc/impl/VnfmAdapter2DriverMgrService.java (91%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/api/internalsvc/impl/VnfmAdapterMgrService.java (91%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/api/internalsvc/inf/IVnfmAdapter2DriverMgrService.java (92%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/api/internalsvc/inf/IVnfmAdapterMgrService.java (91%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/constant/Constant.java (98%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/constant/ParamConstants.java (98%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/constant/UrlConstant.java (96%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/csm/api/ConnectInfo.java (95%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/csm/connect/AbstractSslContext.java (97%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/csm/connect/ConnectMgrVnfm.java (93%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/csm/connect/HttpRequests.java (98%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/csm/connect/SslAnonymousSocket.java (95%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/csm/connect/SslCertificateSocket.java (95%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/csm/connect/SslProtocolSocketFactory.java (93%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/csm/inf/InterfaceConnectMgr.java (88%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/csm/inf/InterfaceVnfMgr.java (96%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java (96%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/dao/impl/VnfmDaoImpl.java (82%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/dao/inf/AbstractDao.java (95%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/dao/inf/VnfmDao.java (93%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/entity/Vnfm.java (97%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/mapper/VnfmMapper.java (92%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/process/AuthMgr.java (93%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/process/RegisterMgr.java (89%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/process/VnfMgr.java (95%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/process/VnfResourceMgr.java (96%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/rest/AuthRoa.java (92%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/rest/SwaggerRoa.java (95%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/rest/VnfAdapterResourceRoa.java (92%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/rest/VnfResourceRoa.java (91%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/rest/VnfRoa.java (97%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/rest/exceptionmapper/ExceptionMessage.java (94%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/rest/exceptionmapper/GenericExceptionMapper.java (94%) rename huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapper.java (94%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/common/DownloadCsarManagerTest.java (92%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/common/FileUtil.java (96%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/common/ResultRequestUtilTest.java (89%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/common/VnfmUtilTest.java (94%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/common/servicetoken/HttpRestfulHelpTest.java (88%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/common/servicetoken/VNFRestfulUtilTest.java (98%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/common/servicetoken/VnfmRestfulUtilTest.java (97%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/activator/RoaVnfmServicePostProcessorTest.java (87%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/activator/TestRoaVnfmService2DriverMgr.java (86%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/adapter/impl/AdapterResourceManagerTest.java (96%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/adapter/impl/Driver2MSBManagerTest.java (96%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java (96%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapter2DriverMgrServiceTest.java (88%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapterMgrServiceTest.java (82%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/constant/TestConstant.java (77%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/csm/api/ConnectInfoTest.java (95%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/csm/connect/AbstractSslContextTest.java (89%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/csm/connect/HttpRequestsTest.java (92%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/csm/connect/SslAnonymousSocketTest.java (92%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/csm/connect/SslCertificateSocketTest.java (91%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/csm/connect/SslProtocolSocketFactoryTest.java (86%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/csm/vnf/VnfMgrVnfmTest.java (97%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/dao/impl/VnfmDaoImplTest.java (88%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/entity/VnfmTest.java (93%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/process/AuthMgrTest.java (86%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/process/RegisterMgrTest.java (88%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/process/VnfMgrTest.java (95%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/process/VnfResourceMgrTest.java (98%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/rest/AuthRoaTest.java (95%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/rest/SwaggerRoaTest.java (88%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/rest/VnfAdapterResourceRoaTest.java (85%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/rest/VnfResourceRoaTest.java (95%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/rest/VnfRoaTest.java (98%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/rest/exceptionmapper/ExceptionMessageTest.java (91%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/rest/exceptionmapper/GenericExceptionMapperTest.java (85%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapperTest.java (86%) rename huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/{openo/nfvo => onap/vfc/nfvo/vnfm/svnfm}/vnfmadapter/testutils/JsonUtil.java (96%) diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml b/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml index 27bfbf3e..f08b6416 100644 --- a/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml +++ b/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml @@ -17,9 +17,9 @@ 4.0.0 - org.openo.nfvo + org.onap.vfc.nfvo.driver.vnfm.svnfm vnfmadapter-service-root - 1.1.0-SNAPSHOT + 1.0.0-SNAPSHOT hw-vnfmadapter-deployment diff --git a/huawei/vnfmadapter/VnfmadapterService/pom.xml b/huawei/vnfmadapter/VnfmadapterService/pom.xml index e2222f6d..abcf5683 100644 --- a/huawei/vnfmadapter/VnfmadapterService/pom.xml +++ b/huawei/vnfmadapter/VnfmadapterService/pom.xml @@ -18,11 +18,11 @@ 4.0.0 vnfmadapter - org.openo.nfvo - 1.1.0-SNAPSHOT + org.onap.vfc.nfvo.driver.vnfm.svnfm + 1.0.0-SNAPSHOT vnfmadapter-service-root - 1.1.0-SNAPSHOT + 1.0.0-SNAPSHOT nfvo/drivers/vnfm/svnfm/huawei/vnfmadapter/VnfmadapterService pom diff --git a/huawei/vnfmadapter/VnfmadapterService/service/pom.xml b/huawei/vnfmadapter/VnfmadapterService/service/pom.xml index 8fc9f512..c4f1878f 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/pom.xml +++ b/huawei/vnfmadapter/VnfmadapterService/service/pom.xml @@ -17,16 +17,24 @@ 4.0.0 - org.openo.nfvo + org.onap.vfc.nfvo.driver.vnfm.svnfm vnfmadapter-service-root - 1.1.0-SNAPSHOT + 1.0.0-SNAPSHOT vnfmadapter-service nfvo/drivers/vnfm/svnfm/huawei/vnfmadapter/VnfmadapterService/service war - + + + open-o + OPEN-O repository + https://nexus.open-o.org/content/repositories/public/ + + + + org.powermock powermock-core @@ -55,12 +63,12 @@ org.openo.common-services.common-utilities commonlib-cbb - 1.1.0-SNAPSHOT + 2.0.0 org.openo.common-services.common-utilities commonlib-restclient - 1.1.0-SNAPSHOT + 2.0.0 org.mybatis diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/AsyncCallback.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/AsyncCallback.java similarity index 96% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/AsyncCallback.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/AsyncCallback.java index 3d2043de..556789d1 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/AsyncCallback.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/AsyncCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common; import org.openo.baseservice.roa.util.restclient.RestfulAsyncCallback; import org.openo.baseservice.roa.util.restclient.RestfulResponse; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/DownloadCsarManager.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/DownloadCsarManager.java similarity index 98% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/DownloadCsarManager.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/DownloadCsarManager.java index 8d512e1a..c8cf75b5 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/DownloadCsarManager.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/DownloadCsarManager.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/RegisterConfigInfo.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/RegisterConfigInfo.java similarity index 97% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/RegisterConfigInfo.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/RegisterConfigInfo.java index 126af305..05ecf79f 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/RegisterConfigInfo.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/RegisterConfigInfo.java @@ -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.util.Locale; import java.util.ResourceBundle; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/ResultRequestUtil.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtil.java similarity index 95% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/ResultRequestUtil.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtil.java index c47ad64c..fa3d0aea 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/ResultRequestUtil.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtil.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/VnfmException.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmException.java similarity index 96% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/VnfmException.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmException.java index 06517ef3..3b3a55bf 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/VnfmException.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common; /** * VNFM exception. diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/VnfmJsonUtil.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmJsonUtil.java similarity index 97% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/VnfmJsonUtil.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmJsonUtil.java index ab9f7935..fc327299 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/VnfmJsonUtil.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmJsonUtil.java @@ -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.io.InputStream; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/VnfmUtil.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmUtil.java similarity index 90% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/VnfmUtil.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmUtil.java index 0da2142b..49d17fe3 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/VnfmUtil.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmUtil.java @@ -14,12 +14,12 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/servicetoken/HttpRestfulHelp.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/HttpRestfulHelp.java similarity index 96% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/servicetoken/HttpRestfulHelp.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/HttpRestfulHelp.java index 9efd9a72..6bac7633 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/servicetoken/HttpRestfulHelp.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/HttpRestfulHelp.java @@ -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.util.HashMap; import java.util.Map; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/servicetoken/VNFRestfulUtil.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VNFRestfulUtil.java similarity index 98% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/servicetoken/VNFRestfulUtil.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VNFRestfulUtil.java index cf7c986f..1b405648 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/servicetoken/VNFRestfulUtil.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VNFRestfulUtil.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/servicetoken/VnfmRestfulUtil.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VnfmRestfulUtil.java similarity index 98% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/servicetoken/VnfmRestfulUtil.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VnfmRestfulUtil.java index 7f177773..b694d573 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/common/servicetoken/VnfmRestfulUtil.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VnfmRestfulUtil.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/activator/RoaVnfmService2DriverMgr.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmService2DriverMgr.java similarity index 91% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/activator/RoaVnfmService2DriverMgr.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmService2DriverMgr.java index 4b67d2a0..eeff720a 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/activator/RoaVnfmService2DriverMgr.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmService2DriverMgr.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/activator/RoaVnfmServicePostProcessor.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmServicePostProcessor.java similarity index 91% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/activator/RoaVnfmServicePostProcessor.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmServicePostProcessor.java index b84b42f2..e461fcec 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/activator/RoaVnfmServicePostProcessor.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmServicePostProcessor.java @@ -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.IVnfmAdapterMgrService; +import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.inf.IVnfmAdapterMgrService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/AdapterResourceManager.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManager.java similarity index 97% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/AdapterResourceManager.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManager.java index 8c731efd..5b9d0774 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/AdapterResourceManager.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManager.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/Driver2MSBManager.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/Driver2MSBManager.java similarity index 93% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/Driver2MSBManager.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/Driver2MSBManager.java index bd8d3c17..689ee2fe 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/Driver2MSBManager.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/Driver2MSBManager.java @@ -14,14 +14,14 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManager.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManager.java similarity index 93% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManager.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManager.java index 211536f9..d6831b9c 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManager.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManager.java @@ -14,14 +14,14 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/inf/IDriver2MSBManager.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/inf/IDriver2MSBManager.java similarity index 94% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/inf/IDriver2MSBManager.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/inf/IDriver2MSBManager.java index 6d2ff9aa..9132ee22 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/inf/IDriver2MSBManager.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/inf/IDriver2MSBManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.service.adapter.inf; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.inf; import java.util.Map; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/inf/IResourceManager.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/inf/IResourceManager.java similarity index 96% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/inf/IResourceManager.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/inf/IResourceManager.java index 8eb7cbf1..ea6d369f 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/inf/IResourceManager.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/inf/IResourceManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.service.adapter.inf; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.inf; import java.util.Map; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/inf/IVnfmAdapter2DriverManager.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/inf/IVnfmAdapter2DriverManager.java similarity index 94% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/inf/IVnfmAdapter2DriverManager.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/inf/IVnfmAdapter2DriverManager.java index 10b42429..f0706357 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/adapter/inf/IVnfmAdapter2DriverManager.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/inf/IVnfmAdapter2DriverManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.service.adapter.inf; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.inf; import java.util.Map; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/api/internalsvc/impl/VnfmAdapter2DriverMgrService.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/api/internalsvc/impl/VnfmAdapter2DriverMgrService.java similarity index 91% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/api/internalsvc/impl/VnfmAdapter2DriverMgrService.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/api/internalsvc/impl/VnfmAdapter2DriverMgrService.java index 42cef38a..be0f5acc 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/api/internalsvc/impl/VnfmAdapter2DriverMgrService.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/api/internalsvc/impl/VnfmAdapter2DriverMgrService.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/api/internalsvc/impl/VnfmAdapterMgrService.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/api/internalsvc/impl/VnfmAdapterMgrService.java similarity index 91% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/api/internalsvc/impl/VnfmAdapterMgrService.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/api/internalsvc/impl/VnfmAdapterMgrService.java index 8991218a..9bcde8ab 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/api/internalsvc/impl/VnfmAdapterMgrService.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/api/internalsvc/impl/VnfmAdapterMgrService.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/api/internalsvc/inf/IVnfmAdapter2DriverMgrService.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/api/internalsvc/inf/IVnfmAdapter2DriverMgrService.java similarity index 92% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/api/internalsvc/inf/IVnfmAdapter2DriverMgrService.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/api/internalsvc/inf/IVnfmAdapter2DriverMgrService.java index 7aa7277d..c5e5ff45 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/api/internalsvc/inf/IVnfmAdapter2DriverMgrService.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/api/internalsvc/inf/IVnfmAdapter2DriverMgrService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.service.api.internalsvc.inf; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.inf; /** *
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/api/internalsvc/inf/IVnfmAdapterMgrService.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/api/internalsvc/inf/IVnfmAdapterMgrService.java similarity index 91% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/api/internalsvc/inf/IVnfmAdapterMgrService.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/api/internalsvc/inf/IVnfmAdapterMgrService.java index c25a2de1..f1053a3d 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/api/internalsvc/inf/IVnfmAdapterMgrService.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/api/internalsvc/inf/IVnfmAdapterMgrService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.service.api.internalsvc.inf; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.inf; /** *
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/constant/Constant.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/Constant.java similarity index 98% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/constant/Constant.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/Constant.java index e20375f5..4548de35 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/constant/Constant.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/Constant.java @@ -13,7 +13,7 @@ * 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 java.util.Arrays; import java.util.Collections; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/constant/ParamConstants.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/ParamConstants.java similarity index 98% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/constant/ParamConstants.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/ParamConstants.java index 5d897871..1f932d7b 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/constant/ParamConstants.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/ParamConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.service.constant; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant; /** * diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/constant/UrlConstant.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/UrlConstant.java similarity index 96% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/constant/UrlConstant.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/UrlConstant.java index 10621271..8b906a14 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/constant/UrlConstant.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/UrlConstant.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.service.constant; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant; /** * URL constant diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/api/ConnectInfo.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/api/ConnectInfo.java similarity index 95% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/api/ConnectInfo.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/api/ConnectInfo.java index 5c59c013..45d09eda 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/api/ConnectInfo.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/api/ConnectInfo.java @@ -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 diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/AbstractSslContext.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/AbstractSslContext.java similarity index 97% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/AbstractSslContext.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/AbstractSslContext.java index 09f0d2cf..255bdb72 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/AbstractSslContext.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/AbstractSslContext.java @@ -14,12 +14,12 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/ConnectMgrVnfm.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/ConnectMgrVnfm.java similarity index 93% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/ConnectMgrVnfm.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/ConnectMgrVnfm.java index 8775a3d5..26430799 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/ConnectMgrVnfm.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/ConnectMgrVnfm.java @@ -14,17 +14,17 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/HttpRequests.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/HttpRequests.java similarity index 98% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/HttpRequests.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/HttpRequests.java index 07f3f6b8..f94c1d0c 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/HttpRequests.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/HttpRequests.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslAnonymousSocket.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslAnonymousSocket.java similarity index 95% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslAnonymousSocket.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslAnonymousSocket.java index 09ec841a..dc651ef2 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslAnonymousSocket.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslAnonymousSocket.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslCertificateSocket.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslCertificateSocket.java similarity index 95% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslCertificateSocket.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslCertificateSocket.java index 9eca6e28..2fa1dc25 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslCertificateSocket.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslCertificateSocket.java @@ -13,13 +13,13 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslProtocolSocketFactory.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslProtocolSocketFactory.java similarity index 93% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslProtocolSocketFactory.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslProtocolSocketFactory.java index d14d939a..af414d8e 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslProtocolSocketFactory.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslProtocolSocketFactory.java @@ -14,14 +14,14 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/inf/InterfaceConnectMgr.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/inf/InterfaceConnectMgr.java similarity index 88% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/inf/InterfaceConnectMgr.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/inf/InterfaceConnectMgr.java index f2a2c5e5..9d78ff22 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/inf/InterfaceConnectMgr.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/inf/InterfaceConnectMgr.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.service.csm.inf; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.inf; -import org.openo.nfvo.vnfmadapter.common.VnfmException; +import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmException; import net.sf.json.JSONObject; /** diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/inf/InterfaceVnfMgr.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/inf/InterfaceVnfMgr.java similarity index 96% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/inf/InterfaceVnfMgr.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/inf/InterfaceVnfMgr.java index 8a1cb0b3..3d1965ee 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/inf/InterfaceVnfMgr.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/inf/InterfaceVnfMgr.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.service.csm.inf; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.inf; import net.sf.json.JSONObject; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java similarity index 96% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java index dea8c0bf..18de1c02 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java @@ -14,13 +14,14 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/dao/impl/VnfmDaoImpl.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/impl/VnfmDaoImpl.java similarity index 82% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/dao/impl/VnfmDaoImpl.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/impl/VnfmDaoImpl.java index c104bd16..83db166e 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/dao/impl/VnfmDaoImpl.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/impl/VnfmDaoImpl.java @@ -14,15 +14,15 @@ * 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 diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/dao/inf/AbstractDao.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/inf/AbstractDao.java similarity index 95% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/dao/inf/AbstractDao.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/inf/AbstractDao.java index 592c3d50..3e02efce 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/dao/inf/AbstractDao.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/inf/AbstractDao.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.service.dao.inf; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.dao.inf; import org.apache.ibatis.session.SqlSession; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/dao/inf/VnfmDao.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/inf/VnfmDao.java similarity index 93% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/dao/inf/VnfmDao.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/inf/VnfmDao.java index 8fc4431c..e1fdc2d2 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/dao/inf/VnfmDao.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/inf/VnfmDao.java @@ -14,12 +14,12 @@ * 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 diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/entity/Vnfm.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/entity/Vnfm.java similarity index 97% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/entity/Vnfm.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/entity/Vnfm.java index dec1724c..31bf72f5 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/entity/Vnfm.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/entity/Vnfm.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.service.entity; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.entity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/mapper/VnfmMapper.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/mapper/VnfmMapper.java similarity index 92% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/mapper/VnfmMapper.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/mapper/VnfmMapper.java index 63317626..8c079c7f 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/mapper/VnfmMapper.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/mapper/VnfmMapper.java @@ -14,12 +14,12 @@ * 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.
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/process/AuthMgr.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgr.java similarity index 93% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/process/AuthMgr.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgr.java index 1793755d..de27b73b 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/process/AuthMgr.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgr.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.service.process; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process; -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/process/RegisterMgr.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/RegisterMgr.java similarity index 89% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/process/RegisterMgr.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/RegisterMgr.java index 7da24c0e..c0d7b0f4 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/process/RegisterMgr.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/RegisterMgr.java @@ -14,15 +14,15 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/process/VnfMgr.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgr.java similarity index 95% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/process/VnfMgr.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgr.java index 816af06f..0a0a17ff 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/process/VnfMgr.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgr.java @@ -14,18 +14,18 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/process/VnfResourceMgr.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfResourceMgr.java similarity index 96% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/process/VnfResourceMgr.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfResourceMgr.java index 11bb2291..3d34b8cb 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/process/VnfResourceMgr.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfResourceMgr.java @@ -14,16 +14,16 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/AuthRoa.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoa.java similarity index 92% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/AuthRoa.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoa.java index 445dd619..504a7168 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/AuthRoa.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoa.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/SwaggerRoa.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java similarity index 95% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/SwaggerRoa.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java index 5dfd290b..7ff1e2ca 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/SwaggerRoa.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java @@ -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.io.IOException; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/VnfAdapterResourceRoa.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoa.java similarity index 92% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/VnfAdapterResourceRoa.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoa.java index 138e284e..b6a9423a 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/VnfAdapterResourceRoa.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoa.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/VnfResourceRoa.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfResourceRoa.java similarity index 91% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/VnfResourceRoa.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfResourceRoa.java index ad7663e8..47af63ae 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/VnfResourceRoa.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfResourceRoa.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/VnfRoa.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java similarity index 97% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/VnfRoa.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java index c68cb61c..f35f10d1 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/VnfRoa.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/ExceptionMessage.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/ExceptionMessage.java similarity index 94% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/ExceptionMessage.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/ExceptionMessage.java index 7b4738dc..522739b5 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/ExceptionMessage.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/ExceptionMessage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.service.rest.exceptionmapper; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.exceptionmapper; import org.apache.http.HttpStatus; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/GenericExceptionMapper.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/GenericExceptionMapper.java similarity index 94% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/GenericExceptionMapper.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/GenericExceptionMapper.java index 25eb8c24..ade268c8 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/GenericExceptionMapper.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/GenericExceptionMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.service.rest.exceptionmapper; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.exceptionmapper; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapper.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapper.java similarity index 94% rename from huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapper.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapper.java index 957c0d40..b38088d2 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapper.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.service.rest.exceptionmapper; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.exceptionmapper; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/mybatis/mysql/vnfmadapter.xml b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/mybatis/mysql/vnfmadapter.xml index d9b72958..35c8686a 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/mybatis/mysql/vnfmadapter.xml +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/mybatis/mysql/vnfmadapter.xml @@ -15,8 +15,8 @@ limitations under the License. --> - - + @@ -28,12 +28,12 @@ ID, VERSION, VNFDID, VNFPACKAGEID - + INSERT INTO VNFM (ID, VERSION, VNFDID, VNFPACKAGEID) VALUES(#{id},#{version},#{vnfdId},#{vnfPackageId}) - + UPDATE VNFM @@ -70,7 +70,7 @@ SELECT COUNT(*) FROM VNFM - SELECT * FROM VNFM WHERE id = #{id} diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/services.xml b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/services.xml index fb73cd4b..58240744 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/services.xml +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/services.xml @@ -65,38 +65,38 @@ + class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.dao.impl.VnfmDaoImpl"> - + - + + class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.VnfResourceMgr"> - + - + - + - + - + - @@ -110,8 +110,8 @@ - - + + diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/svc_register.xml b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/svc_register.xml index 8fa5e0d2..1635b670 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/svc_register.xml +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/svc_register.xml @@ -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"> - - - - + + + + \ No newline at end of file diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/DownloadCsarManagerTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/DownloadCsarManagerTest.java similarity index 92% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/DownloadCsarManagerTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/DownloadCsarManagerTest.java index 85ac321e..6d396d54 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/DownloadCsarManagerTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/DownloadCsarManagerTest.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/FileUtil.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/FileUtil.java similarity index 96% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/FileUtil.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/FileUtil.java index 10f24353..d5a0e7e4 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/FileUtil.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/FileUtil.java @@ -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.BufferedReader; import java.io.File; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/ResultRequestUtilTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtilTest.java similarity index 89% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/ResultRequestUtilTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtilTest.java index 1e8a9f3b..0dc6751b 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/ResultRequestUtilTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtilTest.java @@ -14,12 +14,13 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/VnfmUtilTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmUtilTest.java similarity index 94% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/VnfmUtilTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmUtilTest.java index fa60eb48..d3f773e9 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/VnfmUtilTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmUtilTest.java @@ -14,13 +14,14 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/servicetoken/HttpRestfulHelpTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/HttpRestfulHelpTest.java similarity index 88% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/servicetoken/HttpRestfulHelpTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/HttpRestfulHelpTest.java index a50dde98..62f3f212 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/servicetoken/HttpRestfulHelpTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/HttpRestfulHelpTest.java @@ -14,11 +14,12 @@ * 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 org.junit.Test; +import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken.HttpRestfulHelp; import org.openo.baseservice.roa.util.restclient.Restful; /** diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/servicetoken/VNFRestfulUtilTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VNFRestfulUtilTest.java similarity index 98% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/servicetoken/VNFRestfulUtilTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VNFRestfulUtilTest.java index 3da7a813..cd6c0df2 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/servicetoken/VNFRestfulUtilTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VNFRestfulUtilTest.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/servicetoken/VnfmRestfulUtilTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VnfmRestfulUtilTest.java similarity index 97% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/servicetoken/VnfmRestfulUtilTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VnfmRestfulUtilTest.java index d03b39c5..6c19feaa 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/common/servicetoken/VnfmRestfulUtilTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VnfmRestfulUtilTest.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/activator/RoaVnfmServicePostProcessorTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmServicePostProcessorTest.java similarity index 87% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/activator/RoaVnfmServicePostProcessorTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmServicePostProcessorTest.java index 82d8c2b4..7235be74 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/activator/RoaVnfmServicePostProcessorTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmServicePostProcessorTest.java @@ -13,11 +13,12 @@ * 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. diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/activator/TestRoaVnfmService2DriverMgr.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/TestRoaVnfmService2DriverMgr.java similarity index 86% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/activator/TestRoaVnfmService2DriverMgr.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/TestRoaVnfmService2DriverMgr.java index f75f4e44..7f0da0c0 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/activator/TestRoaVnfmService2DriverMgr.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/TestRoaVnfmService2DriverMgr.java @@ -13,11 +13,12 @@ * 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. diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/AdapterResourceManagerTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManagerTest.java similarity index 96% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/AdapterResourceManagerTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManagerTest.java index 895c167b..e6e0b23f 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/AdapterResourceManagerTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManagerTest.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/Driver2MSBManagerTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/Driver2MSBManagerTest.java similarity index 96% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/Driver2MSBManagerTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/Driver2MSBManagerTest.java index 48a04118..10e0305d 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/Driver2MSBManagerTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/Driver2MSBManagerTest.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java similarity index 96% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java index f79fa704..dc0431c5 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapter2DriverMgrServiceTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapter2DriverMgrServiceTest.java similarity index 88% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapter2DriverMgrServiceTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapter2DriverMgrServiceTest.java index e3393b42..12910c8e 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapter2DriverMgrServiceTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapter2DriverMgrServiceTest.java @@ -14,12 +14,12 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapterMgrServiceTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapterMgrServiceTest.java similarity index 82% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapterMgrServiceTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapterMgrServiceTest.java index 2a6b7444..84a7c914 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapterMgrServiceTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapterMgrServiceTest.java @@ -14,14 +14,14 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/constant/TestConstant.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/TestConstant.java similarity index 77% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/constant/TestConstant.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/TestConstant.java index f2142f14..7780c648 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/constant/TestConstant.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/TestConstant.java @@ -13,14 +13,16 @@ * 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. diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/api/ConnectInfoTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/api/ConnectInfoTest.java similarity index 95% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/api/ConnectInfoTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/api/ConnectInfoTest.java index 83a396df..93e9e39f 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/api/ConnectInfoTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/api/ConnectInfoTest.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.service.csm.api; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.api; import static org.junit.Assert.*; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.api.ConnectInfo; public class ConnectInfoTest { diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/AbstractSslContextTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/AbstractSslContextTest.java similarity index 89% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/AbstractSslContextTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/AbstractSslContextTest.java index 20ed64d7..d89c3e8d 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/AbstractSslContextTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/AbstractSslContextTest.java @@ -14,10 +14,11 @@ * 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.junit.Test; +import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect.AbstractSslContext; /** * Created by QuanZhong on 2017/3/20. diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/HttpRequestsTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/HttpRequestsTest.java similarity index 92% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/HttpRequestsTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/HttpRequestsTest.java index 3a0a8ec3..185f2b28 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/HttpRequestsTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/HttpRequestsTest.java @@ -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 { diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslAnonymousSocketTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslAnonymousSocketTest.java similarity index 92% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslAnonymousSocketTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslAnonymousSocketTest.java index 23f3280d..1e382a4e 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslAnonymousSocketTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslAnonymousSocketTest.java @@ -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 { diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslCertificateSocketTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslCertificateSocketTest.java similarity index 91% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslCertificateSocketTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslCertificateSocketTest.java index 80156a02..658b6dc0 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslCertificateSocketTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslCertificateSocketTest.java @@ -14,11 +14,12 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslProtocolSocketFactoryTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslProtocolSocketFactoryTest.java similarity index 86% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslProtocolSocketFactoryTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslProtocolSocketFactoryTest.java index 4ecea255..27236ca7 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/connect/SslProtocolSocketFactoryTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslProtocolSocketFactoryTest.java @@ -14,13 +14,14 @@ * 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 { diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/vnf/VnfMgrVnfmTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfmTest.java similarity index 97% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/vnf/VnfMgrVnfmTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfmTest.java index 403483f0..863c5bee 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/csm/vnf/VnfMgrVnfmTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfmTest.java @@ -14,13 +14,14 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/dao/impl/VnfmDaoImplTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/impl/VnfmDaoImplTest.java similarity index 88% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/dao/impl/VnfmDaoImplTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/impl/VnfmDaoImplTest.java index 4564d69b..6a2604d5 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/dao/impl/VnfmDaoImplTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/impl/VnfmDaoImplTest.java @@ -13,12 +13,13 @@ * 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. diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/entity/VnfmTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/entity/VnfmTest.java similarity index 93% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/entity/VnfmTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/entity/VnfmTest.java index c9996788..7da877ac 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/entity/VnfmTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/entity/VnfmTest.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.service.entity; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.entity; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.entity.Vnfm; public class VnfmTest { Vnfm vnfm; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/process/AuthMgrTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgrTest.java similarity index 86% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/process/AuthMgrTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgrTest.java index 718423c9..d19889cd 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/process/AuthMgrTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgrTest.java @@ -14,14 +14,15 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/process/RegisterMgrTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/RegisterMgrTest.java similarity index 88% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/process/RegisterMgrTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/RegisterMgrTest.java index eee4e1df..7273878c 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/process/RegisterMgrTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/RegisterMgrTest.java @@ -14,11 +14,12 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/process/VnfMgrTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgrTest.java similarity index 95% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/process/VnfMgrTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgrTest.java index 5f2b94d1..60d11b0b 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/process/VnfMgrTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgrTest.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/process/VnfResourceMgrTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfResourceMgrTest.java similarity index 98% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/process/VnfResourceMgrTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfResourceMgrTest.java index c706178b..eb5719e1 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/process/VnfResourceMgrTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfResourceMgrTest.java @@ -14,14 +14,15 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/AuthRoaTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoaTest.java similarity index 95% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/AuthRoaTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoaTest.java index 558d43ed..5fc05c4c 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/AuthRoaTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoaTest.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/SwaggerRoaTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoaTest.java similarity index 88% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/SwaggerRoaTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoaTest.java index ba68ed82..a8cd72e0 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/SwaggerRoaTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoaTest.java @@ -14,13 +14,14 @@ * 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.assertNotNull; import java.io.IOException; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.SwaggerRoa; /** *
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/VnfAdapterResourceRoaTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoaTest.java similarity index 85% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/VnfAdapterResourceRoaTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoaTest.java index 75b37f69..6e5f2888 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/VnfAdapterResourceRoaTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoaTest.java @@ -14,12 +14,13 @@ * 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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/VnfResourceRoaTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfResourceRoaTest.java similarity index 95% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/VnfResourceRoaTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfResourceRoaTest.java index 016d373b..ca70691b 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/VnfResourceRoaTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfResourceRoaTest.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/VnfRoaTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoaTest.java similarity index 98% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/VnfRoaTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoaTest.java index 08e28bca..411e6adc 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/VnfRoaTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoaTest.java @@ -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; diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/ExceptionMessageTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/ExceptionMessageTest.java similarity index 91% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/ExceptionMessageTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/ExceptionMessageTest.java index ca660581..8ec144fe 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/ExceptionMessageTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/ExceptionMessageTest.java @@ -14,12 +14,13 @@ * 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.assertEquals; import static org.junit.Assert.assertNotNull; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.exceptionmapper.ExceptionMessage; /** *
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/GenericExceptionMapperTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/GenericExceptionMapperTest.java similarity index 85% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/GenericExceptionMapperTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/GenericExceptionMapperTest.java index 370cbc81..e0cdc6f8 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/GenericExceptionMapperTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/GenericExceptionMapperTest.java @@ -14,13 +14,14 @@ * 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; /** *
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapperTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapperTest.java similarity index 86% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapperTest.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapperTest.java index c9deb393..cf4c56e9 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapperTest.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapperTest.java @@ -14,13 +14,14 @@ * 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; /** diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/testutils/JsonUtil.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/testutils/JsonUtil.java similarity index 96% rename from huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/testutils/JsonUtil.java rename to huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/testutils/JsonUtil.java index c3f88547..2de19983 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/openo/nfvo/vnfmadapter/testutils/JsonUtil.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/testutils/JsonUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.vnfmadapter.testutils; +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.testutils; import java.io.IOException; diff --git a/huawei/vnfmadapter/pom.xml b/huawei/vnfmadapter/pom.xml index bd06c4c8..8536f34d 100644 --- a/huawei/vnfmadapter/pom.xml +++ b/huawei/vnfmadapter/pom.xml @@ -16,12 +16,12 @@ --> - org.onap.nfvo + org.onap.oparent oparent 1.0.0-SNAPSHOT 4.0.0 - org.onap.nfvo + org.onap.vfc.nfvo.driver.vnfm.svnfm vnfmadapter 1.0.0-SNAPSHOT pom -- 2.16.6