Modify field name

Modify vfc resmanagement field name and add ns url

Change-Id: I6510ea8fc80dc8cbfe29400ea0d5b12d4043f723
Issue-Id:VFC-216
Signed-off-by: luxin <luxin7@huawei.com>

diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/UrlConstant.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/UrlConstant.java
index 1aa50c1..3abb3c4 100644 (file)
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/UrlConstant.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/UrlConstant.java
@@ -71,6 +71,11 @@ public class UrlConstant {
      */
     public static final String VNF_URL = "/v1/vnf";
 
+    /**
+     * ns url
+     */
+    public static final String NS_URL = "/v1/ns";
+
     /**
      * vnfinfo url.
      */

diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java
index f403aa0..a8256f1 100644 (file)
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java
@@ -34,7 +34,6 @@ import org.onap.vfc.nfvo.resmanagement.service.adapter.inf.IResmgrAdapterMgrServ
 import org.openo.baseservice.util.impl.SystemEnvVariablesFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
 
 import net.sf.json.JSONObject;
 
@@ -46,7 +45,6 @@ import net.sf.json.JSONObject;
  * @author
  * @version NFVO 0.5 Sep 22, 2016
  */
-@Service
 public class ResmgrAdapterMgrService implements IResmgrAdapterMgrService {
 
     private static final Logger LOG = LoggerFactory.getLogger(ResmgrAdapterMgrService.class);

diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/NsEntity.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/NsEntity.java
index a413134..adc61c7 100644 (file)
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/NsEntity.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/NsEntity.java
@@ -49,7 +49,7 @@ public class NsEntity implements Serializable {
     private String status;\r
 \r
     /**  */\r
-    private String cteateTime;\r
+    private String createTime;\r
 \r
     /**  */\r
     private String lastUpdate;\r
@@ -96,12 +96,12 @@ public class NsEntity implements Serializable {
         this.status = status;\r
     }\r
 \r
-    public String getCteateTime() {\r
-        return cteateTime;\r
+    public String getCreateTime() {\r
+        return createTime;\r
     }\r
 \r
-    public void setCteateTime(String cteateTime) {\r
-        this.cteateTime = cteateTime;\r
+    public void setCreateTime(String createTime) {\r
+        this.createTime = createTime;\r
     }\r
 \r
     public String getLastUpdate() {\r
@@ -119,7 +119,7 @@ public class NsEntity implements Serializable {
         nsEntity.setNsdId(JsonUtil.getJsonFieldStr(jsonObject, "nsdId"));\r
         nsEntity.setDescription(JsonUtil.getJsonFieldStr(jsonObject, "description"));\r
         nsEntity.setStatus(JsonUtil.getJsonFieldStr(jsonObject, "status"));\r
-        nsEntity.setCteateTime(JsonUtil.getJsonFieldStr(jsonObject, "cteateTime"));\r
+        nsEntity.setCreateTime(JsonUtil.getJsonFieldStr(jsonObject, "createTime"));\r
         nsEntity.setLastUpdate(JsonUtil.getJsonFieldStr(jsonObject, "lastUpdate"));\r
         return nsEntity;\r
     }\r
@@ -132,7 +132,7 @@ public class NsEntity implements Serializable {
         nsResJson.put("nsdId", StringUtils.trimToEmpty(this.getNsdId()));\r
         nsResJson.put("description", StringUtils.trimToEmpty(this.getDescription()));\r
         nsResJson.put("status", StringUtils.trimToEmpty(this.getStatus()));\r
-        nsResJson.put("cteateTime", StringUtils.trimToEmpty(this.getCteateTime()));\r
+        nsResJson.put("createTime", StringUtils.trimToEmpty(this.getCreateTime()));\r
         nsResJson.put("lastUpdate", StringUtils.trimToEmpty(this.getLastUpdate()));\r
         return nsResJson.toString();\r
     }\r

diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/NsEntityMapper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/NsEntityMapper.java
index 69db361..d90c586 100644 (file)
--- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/NsEntityMapper.java
+++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/mapper/NsEntityMapper.java
@@ -21,6 +21,14 @@ import java.util.Map;
 \r
 import org.onap.vfc.nfvo.resmanagement.service.entity.NsEntity;\r
 \r
+/**\r
+ * <br>\r
+ * <p>\r
+ * </p>\r
+ * \r
+ * @author\r
+ * @version VFC 1.0 Sep 4, 2017\r
+ */\r
 public interface NsEntityMapper {\r
 \r
     int deleteByPrimaryKey(String id);\r

diff --git a/ResmanagementService/service/src/main/resources/mybatis/mysql/NsEntityMapper.xml b/ResmanagementService/service/src/main/resources/mybatis/mysql/NsEntityMapper.xml
index a792694..9d7fb40 100644 (file)
--- a/ResmanagementService/service/src/main/resources/mybatis/mysql/NsEntityMapper.xml
+++ b/ResmanagementService/service/src/main/resources/mybatis/mysql/NsEntityMapper.xml
@@ -22,12 +22,12 @@
     <result column="NSD_ID" property="nsdId" jdbcType="VARCHAR" />\r
     <result column="DESCRIPTION" property="description" jdbcType="VARCHAR" />\r
     <result column="STATUS" property="status" jdbcType="VARCHAR" />\r
-    <result column="CTEATE_TIME" property="cteateTime" jdbcType="VARCHAR" />\r
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />\r
     <result column="LAST_UPDATE" property="lastUpdate" jdbcType="VARCHAR" />\r
   </resultMap>\r
   \r
   <sql id="Base_Column_List" >\r
-    ID, NAME, NSD_ID, DESCRIPTION, STATUS, CTEATE_TIME, LAST_UPDATE\r
+    ID, NAME, NSD_ID, DESCRIPTION, STATUS, CREATE_TIME, LAST_UPDATE\r
   </sql>\r
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >\r
     select \r
@@ -38,7 +38,7 @@
   <select id="getAllNs" resultMap="BaseResultMap" parameterType="java.util.Map">\r
         select\r
         <include refid="Base_Column_List" />\r
-        from vnf\r
+        from ns\r
         <where>\r
             <if test="id != null">\r
                 AND ID = #{id,jdbcType=VARCHAR}\r
@@ -51,10 +51,10 @@
   </delete>\r
   <insert id="insert" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.NsEntity" >\r
     insert into ns (ID, NAME, NSD_ID, \r
-      DESCRIPTION, STATUS, CTEATE_TIME, \r
+      DESCRIPTION, STATUS, CREATE_TIME, \r
       LAST_UPDATE)\r
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{nsdId,jdbcType=VARCHAR}, \r
-      #{description,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{cteateTime,jdbcType=VARCHAR}, \r
+      #{description,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, \r
       #{lastUpdate,jdbcType=VARCHAR})\r
   </insert>\r
   <insert id="insertSelective" parameterType="org.onap.vfc.nfvo.resmanagement.service.entity.NsEntity" >\r
@@ -75,8 +75,8 @@
       <if test="status != null" >\r
         STATUS,\r
       </if>\r
-      <if test="cteateTime != null" >\r
-        CTEATE_TIME,\r
+      <if test="createTime != null" >\r
+        CREATE_TIME,\r
       </if>\r
       <if test="lastUpdate != null" >\r
         LAST_UPDATE,\r
@@ -98,8 +98,8 @@
       <if test="status != null" >\r
         #{status,jdbcType=VARCHAR},\r
       </if>\r
-      <if test="cteateTime != null" >\r
-        #{cteateTime,jdbcType=VARCHAR},\r
+      <if test="createTime != null" >\r
+        #{createTime,jdbcType=VARCHAR},\r
       </if>\r
       <if test="lastUpdate != null" >\r
         #{lastUpdate,jdbcType=VARCHAR},\r
@@ -121,8 +121,8 @@
       <if test="status != null" >\r
         STATUS = #{status,jdbcType=VARCHAR},\r
       </if>\r
-      <if test="cteateTime != null" >\r
-        CTEATE_TIME = #{cteateTime,jdbcType=VARCHAR},\r
+      <if test="createTime != null" >\r
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},\r
       </if>\r
       <if test="lastUpdate != null" >\r
         LAST_UPDATE = #{lastUpdate,jdbcType=VARCHAR},\r
@@ -136,7 +136,7 @@
       NSD_ID = #{nsdId,jdbcType=VARCHAR},\r
       DESCRIPTION = #{description,jdbcType=VARCHAR},\r
       STATUS = #{status,jdbcType=VARCHAR},\r
-      CTEATE_TIME = #{cteateTime,jdbcType=VARCHAR},\r
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},\r
       LAST_UPDATE = #{lastUpdate,jdbcType=VARCHAR}\r
     where ID = #{id,jdbcType=VARCHAR}\r
   </update>\r