From: luxin <luxin7@huawei.com>
Date: Thu, 31 Aug 2017 12:24:23 +0000 (+0800)
Subject: Modify the interface version
X-Git-Tag: v1.0.0~66
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=37b60ca0f2e6fc7edd7ee556879c379ccd5286df;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

Modify the interface version

Modify the interface since which version

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

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtil.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtil.java
index ab947cba..c75e4b4b 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtil.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtil.java
@@ -224,7 +224,7 @@ public final class ResultRequestUtil {
      * @param paramsJson
      * @param authModel
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public static JSONObject callSouth(JSONObject vnfmObject, String path, String methodName, String paramsJson,
             String authModel) {
@@ -287,6 +287,14 @@ public final class ResultRequestUtil {
         return resultJson;
     }
 
+    /**
+     * <br>
+     * 
+     * @param vnfmUrl
+     * @param token
+     * @param user
+     * @since VFC 1.0
+     */
     private static void removeV3Tokens(String vnfmUrl, String token, String user) {
         HttpMethod httpMethodToken = null;
         String tokenUrl = String.format(ParamConstants.CSM_AUTH_CONNECT_SOUTH_DISCONNECT, user);
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index 8be8b7dc..b91a1fa1 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -120,7 +120,7 @@ public class ConnectMgrVnfm {
      * @param vnfmObj
      * @param authModel
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public int connectSouth(JSONObject vnfmObj, String authModel) {
         LOG.info("function=connectSouth, msg=enter connect function.");
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index 833dda34..2149fe9d 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -233,7 +233,7 @@ public class VnfMgrVnfm implements InterfaceVnfMgr {
      * @param vnfmId
      * @param vnfInstanceId
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public JSONObject healVnf(JSONObject jsonObject, JSONObject vnfmObjcet, String vnfmId, String vnfInstanceId) {
         LOG.info("healVnf request body :" + jsonObject);
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgr.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgr.java
index 8b1f4463..557ba579 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgr.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgr.java
@@ -300,7 +300,7 @@ public class VnfMgr {
      * @param vnfInstanceId
      * @param vnfmId
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public JSONObject healVnf(JSONObject jsonObject, String vnfInstanceId, String vnfmId) {
         JSONObject restJson = new JSONObject();
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java
index e97a3215..fafd3e53 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java
@@ -277,11 +277,11 @@ public class VnfRoa {
      * 
      * @param context
      *            {
-     *            ¡°action¡±: ¡°vmReset¡±,
-     *            ¡°affectedvm¡±: {
-     *            ¡°vmid¡±: ¡°804cca71 - 9ae9 - 4511 - 8e30 - d1387718caff¡±,
-     *            ¡°vduid¡±: ¡°vdu_100¡±,
-     *            ¡°vmname¡±: ¡°ZTE_SSS_111_PP_2_L¡±
+     *            “action”: “vmReset”,
+     *            “affectedvm”: {
+     *            “vmid”: “804cca71 - 9ae9 - 4511 - 8e30 - d1387718caff”,
+     *            “vduid”: “vdu_100”,
+     *            “vmname”: “ZTE_SSS_111_PP_2_L”
      *            }
      *            }
      * @param resp
@@ -289,7 +289,7 @@ public class VnfRoa {
      * @param vnfInstanceId
      * @return
      * @throws ServiceException
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     @PUT
     @Path("/{vnfmId}/vnfs/{vnfInstanceId}/heal")