21 files changed, 24 insertions, 25 deletions
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java
index 356da82..89e5574 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java
@@ -36,7 +36,7 @@ import net.sf.json.JSONObject;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Sep 24, 2016
+ * @version VFC 1.0 Sep 24, 2016
  */
 public class ResmgrAdapter2MSBManagerTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java
index 0d0e24e..3ddaf26 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java
@@ -30,7 +30,7 @@ import mockit.MockUp;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Sep 24, 2016
+ * @version VFC 1.0 Sep 24, 2016
  */
 public class ResmgrAdapterMgrServiceTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java
index b0095b2..e825afa 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java
@@ -41,7 +41,7 @@ import mockit.MockUp;
  * </p>
  *
  * @author
- * @version NFVO 0.5 2016年8月16日
+ * @version VFC 1.0 2016年8月16日
  */
 public class SitesBusinessImplTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java
index d5e8bdb..02854e5 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java
@@ -36,7 +36,7 @@ import mockit.MockUp;
  * </p>
  *
  * @author
- * @version NFVO 0.5 2016年8月18日
+ * @version VFC 1.0 2016年8月18日
  */
 public class VimBusinessImplTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java
index 7df1ee2..47ca5b2 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java
@@ -39,7 +39,7 @@ import net.sf.json.JSONObject;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Mar 16, 2017
+ * @version VFC 1.0 Mar 16, 2017
  */
 public class GrantResourseRoaTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.java
index e2c402a..dc0350f 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.java
@@ -44,7 +44,7 @@ import net.sf.json.JSONObject;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
  */
 public class HostRoaTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.java
index d92bd31..228ab22 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.java
@@ -38,7 +38,7 @@ import net.sf.json.JSONObject;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
  */
 public class LimitsRoaTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoaTest.java
index 05b80ec..fe34dcd 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoaTest.java
@@ -47,7 +47,7 @@ import net.sf.json.JSONObject;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
  */
 public class LocationRoaTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.java
index 13e6815..8e13d64 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.java
@@ -44,7 +44,7 @@ import net.sf.json.JSONObject;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
  */
 public class NetworkRoaTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.java
index 0feca60..f7bc0bb 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.java
@@ -44,7 +44,7 @@ import net.sf.json.JSONObject;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
  */
 public class PortRoaTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.java
index 4f4fb27..53bf6c2 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.java
@@ -40,7 +40,7 @@ import net.sf.json.JSONObject;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Mar 16, 2017
+ * @version VFC 1.0 Mar 16, 2017
  */
 public class ResOperateRoaTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.java
index 42e5592..f6b7850 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.java
@@ -29,10 +29,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.onap.vfc.nfvo.resmanagement.common.VimUtil;
 import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.SitesImpl;
 import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
-import org.onap.vfc.nfvo.resmanagement.service.rest.SitesRoa;
-import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.springframework.mock.web.MockHttpServletRequest;
 
 import mockit.Mock;
@@ -46,7 +45,7 @@ import net.sf.json.JSONObject;
  * </p>
  *
  * @author
- * @version NFVO 0.5 2016年8月16日
+ * @version VFC 1.0 2016年8月16日
  */
 public class SitesRoaTest {
 
@@ -145,7 +144,7 @@ public class SitesRoaTest {
         };
         JSONObject result = sitesRoa.deleteSites(null, "123");
         JSONObject expectedResult = new JSONObject();
-        expectedResult.put("msg", "org.openo.nfvo.resmanage.common.del.success");
+        expectedResult.put("msg", "delete success");
         assertEquals(expectedResult.toString(), result.toString());
     }
 
@@ -182,7 +181,7 @@ public class SitesRoaTest {
         };
         JSONObject result = sitesRoa.updateSites(null);
         JSONObject expectedResult = new JSONObject();
-        expectedResult.put("msg", "org.openo.nfvo.resmanage.common.update.success");
+        expectedResult.put("msg", "update success");
         assertEquals(expectedResult.toString(), result.toString());
     }
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoaTest.java
index eccc4d9..fb7a1fe 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SwaggerRoaTest.java
@@ -34,7 +34,7 @@ import mockit.MockUp;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
  */
 public class SwaggerRoaTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java
index 23e2591..e791f31 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java
@@ -44,7 +44,7 @@ import net.sf.json.JSONObject;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
  */
 public class VirtualLinkRoaTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.java
index 8ecd1d5..de8e3ce 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.java
@@ -44,7 +44,7 @@ import net.sf.json.JSONObject;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
  */
 public class VmRoaTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java
index 5de4276..bf16a72 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java
@@ -44,7 +44,7 @@ import net.sf.json.JSONObject;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
  */
 public class VnfInfoRoaTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.java
index 216c0fc..d934e6e 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.java
@@ -44,7 +44,7 @@ import net.sf.json.JSONObject;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Feb 10, 2017
+ * @version VFC 1.0 Feb 10, 2017
  */
 public class VnfRoaTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java
index 4d8cbca..f8a5ec0 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java
@@ -44,7 +44,7 @@ import net.sf.json.JSONObject;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Feb 10, 2017
+ * @version VFC 1.0 Feb 10, 2017
  */
 public class VnfStatusRoaTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessageTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessageTest.java
index c3a3c33..680ec03 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessageTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ExceptionMessageTest.java
@@ -28,7 +28,7 @@ import org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper.ExceptionMes
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
  */
 public class ExceptionMessageTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapperTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapperTest.java
index e6b4916..b2be916 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapperTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/GenericExceptionMapperTest.java
@@ -29,7 +29,7 @@ import org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper.GenericExcep
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
  */
 public class GenericExceptionMapperTest {
 
diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java
index dd2bc29..dbe78e3 100644
--- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java
+++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java
@@ -30,7 +30,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
  * </p>
  * 
  * @author
- * @version NFVO 0.5 Feb 9, 2017
+ * @version VFC 1.0 Feb 9, 2017
  */
 public class ServiceExceptionMapperTest {