diff options
Diffstat (limited to 'ResmanagementService/service/src/main/resources')
13 files changed, 119 insertions, 119 deletions
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. --> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="org.openo.nfvo.resmanagement.service.mapper.HostMapper"> +<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.HostMapper"> <resultMap id="BaseResultMap" - type="org.openo.nfvo.resmanagement.service.entity.HostEntity"> + type="org.onap.vfc.nfvo.res.service.entity.HostEntity"> <id column="ID" property="id" jdbcType="VARCHAR" /> <result column="NAME" property="name" jdbcType="VARCHAR" /> <result column="CPU" property="cpu" jdbcType="VARCHAR" /> @@ -58,7 +58,7 @@ limitations under the License. where VIM_ID = #{vimId,jdbcType=VARCHAR} </delete> <insert id="addHost" - parameterType="org.openo.nfvo.resmanagement.service.entity.HostEntity"> + 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}) </insert> <insert id="addHostSelective" - parameterType="org.openo.nfvo.resmanagement.service.entity.HostEntity"> + parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity"> insert into host <trim prefix="(" suffix=")" suffixOverrides=","> <if test="id != null"> @@ -116,7 +116,7 @@ limitations under the License. </trim> </insert> <update id="updateHostSelective" - parameterType="org.openo.nfvo.resmanagement.service.entity.HostEntity"> + parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity"> update host <set> <if test="name != null"> @@ -148,7 +148,7 @@ limitations under the License. </where> </update> <update id="updateHost" - parameterType="org.openo.nfvo.resmanagement.service.entity.HostEntity"> + 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} </update> <update id="updateHostByVimId" - parameterType="org.openo.nfvo.resmanagement.service.entity.HostEntity"> + parameterType="org.onap.vfc.nfvo.res.service.entity.HostEntity"> update host <set> <if test="id != null"> 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. --> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="org.openo.nfvo.resmanagement.service.mapper.LocationMapper"> +<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.LocationMapper"> <resultMap id="BaseResultMap" - type="org.openo.nfvo.resmanagement.service.entity.LocationEntity"> + type="org.onap.vfc.nfvo.res.service.entity.LocationEntity"> <id column="ID" property="id" jdbcType="VARCHAR" /> <result column="COUNTRY" property="country" jdbcType="VARCHAR" /> @@ -68,7 +68,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} </delete> <insert id="addLocation" - parameterType="org.openo.nfvo.resmanagement.service.entity.LocationEntity"> + 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}) </insert> <insert id="addLocationSelective" - parameterType="org.openo.nfvo.resmanagement.service.entity.LocationEntity"> + parameterType="org.onap.vfc.nfvo.res.service.entity.LocationEntity"> insert into location <trim prefix="(" suffix=")" suffixOverrides=","> @@ -122,7 +122,7 @@ limitations under the License. </trim> </insert> <update id="updateLocationSelective" - parameterType="org.openo.nfvo.resmanagement.service.entity.LocationEntity"> + parameterType="org.onap.vfc.nfvo.res.service.entity.LocationEntity"> update location <set> @@ -145,7 +145,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} </update> <update id="updateLocation" - parameterType="org.openo.nfvo.resmanagement.service.entity.LocationEntity"> + 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. --> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="org.openo.nfvo.resmanagement.service.mapper.NetworkMapper"> +<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.NetworkMapper"> <resultMap id="BaseResultMap" - type="org.openo.nfvo.resmanagement.service.entity.NetworkEntity"> + type="org.onap.vfc.nfvo.res.service.entity.NetworkEntity"> <id column="ID" property="id" jdbcType="VARCHAR" /> <result column="NAME" property="name" jdbcType="VARCHAR" /> <result column="TENANT_ID" property="tenantId" jdbcType="VARCHAR" /> @@ -64,7 +64,7 @@ limitations under the License. where VIM_ID = #{vimId,jdbcType=VARCHAR} </delete> <insert id="addNetwork" - parameterType="org.openo.nfvo.resmanagement.service.entity.NetworkEntity"> + 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. ) </insert> <insert id="addNetworkSelective" - parameterType="org.openo.nfvo.resmanagement.service.entity.NetworkEntity"> + parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity"> insert into network <trim prefix="(" suffix=")" suffixOverrides=","> <if test="id != null"> @@ -139,7 +139,7 @@ limitations under the License. </trim> </insert> <update id="updateNetworkSelective" - parameterType="org.openo.nfvo.resmanagement.service.entity.NetworkEntity"> + parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity"> update network <set> <if test="name != null"> @@ -170,7 +170,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} </update> <update id="updateNetwork" - parameterType="org.openo.nfvo.resmanagement.service.entity.NetworkEntity"> + 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} </update> <update id="updateNetworkByVimId" - parameterType="org.openo.nfvo.resmanagement.service.entity.NetworkEntity"> + parameterType="org.onap.vfc.nfvo.res.service.entity.NetworkEntity"> update network <set> <if test="id != null"> 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. --> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="org.openo.nfvo.resmanagement.service.mapper.PortMapper"> +<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.PortMapper"> <resultMap id="BaseResultMap" - type="org.openo.nfvo.resmanagement.service.entity.PortEntity"> + type="org.onap.vfc.nfvo.res.service.entity.PortEntity"> <id column="ID" property="id" jdbcType="VARCHAR" /> <result column="NAME" property="name" jdbcType="VARCHAR" /> <result column="NWTWORK_ID" property="networkId" jdbcType="VARCHAR" /> @@ -55,7 +55,7 @@ limitations under the License. where VIM_ID = #{vimId,jdbcType=VARCHAR} </delete> <insert id="addPort" - parameterType="org.openo.nfvo.resmanagement.service.entity.PortEntity"> + 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}) </insert> <insert id="addPortSelective" - parameterType="org.openo.nfvo.resmanagement.service.entity.PortEntity"> + parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity"> insert into port <trim prefix="(" suffix=")" suffixOverrides=","> <if test="id != null"> @@ -114,7 +114,7 @@ limitations under the License. </trim> </insert> <update id="updatePortSelective" - parameterType="org.openo.nfvo.resmanagement.service.entity.PortEntity"> + parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity"> update port <set> <if test="name != null"> @@ -139,7 +139,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} </update> <update id="updatePort" - parameterType="org.openo.nfvo.resmanagement.service.entity.PortEntity"> + 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} </update> <update id="updatePortByVimId" - parameterType="org.openo.nfvo.resmanagement.service.entity.PortEntity"> + parameterType="org.onap.vfc.nfvo.res.service.entity.PortEntity"> update port <set> <if test="id != null"> 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. --> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="org.openo.nfvo.resmanagement.service.mapper.SitesMapper"> +<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.SitesMapper"> <resultMap id="BaseResultMap" - type="org.openo.nfvo.resmanagement.service.entity.SitesEntity"> + type="org.onap.vfc.nfvo.res.service.entity.SitesEntity"> <id column="ID" property="id" jdbcType="VARCHAR" /> <result column="NAME" property="name" jdbcType="VARCHAR" /> <result column="LOCATION" property="location" jdbcType="VARCHAR" /> @@ -70,7 +70,7 @@ limitations under the License. #{id,jdbcType=VARCHAR} </delete> <insert id="addSite" - parameterType="org.openo.nfvo.resmanagement.service.entity.SitesEntity"> + 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}) </insert> <insert id="addSiteSelective" - parameterType="org.openo.nfvo.resmanagement.service.entity.SitesEntity"> + parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity"> insert into site <trim prefix="(" suffix=")" suffixOverrides=","> <if test="id != null"> @@ -175,7 +175,7 @@ limitations under the License. </trim> </insert> <update id="updateSiteSelective" - parameterType="org.openo.nfvo.resmanagement.service.entity.SitesEntity"> + parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity"> update site <set> <if test="name != null"> @@ -218,7 +218,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} </update> <update id="updateSite" - parameterType="org.openo.nfvo.resmanagement.service.entity.SitesEntity"> + 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} </update> <update id="updateSiteByVimId" - parameterType="org.openo.nfvo.resmanagement.service.entity.SitesEntity"> + parameterType="org.onap.vfc.nfvo.res.service.entity.SitesEntity"> update site <set> <if test="id != null"> 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. --> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="org.openo.nfvo.resmanagement.service.mapper.VimMapper"> +<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.VimMapper"> <resultMap id="BaseResultMap" - type="org.openo.nfvo.resmanagement.service.entity.VimEntity"> + type="org.onap.vfc.nfvo.res.service.entity.VimEntity"> <id column="ID" property="id" jdbcType="VARCHAR" /> </resultMap> <sql id="Base_Column_List"> @@ -45,7 +45,7 @@ limitations under the License. where ID = #{id,jdbcType=VARCHAR} </delete> <insert id="addVim" - parameterType="org.openo.nfvo.resmanagement.service.entity.VimEntity"> + parameterType="org.onap.vfc.nfvo.res.service.entity.VimEntity"> insert into vim (ID) values (#{id,jdbcType=VARCHAR}) </insert> 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. --> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="org.openo.nfvo.resmanagement.service.mapper.VirtualLinkMapper" > - <resultMap id="BaseResultMap" type="org.openo.nfvo.resmanagement.service.entity.VirtualLinkEntity" > +<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.VirtualLinkMapper" > + <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity" > <id column="id" property="id" jdbcType="VARCHAR" /> <result column="name" property="name" jdbcType="VARCHAR" /> <result column="backend_id" property="backendId" jdbcType="VARCHAR" /> @@ -61,7 +61,7 @@ delete from vl where id = #{id,jdbcType=VARCHAR} </delete> - <insert id="insert" parameterType="org.openo.nfvo.resmanagement.service.entity.VirtualLinkEntity" > + <insert id="insert" parameterType="org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity" > insert into vl (id, name, backend_id, is_public, dc_name, vim_id, vim_name, physicial_net, ns_id, @@ -77,7 +77,7 @@ #{routerExternal,jdbcType=VARCHAR}, #{resourceProviderType,jdbcType=VARCHAR}, #{resourceProviderId,jdbcType=VARCHAR} ) </insert> - <insert id="insertSelective" parameterType="org.openo.nfvo.resmanagement.service.entity.VirtualLinkEntity" > + <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity" > insert into vl <trim prefix="(" suffix=")" suffixOverrides="," > <if test="id != null" > @@ -192,7 +192,7 @@ </if> </trim> </insert> - <update id="updateByPrimaryKeySelective" parameterType="org.openo.nfvo.resmanagement.service.entity.VirtualLinkEntity" > + <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity" > update vl <set > <if test="name != null" > @@ -249,7 +249,7 @@ </set> where id = #{id,jdbcType=VARCHAR} </update> - <update id="updateByPrimaryKey" parameterType="org.openo.nfvo.resmanagement.service.entity.VirtualLinkEntity" > + <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.res.service.entity.VirtualLinkEntity" > 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. --> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="org.openo.nfvo.resmanagement.service.mapper.VmMapper" > - <resultMap id="BaseResultMap" type="org.openo.nfvo.resmanagement.service.entity.VmEntity" > +<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.VmMapper" > + <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.res.service.entity.VmEntity" > <id column="vm_id" property="vmId" jdbcType="VARCHAR" /> <result column="vm_name" property="vmName" jdbcType="VARCHAR" /> <result column="vm_status" property="vmStatus" jdbcType="VARCHAR" /> @@ -52,13 +52,13 @@ delete from vm where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR} </delete> - <insert id="insert" parameterType="org.openo.nfvo.resmanagement.service.entity.VmEntity" > + <insert id="insert" parameterType="org.onap.vfc.nfvo.res.service.entity.VmEntity" > insert into vm (vm_id, vm_name, vm_status, vnf_instance_id) values (#{vmId,jdbcType=VARCHAR}, #{vmName,jdbcType=VARCHAR}, #{vmStatus,jdbcType=VARCHAR}, #{vnfInstanceId,jdbcType=VARCHAR}) </insert> - <insert id="insertSelective" parameterType="org.openo.nfvo.resmanagement.service.entity.VmEntity" > + <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VmEntity" > insert into vm <trim prefix="(" suffix=")" suffixOverrides="," > <if test="vmId != null" > @@ -89,7 +89,7 @@ </if> </trim> </insert> - <update id="updateByPrimaryKeySelective" parameterType="org.openo.nfvo.resmanagement.service.entity.VmEntity" > + <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VmEntity" > update vm <set > <if test="vmName != null" > @@ -104,7 +104,7 @@ </set> where vm_id = #{vmId,jdbcType=VARCHAR} </update> - <update id="updateByPrimaryKey" parameterType="org.openo.nfvo.resmanagement.service.entity.VmEntity" > + <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.res.service.entity.VmEntity" > 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. --> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="org.openo.nfvo.resmanagement.service.mapper.VnfInfoMapper" > - <resultMap id="BaseResultMap" type="org.openo.nfvo.resmanagement.service.entity.VnfInfoEntity" > +<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.VnfInfoMapper" > + <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity" > <id column="vnf_instance_id" property="vnfInstanceId" jdbcType="VARCHAR" /> <result column="ns_id" property="nsId" jdbcType="VARCHAR" /> <result column="vnfm_id" property="vnfmId" jdbcType="VARCHAR" /> @@ -44,13 +44,13 @@ delete from vnfinfo where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR} </delete> - <insert id="insert" parameterType="org.openo.nfvo.resmanagement.service.entity.VnfInfoEntity" > + <insert id="insert" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity" > insert into vnfinfo (vnf_instance_id, ns_id, vnfm_id ) values (#{vnfInstanceId,jdbcType=VARCHAR}, #{nsId,jdbcType=VARCHAR}, #{vnfmId,jdbcType=VARCHAR} ) </insert> - <insert id="insertSelective" parameterType="org.openo.nfvo.resmanagement.service.entity.VnfInfoEntity" > + <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity" > insert into vnfinfo <trim prefix="(" suffix=")" suffixOverrides="," > <if test="vnfInstanceId != null" > @@ -75,7 +75,7 @@ </if> </trim> </insert> - <update id="updateByPrimaryKeySelective" parameterType="org.openo.nfvo.resmanagement.service.entity.VnfInfoEntity" > + <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity" > update vnfinfo <set > <if test="nsId != null" > @@ -87,7 +87,7 @@ </set> where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR} </update> - <update id="updateByPrimaryKey" parameterType="org.openo.nfvo.resmanagement.service.entity.VnfInfoEntity" > + <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfInfoEntity" > 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. --> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="org.openo.nfvo.resmanagement.service.mapper.VnfMapper" > - <resultMap id="BaseResultMap" type="org.openo.nfvo.resmanagement.service.entity.VnfEntity" > +<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.VnfMapper" > + <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.res.service.entity.VnfEntity" > <id column="id" property="id" jdbcType="VARCHAR" /> <result column="vnf_instance_id" property="vnfInstanceId" jdbcType="VARCHAR" /> <result column="vnf_instance_name" property="vnfInstanceName" jdbcType="VARCHAR" /> @@ -65,7 +65,7 @@ delete from vnf where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR} </delete> - <insert id="insert" parameterType="org.openo.nfvo.resmanagement.service.entity.VnfEntity" > + <insert id="insert" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfEntity" > insert into vnf (id, vnf_instance_id, vnf_instance_name, ns_id, ns_name, vnfm_id, vnfm_name, vnf_package_name, vnf_descriptor_name, @@ -83,7 +83,7 @@ #{maxRam,jdbcType=INTEGER}, #{maxShd,jdbcType=INTEGER}, #{maxNet,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}) </insert> - <insert id="insertSelective" parameterType="org.openo.nfvo.resmanagement.service.entity.VnfEntity" > + <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfEntity" > insert into vnf <trim prefix="(" suffix=")" suffixOverrides="," > <if test="id != null" > @@ -222,7 +222,7 @@ </if> </trim> </insert> - <update id="updateByPrimaryKeySelective" parameterType="org.openo.nfvo.resmanagement.service.entity.VnfEntity" > + <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfEntity" > update vnf <set > <if test="vnfInstanceId != null" > @@ -291,7 +291,7 @@ </set> where id = #{id,jdbcType=VARCHAR} </update> - <update id="updateByPrimaryKey" parameterType="org.openo.nfvo.resmanagement.service.entity.VnfEntity" > + <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfEntity" > 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. --> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > -<mapper namespace="org.openo.nfvo.resmanagement.service.mapper.VnfStatusMapper" > - <resultMap id="BaseResultMap" type="org.openo.nfvo.resmanagement.service.entity.VnfStatusEntity" > +<mapper namespace="org.onap.vfc.nfvo.res.service.mapper.VnfStatusMapper" > + <resultMap id="BaseResultMap" type="org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity" > <id column="vnf_instance_id" property="vnfInstanceId" jdbcType="VARCHAR" /> <result column="job_id" property="jobId" jdbcType="VARCHAR" /> <result column="ns_id" property="nsId" jdbcType="VARCHAR" /> @@ -55,7 +55,7 @@ delete from vnfstatus where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR} </delete> - <insert id="insert" parameterType="org.openo.nfvo.resmanagement.service.entity.VnfStatusEntity" > + <insert id="insert" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity" > insert into vnfstatus (vnf_instance_id, job_id, ns_id, vnfm_id, response_descriptor, status, progress, status_description, error_code, @@ -67,7 +67,7 @@ #{responseId,jdbcType=VARCHAR}, #{responseHistoryList,jdbcType=VARCHAR}, #{addVm,jdbcType=VARCHAR}, #{delVm,jdbcType=VARCHAR}) </insert> - <insert id="insertSelective" parameterType="org.openo.nfvo.resmanagement.service.entity.VnfStatusEntity" > + <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity" > insert into vnfstatus <trim prefix="(" suffix=")" suffixOverrides="," > <if test="vnfInstanceId != null" > @@ -152,7 +152,7 @@ </if> </trim> </insert> - <update id="updateByPrimaryKeySelective" parameterType="org.openo.nfvo.resmanagement.service.entity.VnfStatusEntity" > + <update id="updateByPrimaryKeySelective" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity" > update vnfstatus <set > <if test="jobId != null" > @@ -194,7 +194,7 @@ </set> where vnf_instance_id = #{vnfInstanceId,jdbcType=VARCHAR} </update> - <update id="updateByPrimaryKey" parameterType="org.openo.nfvo.resmanagement.service.entity.VnfStatusEntity" > + <update id="updateByPrimaryKey" parameterType="org.onap.vfc.nfvo.res.service.entity.VnfStatusEntity" > 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 @@ <!--location --> <bean id="locationDao" - class="org.openo.nfvo.resmanagement.service.dao.impl.LocationDaoImpl"> + class="org.onap.vfc.nfvo.res.service.dao.impl.LocationDaoImpl"> <property name="session" ref="session"></property> </bean> <bean id="locationBusiness" - class="org.openo.nfvo.resmanagement.service.business.impl.LocationBusinessImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.LocationBusinessImpl"> <property name="locationDao" ref="locationDao"></property> </bean> <bean id="location" - class="org.openo.nfvo.resmanagement.service.base.openstack.impl.LocationImpl"> + class="org.onap.vfc.nfvo.res.service.base.openstack.impl.LocationImpl"> <property name="locationBusiness" ref="locationBusiness"></property> </bean> - <bean id="locationRoa" class="org.openo.nfvo.resmanagement.service.rest.LocationRoa"> + <bean id="locationRoa" class="org.onap.vfc.nfvo.res.service.rest.LocationRoa"> <property name="location" ref="location"></property> <property name="sites" ref="sites"></property> </bean> <!--port --> <bean id="portDao" - class="org.openo.nfvo.resmanagement.service.dao.impl.PortDaoImpl"> + class="org.onap.vfc.nfvo.res.service.dao.impl.PortDaoImpl"> <property name="session" ref="session"></property> </bean> <bean id="portBusiness" - class="org.openo.nfvo.resmanagement.service.business.impl.PortBusinessImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.PortBusinessImpl"> <property name="portDao" ref="portDao"></property> </bean> <bean id="port" - class="org.openo.nfvo.resmanagement.service.base.openstack.impl.PortImpl"> + class="org.onap.vfc.nfvo.res.service.base.openstack.impl.PortImpl"> <property name="portBusiness" ref="portBusiness"></property> </bean> - <bean id="portRoa" class="org.openo.nfvo.resmanagement.service.rest.PortRoa"> + <bean id="portRoa" class="org.onap.vfc.nfvo.res.service.rest.PortRoa"> <property name="port" ref="port"></property> </bean> <!--host --> <bean id="hostDao" - class="org.openo.nfvo.resmanagement.service.dao.impl.HostDaoImpl"> + class="org.onap.vfc.nfvo.res.service.dao.impl.HostDaoImpl"> <property name="session" ref="session"></property> </bean> <bean id="hostBusiness" - class="org.openo.nfvo.resmanagement.service.business.impl.HostBusinessImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.HostBusinessImpl"> <property name="hostDao" ref="hostDao"></property> </bean> <bean id="host" - class="org.openo.nfvo.resmanagement.service.base.openstack.impl.HostImpl"> + class="org.onap.vfc.nfvo.res.service.base.openstack.impl.HostImpl"> <property name="hostBusiness" ref="hostBusiness"></property> </bean> - <bean id="hostRoa" class="org.openo.nfvo.resmanagement.service.rest.HostRoa"> + <bean id="hostRoa" class="org.onap.vfc.nfvo.res.service.rest.HostRoa"> <property name="host" ref="host"></property> </bean> <!--network --> <bean id="networkDao" - class="org.openo.nfvo.resmanagement.service.dao.impl.NetworkDaoImpl"> + class="org.onap.vfc.nfvo.res.service.dao.impl.NetworkDaoImpl"> <property name="session" ref="session"></property> </bean> <bean id="networkBusiness" - class="org.openo.nfvo.resmanagement.service.business.impl.NetworkBusinessImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.NetworkBusinessImpl"> <property name="networkDao" ref="networkDao"></property> </bean> <bean id="network" - class="org.openo.nfvo.resmanagement.service.base.openstack.impl.NetworkImpl"> + class="org.onap.vfc.nfvo.res.service.base.openstack.impl.NetworkImpl"> <property name="networkBusiness" ref="networkBusiness"></property> </bean> - <bean id="networkRoa" class="org.openo.nfvo.resmanagement.service.rest.NetworkRoa"> + <bean id="networkRoa" class="org.onap.vfc.nfvo.res.service.rest.NetworkRoa"> <property name="network" ref="network"></property> </bean> <!--sites --> <bean id="sitesDao" - class="org.openo.nfvo.resmanagement.service.dao.impl.SitesDaoImpl"> + class="org.onap.vfc.nfvo.res.service.dao.impl.SitesDaoImpl"> <property name="session" ref="session"></property> </bean> <bean id="sitesBusiness" - class="org.openo.nfvo.resmanagement.service.business.impl.SitesBusinessImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.SitesBusinessImpl"> <property name="sitesDao" ref="sitesDao"></property> </bean> <bean id="sites" - class="org.openo.nfvo.resmanagement.service.base.openstack.impl.SitesImpl"> + class="org.onap.vfc.nfvo.res.service.base.openstack.impl.SitesImpl"> <property name="sitesBusiness" ref="sitesBusiness"></property> <property name="limitsBusiness" ref="limitsBusiness"></property> <property name="resOperateService" ref="resOperateService"></property> </bean> - <bean id="sitesRoa" class="org.openo.nfvo.resmanagement.service.rest.SitesRoa"> + <bean id="sitesRoa" class="org.onap.vfc.nfvo.res.service.rest.SitesRoa"> <property name="sites" ref="sites"></property> </bean> <!--vim --> <bean id="vimDao" - class="org.openo.nfvo.resmanagement.service.dao.impl.VimDaoImpl"> + class="org.onap.vfc.nfvo.res.service.dao.impl.VimDaoImpl"> <property name="session" ref="session"></property> </bean> <bean id="vimBusiness" - class="org.openo.nfvo.resmanagement.service.business.impl.VimBusinessImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.VimBusinessImpl"> <property name="vimDao" ref="vimDao"></property> </bean> <bean id="vim" - class="org.openo.nfvo.resmanagement.service.base.openstack.impl.VimImpl"> + class="org.onap.vfc.nfvo.res.service.base.openstack.impl.VimImpl"> <property name="vimBusiness" ref="vimBusiness"></property> </bean> <!-- limits --> <bean id="limitsBusiness" - class="org.openo.nfvo.resmanagement.service.business.impl.LimitsBusinessImpl"> + class="org.onap.vfc.nfvo.res.service.business.impl.LimitsBusinessImpl"> </bean> - <bean id="limitsRoa" class="org.openo.nfvo.resmanagement.service.rest.LimitsRoa"> + <bean id="limitsRoa" class="org.onap.vfc.nfvo.res.service.rest.LimitsRoa"> <property name="limitsBusiness" ref="limitsBusiness"></property> </bean> <!-- vl --> <bean id="virtualLinkDao" - class="org.openo.nfvo.resmanagement.service.dao.impl.VirtualLinkDaoImpl"> + class="org.onap.vfc.nfvo.res.service.dao.impl.VirtualLinkDaoImpl"> <property name="session" ref="session"></property> </bean> <bean id="virtualLink" - class="org.openo.nfvo.resmanagement.service.group.impl.VirtualLinkServiceImpl"> + class="org.onap.vfc.nfvo.res.service.group.impl.VirtualLinkServiceImpl"> <property name="virtualLinkDao" ref="virtualLinkDao"></property> </bean> - <bean id="virtualLinkRoa" class="org.openo.nfvo.resmanagement.service.rest.VirtualLinkRoa"> + <bean id="virtualLinkRoa" class="org.onap.vfc.nfvo.res.service.rest.VirtualLinkRoa"> <property name="virtualLink" ref="virtualLink"></property> </bean> <!-- vnf --> <bean id="vnfDao" - class="org.openo.nfvo.resmanagement.service.dao.impl.VnfDaoImpl"> + class="org.onap.vfc.nfvo.res.service.dao.impl.VnfDaoImpl"> <property name="session" ref="session"></property> </bean> <bean id="vnfService" - class="org.openo.nfvo.resmanagement.service.group.impl.VnfServiceImpl"> + class="org.onap.vfc.nfvo.res.service.group.impl.VnfServiceImpl"> <property name="vnfDao" ref="vnfDao"></property> <property name="vnfInfoService" ref="vnfInfoService"></property> </bean> - <bean id="vnfRoa" class="org.openo.nfvo.resmanagement.service.rest.VnfRoa"> + <bean id="vnfRoa" class="org.onap.vfc.nfvo.res.service.rest.VnfRoa"> <property name="vnfService" ref="vnfService"></property> </bean> <!-- vm --> - <bean id="vmDao" class="org.openo.nfvo.resmanagement.service.dao.impl.VmDaoImpl"> + <bean id="vmDao" class="org.onap.vfc.nfvo.res.service.dao.impl.VmDaoImpl"> <property name="session" ref="session"></property> </bean> - <bean id="vmService" class="org.openo.nfvo.resmanagement.service.group.impl.VmServiceImpl"> + <bean id="vmService" class="org.onap.vfc.nfvo.res.service.group.impl.VmServiceImpl"> <property name="vmDao" ref="vmDao"></property> </bean> - <bean id="vmRoa" class="org.openo.nfvo.resmanagement.service.rest.VmRoa"> + <bean id="vmRoa" class="org.onap.vfc.nfvo.res.service.rest.VmRoa"> <property name="vmService" ref="vmService"></property> </bean> <!-- vnfInfo --> <bean id="vnfInfoDao" - class="org.openo.nfvo.resmanagement.service.dao.impl.VnfInfoDaoImpl"> + class="org.onap.vfc.nfvo.res.service.dao.impl.VnfInfoDaoImpl"> <property name="session" ref="session"></property> </bean> <bean id="vnfInfoService" - class="org.openo.nfvo.resmanagement.service.group.impl.VnfInfoServiceImpl"> + class="org.onap.vfc.nfvo.res.service.group.impl.VnfInfoServiceImpl"> <property name="vnfInfoDao" ref="vnfInfoDao"></property> <property name="vmService" ref="vmService"></property> </bean> - <bean id="vnfInfoRoa" class="org.openo.nfvo.resmanagement.service.rest.VnfInfoRoa"> + <bean id="vnfInfoRoa" class="org.onap.vfc.nfvo.res.service.rest.VnfInfoRoa"> <property name="vnfInfoService" ref="vnfInfoService"></property> </bean> <!-- vnfstatus --> - <bean id="vnfStatusDao" class="org.openo.nfvo.resmanagement.service.dao.impl.VnfStatusDaoImpl"> + <bean id="vnfStatusDao" class="org.onap.vfc.nfvo.res.service.dao.impl.VnfStatusDaoImpl"> <property name="session" ref="session"></property> </bean> - <bean id="vnfStatusService" class="org.openo.nfvo.resmanagement.service.group.impl.VnfStatusServiceImpl"> + <bean id="vnfStatusService" class="org.onap.vfc.nfvo.res.service.group.impl.VnfStatusServiceImpl"> <property name="vnfStatusDao" ref="vnfStatusDao"></property> </bean> - <bean id="vnfStatusRoa" class="org.openo.nfvo.resmanagement.service.rest.VnfStatusRoa"> + <bean id="vnfStatusRoa" class="org.onap.vfc.nfvo.res.service.rest.VnfStatusRoa"> <property name="vnfStatusService" ref="vnfStatusService"></property> </bean> <!-- grantResource --> - <bean id="grantResService" class="org.openo.nfvo.resmanagement.service.group.impl.GrantResServiceImpl"> + <bean id="grantResService" class="org.onap.vfc.nfvo.res.service.group.impl.GrantResServiceImpl"> <property name="sites" ref="sites"></property> </bean> - <bean id="grantResourseRoa" class="org.openo.nfvo.resmanagement.service.rest.GrantResourseRoa"> + <bean id="grantResourseRoa" class="org.onap.vfc.nfvo.res.service.rest.GrantResourseRoa"> <property name="grantResService" ref="grantResService"></property> </bean> <!--group_resoperate --> <bean id="resOperateService" - class="org.openo.nfvo.resmanagement.service.group.impl.ResOperateServiceImpl"> + class="org.onap.vfc.nfvo.res.service.group.impl.ResOperateServiceImpl"> <property name="host" ref="host"></property> <property name="port" ref="port"></property> <property name="sites" ref="sites"></property> @@ -288,22 +288,22 @@ </bean> <bean id="iResourceUpdateServiceImpl" - class="org.openo.nfvo.resmanagement.service.group.impl.IResourceUpdateServiceImpl"> + class="org.onap.vfc.nfvo.res.service.group.impl.IResourceUpdateServiceImpl"> </bean> <bean id="iResourceAddServiceImpl" - class="org.openo.nfvo.resmanagement.service.group.impl.IResourceAddServiceImpl"> + class="org.onap.vfc.nfvo.res.service.group.impl.IResourceAddServiceImpl"> </bean> <bean id="iResourceDelServiceImpl" - class="org.openo.nfvo.resmanagement.service.group.impl.IResourceDelServiceImpl"> + class="org.onap.vfc.nfvo.res.service.group.impl.IResourceDelServiceImpl"> </bean> - <bean id="resOperateRoa" class="org.openo.nfvo.resmanagement.service.rest.ResOperateRoa"> + <bean id="resOperateRoa" class="org.onap.vfc.nfvo.res.service.rest.ResOperateRoa"> <property name="resOperateService" ref="resOperateService"></property> </bean> - <bean id="SwaggerRoa" class="org.openo.nfvo.resmanagement.service.rest.SwaggerRoa"></bean> + <bean id="SwaggerRoa" class="org.onap.vfc.nfvo.res.service.rest.SwaggerRoa"></bean> <jaxrs:server id="restContainer" address="/"> <jaxrs:serviceBeans> @@ -324,8 +324,8 @@ </jaxrs:serviceBeans> <jaxrs:providers> <ref bean="jsonProvider" /> - <bean class="org.openo.nfvo.resmanagement.service.rest.exceptionmapper.ServiceExceptionMapper" /> - <bean class="org.openo.nfvo.resmanagement.service.rest.exceptionmapper.GenericExceptionMapper" /> + <bean class="org.onap.vfc.nfvo.res.service.rest.exceptionmapper.ServiceExceptionMapper" /> + <bean class="org.onap.vfc.nfvo.res.service.rest.exceptionmapper.GenericExceptionMapper" /> </jaxrs:providers> </jaxrs:server> </beans> 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"> - <bean class="org.openo.nfvo.resmanagement.service.activator.ROAResmgrServicePostProcessor"></bean> - <bean class="org.openo.nfvo.resmanagement.service.adapter.impl.ResmgrAdapterMgrService"></bean> + <bean class="org.onap.vfc.nfvo.res.service.activator.ROAResmgrServicePostProcessor"></bean> + <bean class="org.onap.vfc.nfvo.res.service.adapter.impl.ResmgrAdapterMgrService"></bean> </beans>
\ No newline at end of file |