Change vfc tag of vfc-svnfm

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

51 files changed, 154 insertions, 151 deletions

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/AsyncCallback.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/AsyncCallback.java
index cab780e1..fc775177 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/AsyncCallback.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/AsyncCallback.java
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
  * .</br>
  *
  * @author
- * @version     NFVO 0.5  Sep 10, 2016
+ * @version     VFC 1.0  Sep 10, 2016
  */
 public class AsyncCallback implements RestfulAsyncCallback {
 
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/DownloadCsarManager.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/DownloadCsarManager.java
index c8cf75b5..d0d84d4b 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/DownloadCsarManager.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/DownloadCsarManager.java
@@ -48,7 +48,7 @@ import net.sf.json.JSONObject;
  * Utility class to download CSAR
  *
  * @author
- * @version      NFVO 0.5  Sep 5, 2016
+ * @version      VFC 1.0  Sep 5, 2016
  *
  */
 public class DownloadCsarManager {
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/RegisterConfigInfo.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/RegisterConfigInfo.java
index 05ecf79f..df6b0113 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/RegisterConfigInfo.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/RegisterConfigInfo.java
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
  * </p>
  *
  * @author
- * @version     NFVO 0.5  Aug 25, 2016
+ * @version     VFC 1.0  Aug 25, 2016
  */
 public class RegisterConfigInfo {
 
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 c75e4b4b..73502130 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
@@ -37,7 +37,7 @@ import net.sf.json.JSONObject;
  * </p>
  *
  * @author
- * @version NFVO 0.5 Aug 25, 2016
+ * @version VFC 1.0 Aug 25, 2016
  */
 public final class ResultRequestUtil {
 
@@ -60,7 +60,7 @@ public final class ResultRequestUtil {
      *            raw data with json format, if <code>methodName</code> is get
      *            or delete, fill it with null
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public static JSONObject call(JSONObject vnfmObject, String path, String methodName, String paramsJson) {
         JSONObject resultJson = new JSONObject();
@@ -126,7 +126,7 @@ public final class ResultRequestUtil {
      *            raw data with json format, if <code>methodName</code> is get
      *            or delete, fill it with null
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public static JSONObject call(JSONObject vnfmObject, String path, String methodName, String paramsJson,
             String authModel) {
@@ -192,7 +192,7 @@ public final class ResultRequestUtil {
     /**
      * <br>
      *
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     private static void removeTokens(String vnfmUrl, String token, String roaRand, String user) {
         HttpMethod httpMethodToken = null;
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmException.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmException.java
index 3b3a55bf..98ab7444 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmException.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmException.java
@@ -21,7 +21,7 @@ package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common;
  * .</br>
  *
  * @author
- * @version     NFVO 0.5  Sep 10, 2016
+ * @version     VFC 1.0  Sep 10, 2016
  */
 public class VnfmException extends Exception {
 
@@ -31,7 +31,7 @@ public class VnfmException extends Exception {
      *
      * Constructor<br>
      *
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public VnfmException() {
         super();
@@ -43,7 +43,7 @@ public class VnfmException extends Exception {
      *
      * @param message
      * @param cause
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public VnfmException(String message, Throwable cause) {
         super(message, cause);
@@ -54,7 +54,7 @@ public class VnfmException extends Exception {
      * Constructor<br>
      *
      * @param message
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public VnfmException(String message) {
         super(message);
@@ -65,7 +65,7 @@ public class VnfmException extends Exception {
      * Constructor<br>
      *
      * @param cause
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public VnfmException(Throwable cause) {
         super(cause);
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmJsonUtil.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmJsonUtil.java
index fc327299..edf58b51 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmJsonUtil.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmJsonUtil.java
@@ -33,7 +33,7 @@ import net.sf.json.util.JSONTokener;
  * VNFM JSON utils.</br>
  *
  * @author
- * @version     NFVO 0.5  Sep 10, 2016
+ * @version     VFC 1.0  Sep 10, 2016
  */
 public final class VnfmJsonUtil {
 
@@ -49,7 +49,7 @@ public final class VnfmJsonUtil {
      *
      * @param vnfReq HttpServletRequest
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     @SuppressWarnings("unchecked")
     public static <T> T getJsonFromContexts(HttpServletRequest vnfReq) {
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmUtil.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmUtil.java
index 57491007..c735e784 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmUtil.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/VnfmUtil.java
@@ -31,7 +31,7 @@ import net.sf.json.JSONObject;
  * <br/>
  *
  * @author
- * @version NFVO 0.5 Aug 25, 2016
+ * @version VFC 1.0 Aug 25, 2016
  */
 public final class VnfmUtil {
 
@@ -42,17 +42,20 @@ public final class VnfmUtil {
     }
 
     /**
-     * Get vnfmInfo by ip
-     * <br/>
-     *
+     * <br>
+     * 
      * @param vnfmId
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public static JSONObject getVnfmById(String vnfmId) {
         RestfulResponse rsp = VnfmRestfulUtil.getRemoteResponse(String.format(ParamConstants.ESR_GET_VNFM_URL, vnfmId),
                 VnfmRestfulUtil.TYPE_GET, null);
-        if(rsp == null || rsp.getStatus() != Constant.HTTP_OK) {
+        if(rsp == null) {
+            LOGGER.error("funtion=getVnfmById, response is null.");
+            return null;
+        }
+        if(rsp.getStatus() != Constant.HTTP_OK) {
             LOGGER.error("funtion=getVnfmById, status={}", rsp.getStatus());
             return null;
         }
@@ -73,7 +76,7 @@ public final class VnfmUtil {
      *
      * @param ip
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public static String getVnfmIdByIp(String ip) {
         RestfulResponse rsp =
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/HttpRestfulHelp.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/HttpRestfulHelp.java
index 3fcbce93..ef7eb053 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/HttpRestfulHelp.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/HttpRestfulHelp.java
@@ -27,7 +27,7 @@ import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.restclient.Restful;
  * .</br>
  *
  * @author
- * @version     NFVO 0.5  Sep 10, 2016
+ * @version     VFC 1.0  Sep 10, 2016
  */
 public class HttpRestfulHelp {
 
@@ -48,7 +48,7 @@ public class HttpRestfulHelp {
      * @param ssloptionfile
      * @param restoptionfile
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public static synchronized Restful getRestInstance(String ssloptionfile, String restoptionfile) {
         Restful rest = INSTANCES.get(PROTO_HTTP);
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VNFRestfulUtil.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VNFRestfulUtil.java
index eb21caa1..c045f6ae 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VNFRestfulUtil.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VNFRestfulUtil.java
@@ -41,7 +41,7 @@ import net.sf.json.JSONObject;
  * Utility class.</br>
  *
  * @author
- * @version     NFVO 0.5  Sep 10, 2016
+ * @version     VFC 1.0  Sep 10, 2016
  */
 public final class VNFRestfulUtil {
 
@@ -152,7 +152,7 @@ public final class VNFRestfulUtil {
      * @param methodName
      * @param objects
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public static RestfulResponse getRestRes(String methodName, Object... objects) {
         Restful rest = RestfulFactory.getRestInstance(RestfulFactory.PROTO_HTTP);
@@ -288,7 +288,7 @@ public final class VNFRestfulUtil {
      * @param domainTokens String
      * @param isNfvoApp Boolean
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public static RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params, String domainTokens,
             boolean isNfvoApp) {
@@ -350,7 +350,7 @@ public final class VNFRestfulUtil {
      * @param paramsMap
      * @param params
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public static RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
         if(null == paramsMap){
@@ -396,7 +396,7 @@ public final class VNFRestfulUtil {
      * @param path
      * @param authMode
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public static Map<String, String> generateParamsMap(String url, String methodType, String path, String authMode) {
         Map<String, String> utilParamsMap = new HashMap<>(6);
@@ -414,7 +414,7 @@ public final class VNFRestfulUtil {
      * @param methodType
      * @param path
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public static Map<String, String> generateParamsMap(String url, String methodType, String path) {
         Map<String, String> paramsMap = new HashMap<>(6);
@@ -432,7 +432,7 @@ public final class VNFRestfulUtil {
      * @param vnfmInfo
      * @param vnfmId
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public static JSONObject getResultToVnfm(JSONObject vnfmInfo, String vnfmId) {
         JSONObject retJson = new JSONObject();
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VnfmRestfulUtil.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VnfmRestfulUtil.java
index 924b2489..1856985d 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VnfmRestfulUtil.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VnfmRestfulUtil.java
@@ -42,7 +42,7 @@ import net.sf.json.JSONObject;
  * .</br>
  *
  * @author
- * @version     NFVO 0.5  Sep 10, 2016
+ * @version     VFC 1.0  Sep 10, 2016
  */
 public final class VnfmRestfulUtil {
 
@@ -147,7 +147,7 @@ public final class VnfmRestfulUtil {
      * @param methodName String
      * @param objects String
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public static RestfulResponse getRestRes(String methodName, Object... objects) {
         Restful rest = RestfulFactory.getRestInstance(RestfulFactory.PROTO_HTTP);
@@ -202,7 +202,7 @@ public final class VnfmRestfulUtil {
      * @param methodName String
      * @param paraJson JSONObject
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public static JSONObject sendReqToApp(String path, String methodName, JSONObject paraJson) {
         JSONObject retJson = new JSONObject();
@@ -287,7 +287,7 @@ public final class VnfmRestfulUtil {
      * @param domainTokens String
      * @param isNfvoApp boolean
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public static RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params, String domainTokens,
             boolean isNfvoApp) {
@@ -350,7 +350,7 @@ public final class VnfmRestfulUtil {
      * @param methodType String
      * @param params String
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public static RestfulResponse getRemoteResponse(String url, String methodType, String params) {
         RestfulResponse rsp = null;
@@ -390,7 +390,7 @@ public final class VnfmRestfulUtil {
      * @param path String
      * @param authMode String
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public static Map<String, String> generateParamsMap(String url, String methodType, String path, String authMode) {
         Map<String, String> utilParamsMap = new HashMap<>(6);
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmService2DriverMgr.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmService2DriverMgr.java
index eeff720a..4898c60b 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmService2DriverMgr.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmService2DriverMgr.java
@@ -28,7 +28,7 @@ import org.springframework.beans.factory.config.DestructionAwareBeanPostProcesso
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Jan 23, 2017
+ * @version VFC 1.0 Jan 23, 2017
  */
 public class RoaVnfmService2DriverMgr implements DestructionAwareBeanPostProcessor {
 
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmServicePostProcessor.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmServicePostProcessor.java
index e461fcec..9dff97b9 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmServicePostProcessor.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/activator/RoaVnfmServicePostProcessor.java
@@ -28,7 +28,7 @@ import org.springframework.beans.factory.config.DestructionAwareBeanPostProcesso
  * </p>
  *
  * @author
- * @version NFVO 0.5 Aug 31, 2016
+ * @version VFC 1.0 Aug 31, 2016
  */
 public class RoaVnfmServicePostProcessor implements DestructionAwareBeanPostProcessor {
 
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index a6062404..42b9b27c 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -48,7 +48,7 @@ import net.sf.json.JSONObject;
  * .</br>
  *
  * @author
- * @version NFVO 0.5 Sep 13, 2016
+ * @version VFC 1.0 Sep 13, 2016
  */
 public class AdapterResourceManager implements IResourceManager {
 
@@ -388,7 +388,7 @@ public class AdapterResourceManager implements IResourceManager {
      * @param vnfmurl
      * @param conntoken
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public JSONObject upload(JSONObject vnfpackage, String vnfmurl, String conntoken) {
         JSONObject resultObj = new JSONObject();
@@ -438,7 +438,7 @@ public class AdapterResourceManager implements IResourceManager {
      * @param prefixUrl
      * @param serviceUrl
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public JSONObject getVnfdVersion(String prefixUrl, String serviceUrl, String conntoken) {
         JSONObject resultObj = new JSONObject();
@@ -484,7 +484,7 @@ public class AdapterResourceManager implements IResourceManager {
      *
      * @param paramsMap
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public JSONObject getVnfmConnInfo(Map<String, String> paramsMap) {
         return this.sendRequest(paramsMap);
@@ -537,7 +537,7 @@ public class AdapterResourceManager implements IResourceManager {
      *
      * @return
      * @throws IOException
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public static String readVfnPkgInfoFromJson() throws IOException {
         InputStream ins = null;
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index 8f482b6b..de9bad19 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -34,7 +34,7 @@ import net.sf.json.JSONObject;
  * </p>
  *
  * @author
- * @version     NFVO 0.5  Aug 29, 2016
+ * @version     VFC 1.0  Aug 29, 2016
  */
 public class Driver2MSBManager implements IDriver2MSBManager {
 
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index 39bb9fb0..8bd6d5a6 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -33,7 +33,7 @@ import net.sf.json.JSONObject;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Jan 23, 2017
+ * @version VFC 1.0 Jan 23, 2017
  */
 public class VnfmAdapter2DriverManager implements IVnfmAdapter2DriverManager {
 
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index 9132ee22..bcbd3780 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -27,7 +27,7 @@ import net.sf.json.JSONObject;
  * </p>
  *
  * @author
- * @version     NFVO 0.5  Aug 29, 2016
+ * @version     VFC 1.0  Aug 29, 2016
  */
 public interface IDriver2MSBManager {
 
@@ -38,7 +38,7 @@ public interface IDriver2MSBManager {
      * @param paramsMap
      * @param driverInfo
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     JSONObject registerDriver(Map<String, String> paramsMap, JSONObject driverInfo);
 
@@ -48,7 +48,7 @@ public interface IDriver2MSBManager {
      *
      * @param paramsMap
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     JSONObject unregisterDriver(Map<String, String> paramsMap);
 
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index ea6d369f..7a87bec6 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -24,7 +24,7 @@ import net.sf.json.JSONObject;
  * Resource Manager interface.</br>
  *
  * @author
- * @version     NFVO 0.5  Sep 13, 2016
+ * @version     VFC 1.0  Sep 13, 2016
  */
 public interface IResourceManager {
 
@@ -33,7 +33,7 @@ public interface IResourceManager {
      *
      * @param csarid String
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     JSONObject getVnfmCsarInfo(String csarid);
 
@@ -43,7 +43,7 @@ public interface IResourceManager {
      * @param url String
      * @param filePath String
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     JSONObject downloadCsar(String url,String filePath);
 
@@ -52,7 +52,7 @@ public interface IResourceManager {
      *
      * @param url String
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     JSONObject getAllCloud(String url,String connToken);
 
@@ -63,7 +63,7 @@ public interface IResourceManager {
      * @param url String
      * @param vnfdid String
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     JSONObject getVNFDPlanInfo(String url, String vnfdid, String conntoken);
 
@@ -73,7 +73,7 @@ public interface IResourceManager {
      * @param vnfpkg JSONObject
      * @param paramsMap Map<String, String>
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     JSONObject uploadVNFPackage(JSONObject vnfpkg, Map<String, String> paramsMap);
 }
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index f0706357..21b39163 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -26,7 +26,7 @@ import net.sf.json.JSONObject;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Jan 23, 2017
+ * @version VFC 1.0 Jan 23, 2017
  */
 public interface IVnfmAdapter2DriverManager {
 
@@ -36,7 +36,7 @@ public interface IVnfmAdapter2DriverManager {
      * @param paramsMap
      * @param driverInfo
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     JSONObject registerDriver(Map<String, String> paramsMap, JSONObject driverInfo);
 
@@ -45,7 +45,7 @@ public interface IVnfmAdapter2DriverManager {
      *
      * @param paramsMap
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     JSONObject unregisterDriver(Map<String, String> paramsMap);
 
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index 9da10093..f2a244ba 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -42,7 +42,7 @@ import net.sf.json.JSONObject;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Jan 23, 2017
+ * @version VFC 1.0 Jan 23, 2017
  */
 public class VnfmAdapter2DriverMgrService implements IVnfmAdapter2DriverMgrService {
 
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index e754fa27..f497eaf2 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -42,7 +42,7 @@ import net.sf.json.JSONObject;
  * </p>
  *
  * @author
- * @version NFVO 0.5 Aug 31, 2016
+ * @version VFC 1.0 Aug 31, 2016
  */
 public class VnfmAdapterMgrService implements IVnfmAdapterMgrService {
 
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index c5e5ff45..a94dc088 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -22,21 +22,21 @@ package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.inf;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Jan 23, 2017
+ * @version VFC 1.0 Jan 23, 2017
  */
 public interface IVnfmAdapter2DriverMgrService {
 
     /**
      * VimAdapter register interface.<br>
      *
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     void register();
 
     /**
      * VimAdapter unregister interface.<br>
      *
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     void unregister();
 }
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index f1053a3d..b8f77760 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -22,7 +22,7 @@ package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.inf;
  * </p>
  *
  * @author
- * @version NFVO 0.5 Aug 31, 2016
+ * @version VFC 1.0 Aug 31, 2016
  */
 public interface IVnfmAdapterMgrService {
 
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/Constant.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/Constant.java
index 4548de35..77367d53 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/Constant.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/Constant.java
@@ -26,7 +26,7 @@ import java.util.List;
  * </p>
  *
  * @author
- * @version NFVO 0.5 Sep 3, 2016
+ * @version VFC 1.0 Sep 3, 2016
  */
 public class Constant {
 
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/ParamConstants.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/ParamConstants.java
index 957a581d..7448ec0e 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/ParamConstants.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/ParamConstants.java
@@ -18,7 +18,7 @@ package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant;
 
 /**
  * @author
- * @version NFVO 0.5 Sep 6, 2016
+ * @version VFC 1.0 Sep 6, 2016
  */
 public class ParamConstants {
 
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/UrlConstant.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/UrlConstant.java
index 0f09ddbb..23f750a8 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/UrlConstant.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/UrlConstant.java
@@ -20,7 +20,7 @@ package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant;
  * URL constant
  * 
  * @author
- * @version NFVO 0.5 Sep 6, 2016
+ * @version VFC 1.0 Sep 6, 2016
  */
 public class UrlConstant {
 
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index 45d09eda..b31fcbce 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -22,7 +22,7 @@ import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
  * .</br>
  *
  * @author
- * @version     NFVO 0.5  Sep 14, 2016
+ * @version     VFC 1.0  Sep 14, 2016
  */
 public class ConnectInfo {
 
@@ -39,7 +39,7 @@ public class ConnectInfo {
      * Constructor<br>
      *
      * @param url
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public ConnectInfo(String url) {
         this.url = url == null ? "" : url;
@@ -54,7 +54,7 @@ public class ConnectInfo {
      * @param userName
      * @param userPwd
      * @param authenticateMode
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public ConnectInfo(String url, String userName, String userPwd, String authenticateMode) {
         this.url = url == null ? "" : url;
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index f10c2ac5..42f022b5 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -45,7 +45,7 @@ import net.sf.json.JSONObject;
  * .</br>
  *
  * @author
- * @version NFVO 0.5 Sep 14, 2016
+ * @version VFC 1.0 Sep 14, 2016
  */
 public class AbstractSslContext {
 
@@ -139,7 +139,7 @@ public class AbstractSslContext {
      * 
      * @return
      * @throws IOException
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public static JSONObject readSSLConfToJson() throws IOException {
         JSONObject sslJson = null;
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 b91a1fa1..e71ba27e 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
@@ -36,7 +36,7 @@ import net.sf.json.JSONObject;
  * .</br>
  *
  * @author
- * @version NFVO 0.5 Sep 14, 2016
+ * @version VFC 1.0 Sep 14, 2016
  */
 public class ConnectMgrVnfm {
 
@@ -68,7 +68,7 @@ public class ConnectMgrVnfm {
      *
      * @param vnfmObj
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public int connect(JSONObject vnfmObj, String authModel) {
         LOG.info("function=connect, msg=enter connect function.");
@@ -171,7 +171,7 @@ public class ConnectMgrVnfm {
      *
      * @param vnfmObj
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public int connect(JSONObject vnfmObj) {
         LOG.info("function=connect, msg=enter connect function.");
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index f94c1d0c..a23b73ac 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -45,7 +45,7 @@ import org.springframework.http.HttpRequest;
  * HTTP Request class.</br>
  *
  * @author
- * @version     NFVO 0.5  Sep 14, 2016
+ * @version     VFC 1.0  Sep 14, 2016
  */
 public final class HttpRequests {
 
@@ -70,7 +70,7 @@ public final class HttpRequests {
      * Request builder.</br>
      *
      * @author
-     * @version     NFVO 0.5  Sep 14, 2016
+     * @version     VFC 1.0  Sep 14, 2016
      */
     public static class Builder {
 
@@ -93,7 +93,7 @@ public final class HttpRequests {
          * Constructor<br>
          *
          * @param authenticateMode
-         * @since  NFVO 0.5
+         * @since  VFC 1.0
          */
         public Builder(String authenticateMode) {
             this.authenticateMode = authenticateMode;
@@ -110,7 +110,7 @@ public final class HttpRequests {
          * @param name
          * @param value
          * @return
-         * @since  NFVO 0.5
+         * @since  VFC 1.0
          */
         public Builder addHeader(String name, String value) {
             headers.add(new Header(name, value));
@@ -124,7 +124,7 @@ public final class HttpRequests {
          * @param header
          * @param headers
          * @return
-         * @since  NFVO 0.5
+         * @since  VFC 1.0
          */
         public Builder addHeaders(Header header, Header... headers) {
             if(header != null) {
@@ -144,7 +144,7 @@ public final class HttpRequests {
          *
          * @param headers
          * @return
-         * @since  NFVO 0.5
+         * @since  VFC 1.0
          */
         public Builder addHeaders(List<Header> headers) {
             if(headers != null && !headers.isEmpty()) {
@@ -161,7 +161,7 @@ public final class HttpRequests {
          * @param path
          * @return
          * @throws VnfmException
-         * @since  NFVO 0.5
+         * @since  VFC 1.0
          */
         public Builder setUrl(String url, String path) throws VnfmException {
             if(StringUtils.isEmpty(url)) {
@@ -187,7 +187,7 @@ public final class HttpRequests {
          * @param defPort
          * @return
          * @throws VnfmException
-         * @since  NFVO 0.5
+         * @since  VFC 1.0
          */
         public Builder setUrl(String url, String path, int defPort) throws VnfmException {
             if(StringUtils.isEmpty(url)) {
@@ -209,7 +209,7 @@ public final class HttpRequests {
          * <br>
          *
          * @return
-         * @since  NFVO 0.5
+         * @since  VFC 1.0
          */
         public Builder post() {
             this.httpMethod = new PostMethod(url);
@@ -221,7 +221,7 @@ public final class HttpRequests {
          * <br>
          *
          * @return
-         * @since  NFVO 0.5
+         * @since  VFC 1.0
          */
         public Builder get() {
             this.httpMethod = new GetMethod(url);
@@ -233,7 +233,7 @@ public final class HttpRequests {
          * <br>
          *
          * @return
-         * @since  NFVO 0.5
+         * @since  VFC 1.0
          */
         public Builder put() {
             this.httpMethod = new PutMethod(url);
@@ -245,7 +245,7 @@ public final class HttpRequests {
          * <br>
          *
          * @return
-         * @since  NFVO 0.5
+         * @since  VFC 1.0
          */
         public Builder delete() {
             this.httpMethod = new DeleteMethod(url);
@@ -258,7 +258,7 @@ public final class HttpRequests {
          *
          * @param json
          * @return
-         * @since  NFVO 0.5
+         * @since  VFC 1.0
          */
         public Builder setParams(String json) {
             this.paramsJson = json;
@@ -271,7 +271,7 @@ public final class HttpRequests {
          *
          * @param encode
          * @return
-         * @since  NFVO 0.5
+         * @since  VFC 1.0
          */
         public Builder setEncoding(String encode) {
             this.encoding = encode;
@@ -283,7 +283,7 @@ public final class HttpRequests {
          * <br>
          *
          * @return
-         * @since  NFVO 0.5
+         * @since  VFC 1.0
          */
         public String request() {
             String result = null;
@@ -320,7 +320,7 @@ public final class HttpRequests {
          * @return
          * @throws VnfmException
          * @throws IOException
-         * @since  NFVO 0.5
+         * @since  VFC 1.0
          */
         public HttpMethod execute() throws VnfmException, IOException {
             try {
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index dc651ef2..b8b38388 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -45,7 +45,7 @@ public class SslAnonymousSocket extends AbstractSslContext implements SecureProt
      * <br>
      *
      * @throws VnfmException
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public void init() throws VnfmException {
         try {
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index 2fa1dc25..a525907a 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -43,7 +43,7 @@ public class SslCertificateSocket extends AbstractSslContext implements SecurePr
      * <br>
      *
      * @throws VnfmException
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public void init() throws VnfmException {
         try {
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index af414d8e..b9fa5e39 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
  * .</br>
  *
  * @author
- * @version     NFVO 0.5  Sep 14, 2016
+ * @version     VFC 1.0  Sep 14, 2016
  */
 public class SslProtocolSocketFactory {
 
@@ -46,7 +46,7 @@ public class SslProtocolSocketFactory {
      * <br>
      *
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public static synchronized SslProtocolSocketFactory getInstance() {
         if(singleinstance == null) {
@@ -62,7 +62,7 @@ public class SslProtocolSocketFactory {
      * @param authenticateMode
      * @return
      * @throws VnfmException
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public synchronized ProtocolSocketFactory get(String authenticateMode) throws VnfmException {
         if(SOCKMAP.get(authenticateMode) == null) {
@@ -89,7 +89,7 @@ public class SslProtocolSocketFactory {
      *
      * @param autherMode
      * @throws VnfmException
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     public synchronized void refresh(String autherMode) throws VnfmException {
         if(Constant.ANONYMOUS.equals(autherMode)) {
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index 9d78ff22..cb2494d8 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -26,7 +26,7 @@ import net.sf.json.JSONObject;
  * </p>
  *
  * @author
- * @version     NFVO 0.5  Aug 25, 2016
+ * @version     VFC 1.0  Aug 25, 2016
  */
 @FunctionalInterface
 public interface InterfaceConnectMgr {
@@ -38,7 +38,7 @@ public interface InterfaceConnectMgr {
      * @param obj
      * @return
      * @throws VnfmException
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     int connect(JSONObject obj) throws VnfmException;
 
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index 3d1965ee..8ef923d2 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -23,7 +23,7 @@ import net.sf.json.JSONObject;
  * <br/>
  *
  * @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
  */
 public interface InterfaceVnfMgr {
 
@@ -43,7 +43,7 @@ public interface InterfaceVnfMgr {
      * @param subJsonObject
      * @param vnfmObjcet
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     JSONObject createVnf(JSONObject subJsonObject, JSONObject vnfmObjcet);
 
@@ -55,7 +55,7 @@ public interface InterfaceVnfMgr {
      * @param vnfId
      * @param vnfObject
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     JSONObject removeVnf(JSONObject vnfmObject, String vnfId, JSONObject vnfObject);
 
@@ -66,7 +66,7 @@ public interface InterfaceVnfMgr {
      * @param vnfmObject
      * @param vnfId
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     JSONObject getVnf(JSONObject vnfmObject, String vnfId);
 
@@ -77,7 +77,7 @@ public interface InterfaceVnfMgr {
      * @param vnfmObject
      * @param jobId
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     JSONObject getJob(JSONObject vnfmObject, String jobId);
 }
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 2149fe9d..f8aedede 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
@@ -32,7 +32,7 @@ import net.sf.json.JSONObject;
  * <br/>
  *
  * @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
  */
 public class VnfMgrVnfm implements InterfaceVnfMgr {
 
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index caf153a6..0c6b448e 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -29,7 +29,7 @@ import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.restclient.ServiceExcepti
  * .</br>
  *
  * @author
- * @version     NFVO 0.5  Sep 14, 2016
+ * @version     VFC 1.0  Sep 14, 2016
  */
 public class VnfmDaoImpl extends AbstractDao implements VnfmDao {
 
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index af43d6a5..38ab794e 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -26,7 +26,7 @@ import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.restclient.ServiceExcepti
  * .</br>
  *
  * @author
- * @version     NFVO 0.5  Sep 14, 2016
+ * @version     VFC 1.0  Sep 14, 2016
  */
 public interface VnfmDao {
 
@@ -37,7 +37,7 @@ public interface VnfmDao {
      * @param vnfm
      * @return
      * @throws ServiceException
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     int insertVnfm(Vnfm vnfm) throws ServiceException;
 
@@ -48,7 +48,7 @@ public interface VnfmDao {
      * @param vnfmDn
      * @return
      * @throws ServiceException
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     int deleteVnfm(String vnfmDn) throws ServiceException;
 
@@ -59,7 +59,7 @@ public interface VnfmDao {
      * @param vnfm
      * @return
      * @throws ServiceException
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     int updateVnfm(Vnfm vnfm) throws ServiceException;
 
@@ -71,7 +71,7 @@ public interface VnfmDao {
      * @param pageNo
      * @return
      * @throws ServiceException
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     List<Vnfm> indexVnfms(int pageSize, int pageNo) throws ServiceException;
 
@@ -81,7 +81,7 @@ public interface VnfmDao {
      *
      * @param id
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     Vnfm getVnfmById(String id);
 }
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/entity/Vnfm.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/entity/Vnfm.java
index 31bf72f5..45458350 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/entity/Vnfm.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/entity/Vnfm.java
@@ -26,7 +26,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * </p>
  *
  * @author
- * @version NFVO 0.5 Sep 3, 2016
+ * @version VFC 1.0 Sep 3, 2016
  */
 public class Vnfm {
 
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/mapper/VnfmMapper.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/mapper/VnfmMapper.java
index 8c079c7f..b7e8d6e4 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/mapper/VnfmMapper.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/mapper/VnfmMapper.java
@@ -25,7 +25,7 @@ import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.entity.Vnfm;
  * VNFM mapper.</br>
  *
  * @author
- * @version     NFVO 0.5  Sep 14, 2016
+ * @version     VFC 1.0  Sep 14, 2016
  */
 public interface VnfmMapper {
 
@@ -35,7 +35,7 @@ public interface VnfmMapper {
      *
      * @param vnfm Vnfm
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     int insertVnfm(Vnfm vnfm);
 
@@ -45,7 +45,7 @@ public interface VnfmMapper {
      *
      * @param vnfm Vnfm
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     int updateVnfm(Vnfm vnfm);
 
@@ -55,7 +55,7 @@ public interface VnfmMapper {
      *
      * @param vnfmDn
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     int deleteVnfm(String vnfmDn);
 
@@ -66,7 +66,7 @@ public interface VnfmMapper {
      * @param offset
      * @param pageSize
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     List<Vnfm> indexVnfms(@Param("offset") int offset, @Param("pageSize") int pageSize);
 
@@ -75,7 +75,7 @@ public interface VnfmMapper {
      * <br>
      *
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     int getCountVnfms();
 
@@ -85,7 +85,7 @@ public interface VnfmMapper {
      *
      * @param id
      * @return
-     * @since  NFVO 0.5
+     * @since  VFC 1.0
      */
     Vnfm getVnfmById(String id);
 }
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgr.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgr.java
index de27b73b..545bf7a5 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgr.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgr.java
@@ -28,7 +28,7 @@ import net.sf.json.JSONObject;
  * <br/>
  *
  * @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
  */
 public class AuthMgr {
 
@@ -40,7 +40,7 @@ public class AuthMgr {
      *
      * @param params
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public JSONObject authToken(JSONObject params) {
         JSONObject restJson = new JSONObject();
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/RegisterMgr.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/RegisterMgr.java
index 49c722f8..7395e3af 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/RegisterMgr.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/RegisterMgr.java
@@ -33,7 +33,7 @@ import net.sf.json.JSONObject;
  * <br/>
  *
  * @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
  */
 public class RegisterMgr {
 
@@ -43,7 +43,7 @@ public class RegisterMgr {
      * Register service to the Bus
      * <br/>
      *
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public void register() {
         RestfulResponse rsp = VnfmRestfulUtil.getRemoteResponse(ParamConstants.MSB_REGISTER_URL,
@@ -56,7 +56,7 @@ public class RegisterMgr {
      * UnRegister service to the Bus
      * <br/>
      *
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public void unRegister() {
         Map<String, String> paramsMap = new HashMap<>();
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 557ba579..5733efa7 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
@@ -36,7 +36,7 @@ import net.sf.json.JSONObject;
  * <br/>
  *
  * @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
  */
 public class VnfMgr {
 
@@ -93,7 +93,7 @@ public class VnfMgr {
      * @param vnfObject
      * @param vnfmId
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public JSONObject addVnf(JSONObject vnfObject, String vnfmId) {
         JSONObject restJson = new JSONObject();
@@ -139,7 +139,7 @@ public class VnfMgr {
      * @param vnfmId
      * @param vnfObject
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public JSONObject deleteVnf(String vnfId, String vnfmId, JSONObject vnfObject) {
         LOG.warn("function=deleteVnf ,msg=enter to delete a vnf, vnfId:{}, vnfmId:{}", vnfId, vnfmId);
@@ -166,7 +166,7 @@ public class VnfMgr {
      * @param vnfId
      * @param vnfmId
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public JSONObject getVnf(String vnfId, String vnfmId) {
         LOG.warn("function=getVnf ,msg=enter to get a vnf, vnfId:{}, vnfmId:{}", vnfId, vnfmId);
@@ -247,7 +247,7 @@ public class VnfMgr {
      * @param jobId
      * @param vnfmId
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public JSONObject getJob(String jobId, String vnfmId) {
         LOG.warn("function=getJob ,msg=enter to get a job, vnfId:{}", jobId);
@@ -275,7 +275,7 @@ public class VnfMgr {
      *
      * @param vnfObject
      * @param resObject
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public void saveVnfInfo(JSONObject vnfObject, JSONObject resObject) {
         LOG.warn("function=saveVnfInfo , vnfObject:{}", vnfObject);
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfResourceMgr.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfResourceMgr.java
index 96d76ca6..b15f9a1e 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfResourceMgr.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfResourceMgr.java
@@ -38,7 +38,7 @@ import net.sf.json.JSONObject;
  * </p>
  *
  * @author
- * @version NFVO 0.5 Aug 25, 2016
+ * @version VFC 1.0 Aug 25, 2016
  */
 public class VnfResourceMgr {
 
@@ -52,7 +52,7 @@ public class VnfResourceMgr {
      * @param vnfId
      * @param vnfmId
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     public JSONObject grantVnfResource(JSONObject vnfObj, String vnfId, String vnfmId) {
         LOG.warn("function=grantVnfResource, msg=enter to grant vnf resource, params: {}", vnfObj);
@@ -104,7 +104,7 @@ public class VnfResourceMgr {
      *
      * @param grantParam
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     private JSONObject sendGrantToResmgr(JSONObject grantParam) {
         RestfulResponse rsp = VnfmRestfulUtil.getRemoteResponse(ParamConstants.GRANT_RES_URL, VnfmRestfulUtil.TYPE_PUT,
@@ -122,7 +122,7 @@ public class VnfResourceMgr {
      * @param resMap
      * @param grantParam
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     private JSONObject parseGrantParam(Map<String, Integer> resMap, JSONObject grantParam) {
         JSONObject result = new JSONObject();
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoa.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoa.java
index 504a7168..40972053 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoa.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoa.java
@@ -46,7 +46,7 @@ import net.sf.json.JSONObject;
  * </p>
  *
  * @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
  */
 @Path("/rest/plat/smapp/v1")
 @Consumes(MediaType.APPLICATION_JSON)
@@ -67,7 +67,7 @@ public class AuthRoa {
      *
      * @param context
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     @PUT
     @Path("/oauth/token")
@@ -113,7 +113,7 @@ public class AuthRoa {
      * @param userName
      * @param roarand
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     @DELETE
     @Path("/auth/tokens/{userName}/{roarand}")
@@ -135,7 +135,7 @@ public class AuthRoa {
      * @param context
      * @param roattr
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     @GET
     @Path("/nfvo/shakehand")
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java
index d6ef28f6..63e73c97 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java
@@ -29,7 +29,7 @@ import org.apache.commons.io.IOUtils;
  * Swagger API Doc.<br/>
  *
  * @author
- * @version NFVO 0.5 Oct 24, 2016
+ * @version VFC 1.0 Oct 24, 2016
  */
 @Path("/api/hwvnfm/v1")
 @Produces({MediaType.APPLICATION_JSON})
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoa.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoa.java
index b6a9423a..bcc24878 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoa.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoa.java
@@ -36,7 +36,7 @@ import net.sf.json.JSONObject;
  * <br/>
  *
  * @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
  */
 @Path("/rest/v2/computeservice/getAllCloud")
 @Consumes(MediaType.APPLICATION_JSON)
@@ -52,7 +52,7 @@ public class VnfAdapterResourceRoa {
      *
      * @param context
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     @GET
     public String getAllCloudInfo(@Context HttpServletRequest context) {
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfResourceRoa.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfResourceRoa.java
index 47af63ae..be7134ea 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfResourceRoa.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfResourceRoa.java
@@ -38,7 +38,7 @@ import net.sf.json.JSONObject;
  * <br/>
  *
  * @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
  */
 @Path("/rest/vnfmmed/csm/v2/vapps")
 @Consumes(MediaType.APPLICATION_JSON)
@@ -60,7 +60,7 @@ public class VnfResourceRoa {
      * @param context
      * @param vnfId
      * @return
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     @PUT
     @Path("/instances/{vnfId}/grant")
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 20a02d6c..4afd58a3 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
@@ -48,7 +48,7 @@ import net.sf.json.JSONObject;
  * <br/>
  *
  * @author
- * @version NFVO 0.5 Aug 24, 2016
+ * @version VFC 1.0 Aug 24, 2016
  */
 @SuppressWarnings("unchecked")
 @Path("/api/hwvnfm/v1")
@@ -139,7 +139,7 @@ public class VnfRoa {
      * @param vnfmId
      * @return
      * @throws ServiceException
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     @POST
     @Path("/{vnfmId}/vnfs")
@@ -176,7 +176,7 @@ public class VnfRoa {
      * @param context
      * @return
      * @throws ServiceException
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     @POST
     @Path("/{vnfmId}/vnfs/{vnfInstanceId}/terminate")
@@ -212,7 +212,7 @@ public class VnfRoa {
      * @param context
      * @return
      * @throws ServiceException
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     @GET
     @Path("/{vnfmId}/vnfs/{vnfInstanceId}")
@@ -248,7 +248,7 @@ public class VnfRoa {
      * @param responseId
      * @return
      * @throws ServiceException
-     * @since NFVO 0.5
+     * @since VFC 1.0
      */
     @GET
     @Path("/{vnfmId}/jobs/{jobId}")
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index 522739b5..c3436473 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -22,7 +22,7 @@ import org.apache.http.HttpStatus;
  * Exception response model.<br>
  *
  * @author
- * @version NFVO 0.5 Sep 27, 2016
+ * @version VFC 1.0 Sep 27, 2016
  */
 public class ExceptionMessage {
 
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index ade268c8..08eedf97 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -26,7 +26,7 @@ import javax.ws.rs.ext.Provider;
  *
  *
  * @author
- * @version     NFVO 0.5 Sep 27, 2016
+ * @version     VFC 1.0 Sep 27, 2016
  */
 @Provider
 public class GenericExceptionMapper implements ExceptionMapper<Exception>{
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
index 2ee864d6..d8e4a76b 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/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
@@ -27,7 +27,7 @@ import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.restclient.ServiceExcepti
  * ServiceException response provider.<br>
  *
  * @author
- * @version     NFVO 0.5 Sep 27, 2016
+ * @version     VFC 1.0 Sep 27, 2016
  */
 @Provider
 public class ServiceExceptionMapper implements ExceptionMapper<ServiceException>{