From e585e291a7d1fc27541471d8bebb6fe36a72b9e7 Mon Sep 17 00:00:00 2001 From: "victor.gao" Date: Wed, 16 Aug 2017 16:45:43 +0800 Subject: Update directory according groupid Update openo to onap according groupid org.onap.vfc.nfvo.res. Change-Id: I3e32d445b8e5f2bfe8caa813052a8a7ae7e128a8 Issue-Id:VFC-86 Signed-off-by: victor.gao --- .../main/resources/mybatis/mysql/HostMapper.xml | 14 +-- .../resources/mybatis/mysql/LocationMapper.xml | 12 +-- .../main/resources/mybatis/mysql/NetworkMapper.xml | 14 +-- .../main/resources/mybatis/mysql/PortMapper.xml | 14 +-- .../main/resources/mybatis/mysql/SitesMapper.xml | 14 +-- .../src/main/resources/mybatis/mysql/VimMapper.xml | 6 +- .../resources/mybatis/mysql/VirtualLinkMapper.xml | 12 +-- .../src/main/resources/mybatis/mysql/VmMapper.xml | 12 +-- .../main/resources/mybatis/mysql/VnfInfoMapper.xml | 12 +-- .../src/main/resources/mybatis/mysql/VnfMapper.xml | 12 +-- .../resources/mybatis/mysql/VnfStatusMapper.xml | 12 +-- .../resources/spring/Resmanagement/services.xml | 100 ++++++++++----------- .../spring/Resmanagement/svc_register.xml | 4 +- 13 files changed, 119 insertions(+), 119 deletions(-) (limited to 'ResmanagementService/service/src/main/resources') diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/HostMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/HostMapper.xml index 850eef4..7c4c1da 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/HostMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/HostMapper.xml @@ -16,9 +16,9 @@ limitations under the License. --> - + + type="org.onap.vfc.nfvo.res.service.entity.HostEntity"> @@ -58,7 +58,7 @@ limitations under the License. where VIM_ID = #{vimId,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity"> insert into host (ID, NAME, CPU, MEMORY, DISK, VIM_ID, VIM_NAME) values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{cpu,jdbcType=VARCHAR}, @@ -66,7 +66,7 @@ limitations under the License. , #{vimName,jdbcType=VARCHAR}) + parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity"> insert into host @@ -116,7 +116,7 @@ limitations under the License. + parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity"> update host @@ -148,7 +148,7 @@ limitations under the License. + parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity"> update host set NAME = #{name,jdbcType=VARCHAR}, CPU = #{cpu,jdbcType=VARCHAR}, @@ -159,7 +159,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity"> update host diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/LocationMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/LocationMapper.xml index b0ecba2..22e8885 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/LocationMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/LocationMapper.xml @@ -16,9 +16,9 @@ limitations under the License. --> - + + type="org.onap.vfc.nfvo.res.service.entity.LocationEntity"> @@ -68,7 +68,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.LocationEntity"> insert into location (ID, COUNTRY, LOCATION, LATITUDE, LONGITUDE, DESCRIPTION) @@ -77,7 +77,7 @@ limitations under the License. #{latitude,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}) + parameterType="org.onap.vfc.nfvo.res.service.entity.LocationEntity"> insert into location @@ -122,7 +122,7 @@ limitations under the License. + parameterType="org.onap.vfc.nfvo.res.service.entity.LocationEntity"> update location @@ -145,7 +145,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.LocationEntity"> update location set COUNTRY = #{country,jdbcType=VARCHAR}, diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/NetworkMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/NetworkMapper.xml index 65e4d67..dbae050 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/NetworkMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/NetworkMapper.xml @@ -16,9 +16,9 @@ limitations under the License. --> - + + type="org.onap.vfc.nfvo.res.service.entity.NetworkEntity"> @@ -64,7 +64,7 @@ limitations under the License. where VIM_ID = #{vimId,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity"> insert into network (ID, NAME, TENANT_ID, VIM_ID, VIM_NAME, STATUS, PHYSICAL_NETWORK, NETWORK_TYPE, SEGMENTATION_ID @@ -77,7 +77,7 @@ limitations under the License. ) + parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity"> insert into network @@ -139,7 +139,7 @@ limitations under the License. + parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity"> update network @@ -170,7 +170,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity"> update network set NAME = #{name,jdbcType=VARCHAR}, TENANT_ID = #{tenantId,jdbcType=VARCHAR}, @@ -183,7 +183,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity"> update network diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/PortMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/PortMapper.xml index 765dcfe..5cdb358 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/PortMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/PortMapper.xml @@ -16,9 +16,9 @@ limitations under the License. --> - + + type="org.onap.vfc.nfvo.res.service.entity.PortEntity"> @@ -55,7 +55,7 @@ limitations under the License. where VIM_ID = #{vimId,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity"> insert into port (ID, NAME, NWTWORK_ID, STATUS, TENANT_ID, VIM_ID, VIM_NAME) values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, @@ -64,7 +64,7 @@ limitations under the License. , #{vimName,jdbcType=VARCHAR}) + parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity"> insert into port @@ -114,7 +114,7 @@ limitations under the License. + parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity"> update port @@ -139,7 +139,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity"> update port set NAME = #{name,jdbcType=VARCHAR}, NWTWORK_ID = #{networkId,jdbcType=VARCHAR}, @@ -150,7 +150,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity"> update port diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/SitesMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/SitesMapper.xml index 14f7b52..17fad53 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/SitesMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/SitesMapper.xml @@ -16,9 +16,9 @@ limitations under the License. --> - + + type="org.onap.vfc.nfvo.res.service.entity.SitesEntity"> @@ -70,7 +70,7 @@ limitations under the License. #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity"> insert into site (ID, NAME, LOCATION, COUNTRY, VIM_ID, VIM_NAME, STATUS,TOTAL_CPU, TOTAL_MEMORY, TOTAL_DISK, @@ -89,7 +89,7 @@ limitations under the License. #{usedDisk,jdbcType=VARCHAR}) + parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity"> insert into site @@ -175,7 +175,7 @@ limitations under the License. + parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity"> update site @@ -218,7 +218,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity"> update site set NAME = #{name,jdbcType=VARCHAR}, LOCATION @@ -240,7 +240,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity"> update site diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/VimMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/VimMapper.xml index e6f38ef..90d09ed 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/VimMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/VimMapper.xml @@ -16,9 +16,9 @@ limitations under the License. --> - + + type="org.onap.vfc.nfvo.res.service.entity.VimEntity"> @@ -45,7 +45,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} + parameterType="org.onap.vfc.nfvo.res.service.entity.VimEntity"> insert into vim (ID) values (#{id,jdbcType=VARCHAR}) diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/VirtualLinkMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/VirtualLinkMapper.xml index b4d2394..c73dbed 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/VirtualLinkMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/VirtualLinkMapper.xml @@ -15,8 +15,8 @@ limitations under the License. --> - - + + @@ -61,7 +61,7 @@ delete from vl where id = #{id,jdbcType=VARCHAR} - + insert into vl (id, name, backend_id, is_public, dc_name, vim_id, vim_name, physicial_net, ns_id, @@ -77,7 +77,7 @@ #{routerExternal,jdbcType=VARCHAR}, #{resourceProviderType,jdbcType=VARCHAR}, #{resourceProviderId,jdbcType=VARCHAR} ) - + insert into vl @@ -192,7 +192,7 @@ - + update vl @@ -249,7 +249,7 @@ where id = #{id,jdbcType=VARCHAR} - + update vl set name = #{name,jdbcType=VARCHAR}, backend_id = #{backendId,jdbcType=VARCHAR}, diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/VmMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/VmMapper.xml index dc2376c..6c5fd68 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/VmMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/VmMapper.xml @@ -15,8 +15,8 @@ limitations under the License. --> - - + + @@ -52,13 +52,13 @@ delete from vm where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR} - + insert into vm (vm_id, vm_name, vm_status, vnf_instance_id) values (#{vmId,jdbcType=VARCHAR}, #{vmName,jdbcType=VARCHAR}, #{vmStatus,jdbcType=VARCHAR}, #{vnfInstanceId,jdbcType=VARCHAR}) - + insert into vm @@ -89,7 +89,7 @@ - + update vm @@ -104,7 +104,7 @@ where vm_id = #{vmId,jdbcType=VARCHAR} - + update vm set vm_name = #{vmName,jdbcType=VARCHAR}, vm_status = #{vmStatus,jdbcType=VARCHAR}, diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfInfoMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfInfoMapper.xml index 135ccc1..e4220fb 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfInfoMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfInfoMapper.xml @@ -15,8 +15,8 @@ limitations under the License. --> - - + + @@ -44,13 +44,13 @@ delete from vnfinfo where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR} - + insert into vnfinfo (vnf_instance_id, ns_id, vnfm_id ) values (#{vnfInstanceId,jdbcType=VARCHAR}, #{nsId,jdbcType=VARCHAR}, #{vnfmId,jdbcType=VARCHAR} ) - + insert into vnfinfo @@ -75,7 +75,7 @@ - + update vnfinfo @@ -87,7 +87,7 @@ where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR} - + update vnfinfo set ns_id = #{nsId,jdbcType=VARCHAR}, vnfm_id = #{vnfmId,jdbcType=VARCHAR} diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfMapper.xml index cd187c3..bf36b81 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfMapper.xml @@ -15,8 +15,8 @@ limitations under the License. --> - - + + @@ -65,7 +65,7 @@ delete from vnf where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR} - + insert into vnf (id, vnf_instance_id, vnf_instance_name, ns_id, ns_name, vnfm_id, vnfm_name, vnf_package_name, vnf_descriptor_name, @@ -83,7 +83,7 @@ #{maxRam,jdbcType=INTEGER}, #{maxShd,jdbcType=INTEGER}, #{maxNet,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}) - + insert into vnf @@ -222,7 +222,7 @@ - + update vnf @@ -291,7 +291,7 @@ where id = #{id,jdbcType=VARCHAR} - + update vnf set vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR}, vnf_instance_name = #{vnfInstanceName,jdbcType=VARCHAR}, diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfStatusMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfStatusMapper.xml index 08a5101..a23a39e 100644 --- a/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfStatusMapper.xml +++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/VnfStatusMapper.xml @@ -15,8 +15,8 @@ limitations under the License. --> - - + + @@ -55,7 +55,7 @@ delete from vnfstatus where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR} - + insert into vnfstatus (vnf_instance_id, job_id, ns_id, vnfm_id, response_descriptor, status, progress, status_description, error_code, @@ -67,7 +67,7 @@ #{responseId,jdbcType=VARCHAR}, #{responseHistoryList,jdbcType=VARCHAR}, #{addVm,jdbcType=VARCHAR}, #{delVm,jdbcType=VARCHAR}) - + insert into vnfstatus @@ -152,7 +152,7 @@ - + update vnfstatus @@ -194,7 +194,7 @@ where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR} - + update vnfstatus set job_id = #{jobId,jdbcType=VARCHAR}, ns_id = #{nsId,jdbcType=VARCHAR}, diff --git a/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml b/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml index a24efd5..f08019e 100644 --- a/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml +++ b/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml @@ -66,217 +66,217 @@ + class="org.onap.vfc.nfvo.res.service.dao.impl.LocationDaoImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.LocationBusinessImpl"> + class="org.onap.vfc.nfvo.res.service.base.openstack.impl.LocationImpl"> - + + class="org.onap.vfc.nfvo.res.service.dao.impl.PortDaoImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.PortBusinessImpl"> + class="org.onap.vfc.nfvo.res.service.base.openstack.impl.PortImpl"> - + + class="org.onap.vfc.nfvo.res.service.dao.impl.HostDaoImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.HostBusinessImpl"> + class="org.onap.vfc.nfvo.res.service.base.openstack.impl.HostImpl"> - + + class="org.onap.vfc.nfvo.res.service.dao.impl.NetworkDaoImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.NetworkBusinessImpl"> + class="org.onap.vfc.nfvo.res.service.base.openstack.impl.NetworkImpl"> - + + class="org.onap.vfc.nfvo.res.service.dao.impl.SitesDaoImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.SitesBusinessImpl"> + class="org.onap.vfc.nfvo.res.service.base.openstack.impl.SitesImpl"> - + + class="org.onap.vfc.nfvo.res.service.dao.impl.VimDaoImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.VimBusinessImpl"> + class="org.onap.vfc.nfvo.res.service.base.openstack.impl.VimImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.LimitsBusinessImpl"> - + + class="org.onap.vfc.nfvo.res.service.dao.impl.VirtualLinkDaoImpl"> + class="org.onap.vfc.nfvo.res.service.group.impl.VirtualLinkServiceImpl"> - + + class="org.onap.vfc.nfvo.res.service.dao.impl.VnfDaoImpl"> + class="org.onap.vfc.nfvo.res.service.group.impl.VnfServiceImpl"> - + - + - + - + + class="org.onap.vfc.nfvo.res.service.dao.impl.VnfInfoDaoImpl"> + class="org.onap.vfc.nfvo.res.service.group.impl.VnfInfoServiceImpl"> - + - + - + - + - + - + + class="org.onap.vfc.nfvo.res.service.group.impl.ResOperateServiceImpl"> @@ -288,22 +288,22 @@ + class="org.onap.vfc.nfvo.res.service.group.impl.IResourceUpdateServiceImpl"> + class="org.onap.vfc.nfvo.res.service.group.impl.IResourceAddServiceImpl"> + class="org.onap.vfc.nfvo.res.service.group.impl.IResourceDelServiceImpl"> - + - + @@ -324,8 +324,8 @@ - - + + diff --git a/ResmanagementService/service/src/main/resources/spring/Resmanagement/svc_register.xml b/ResmanagementService/service/src/main/resources/spring/Resmanagement/svc_register.xml index 38394ae..9133d04 100644 --- a/ResmanagementService/service/src/main/resources/spring/Resmanagement/svc_register.xml +++ b/ResmanagementService/service/src/main/resources/spring/Resmanagement/svc_register.xml @@ -37,6 +37,6 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"> - - + + \ No newline at end of file -- cgit 1.2.3-korg