Merge "Junit coverage increased Issue-ID: VFC-1726"

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtilTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtilTest.java
index 8792f52..d660662 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtilTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtilTest.java
@@ -31,14 +31,14 @@ public class ResultRequestUtilTest {
 
     @Test
     public void callTestInternalError() {
-        new MockUp<ConnectMgrVnfm>() {
-
-            @Mock
-            public int connect(JSONObject vnfmObj) {
-                return 500;
-            }
-        };
-       
+//        new MockUp<ConnectMgrVnfm>() {
+//
+//            @Mock
+//            public int connect(JSONObject vnfmObj) {
+//                return 500;
+//            }
+//        };
+//     
        
         JSONObject vnfmObject = new JSONObject();
         String path = "http://localhost:8080";
@@ -53,13 +53,13 @@ public class ResultRequestUtilTest {
 
     @Test
     public void callTestConnectionErrot() {
-        new MockUp<ConnectMgrVnfm>() {
-
-            @Mock
-            public int connect(JSONObject vnfmObj) {
-                return 200;
-            }
-        };
+//        new MockUp<ConnectMgrVnfm>() {
+//
+//            @Mock
+//            public int connect(JSONObject vnfmObj) {
+//                return 200;
+//            }
+//        };
         JSONObject vnfmObject = new JSONObject();
         vnfmObject.put("url", "/test/123");
         String path = "http://localhost:8080";
@@ -71,24 +71,24 @@ public class ResultRequestUtilTest {
 
     @Test
     public void callTest() {
-        new MockUp<ConnectMgrVnfm>() {
-
-            @Mock
-            public int connect(JSONObject vnfmObj) {
-                return 200;
-            }
-
-            @Mock
-            public String getRoaRand() {
-                return "1234";
-            }
-
-            @Mock
-            public String getAccessSession() {
-                return "1234";
-            }
-
-        };
+//        new MockUp<ConnectMgrVnfm>() {
+//
+//            @Mock
+//            public int connect(JSONObject vnfmObj) {
+//                return 200;
+//            }
+//
+//            @Mock
+//            public String getRoaRand() {
+//                return "1234";
+//            }
+//
+//            @Mock
+//            public String getAccessSession() {
+//                return "1234";
+//            }
+//
+//        };
 
         JSONObject vnfmObject = new JSONObject();
         vnfmObject.put("url", "/test/123");
@@ -126,5 +126,5 @@ public class ResultRequestUtilTest {
                String paramsJson = "";
                assertNotNull(ResultRequestUtil.callSouth(vnfmObject, path, methodName, paramsJson, "authModel"));
        }
-
+       
 }

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/restclient/TestHttpRest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/restclient/TestHttpRest.java
index 84de1a2..fb22039 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/restclient/TestHttpRest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/restclient/TestHttpRest.java
@@ -79,12 +79,12 @@ public class TestHttpRest {
         httpClient.start();
         Request request = httpClient.newRequest("http://reqres.in/api/users/2");
         ContentResponse contentResponse = request.send();
-        new MockUp<HttpBaseRest>() {
-            @Mock
-            public ContentResponse getResponse() {
-                return contentResponse;
-            }
-        };
+//        new MockUp<HttpBaseRest>() {
+//            @Mock
+//            public ContentResponse getResponse() {
+//                return contentResponse;
+//            }
+//        };
     }
 
     /**
@@ -127,12 +127,12 @@ public class TestHttpRest {
     @Test
     public void testInitHttpRest() throws Exception {
         final RestfulOptions options = new RestfulOptions();
-        new MockUp<HttpClient>() {
-
-            @Mock
-            public void doStart() {
-            }
-        };
+//        new MockUp<HttpClient>() {
+//
+//            @Mock
+//            public void doStart() {
+//            }
+//        };
         final HttpRest httpRest = new HttpRest();
         httpRest.initHttpRest(options);
         final Field httpClient = HttpBaseRest.class.getDeclaredField("client");

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/restclient/TestRestfulFactory.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/restclient/TestRestfulFactory.java
index eccbb8d..820d339 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/restclient/TestRestfulFactory.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/restclient/TestRestfulFactory.java
@@ -89,14 +89,14 @@ public class TestRestfulFactory {
     public void testGetRestInstance() {
         Restful instance = RestfulFactory.getRestInstance("https");
 
-        new MockUp<HttpRest>() {
-
-            @Mock
-            public void initHttpRest(final RestfulOptions option) throws ServiceException {
-                throw new ServiceException();
-            }
-
-        };
+//        new MockUp<HttpRest>() {
+//
+//            @Mock
+//            public void initHttpRest(final RestfulOptions option) throws ServiceException {
+//                throw new ServiceException();
+//            }
+//
+//        };
         instance = RestfulFactory.getRestInstance("http");
         assertNotNull(instance);
 

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VNFRestfulUtilTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VNFRestfulUtilTest.java
index 2bdbc11..929733e 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VNFRestfulUtilTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/servicetoken/VNFRestfulUtilTest.java
@@ -83,17 +83,17 @@ public class VNFRestfulUtilTest {
     }
     @Test
     public void sendReqToAppTest(){
-        new MockUp<VNFRestfulUtil>(){
-            @Mock
-            public RestfulResponse getRestResByDefault(String path, String methodNames, JSONObject bodyParam) {
-                RestfulResponse resp = new RestfulResponse();
-                resp.setStatus(200);
-                Map<String,Object> map = new HashMap<>();
-                map.put("retCode", 1);
-                resp.setResponseJson(toJson(map));
-                return resp;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>(){
+//            @Mock
+//            public RestfulResponse getRestResByDefault(String path, String methodNames, JSONObject bodyParam) {
+//                RestfulResponse resp = new RestfulResponse();
+//                resp.setStatus(200);
+//                Map<String,Object> map = new HashMap<>();
+//                map.put("retCode", 1);
+//                resp.setResponseJson(toJson(map));
+//                return resp;
+//            }
+//        };
         String path="http://localhost:8080/vnfdmgr/v1";
         String methodNames = "get";
         JSONObject bodyParam = new JSONObject();
@@ -104,17 +104,17 @@ public class VNFRestfulUtilTest {
 
     @Test
     public void sendReqToAppTest2(){
-        new MockUp<VNFRestfulUtil>(){
-            @Mock
-            public RestfulResponse getRestResByDefault(String path, String methodNames, JSONObject bodyParam) {
-                RestfulResponse resp = new RestfulResponse();
-                resp.setStatus(200);
-                Map<String,Object> map = new HashMap<>();
-                map.put("retCode", -1);
-                resp.setResponseJson(toJson(map));
-                return resp;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>(){
+//            @Mock
+//            public RestfulResponse getRestResByDefault(String path, String methodNames, JSONObject bodyParam) {
+//                RestfulResponse resp = new RestfulResponse();
+//                resp.setStatus(200);
+//                Map<String,Object> map = new HashMap<>();
+//                map.put("retCode", -1);
+//                resp.setResponseJson(toJson(map));
+//                return resp;
+//            }
+//        };
         String path="http://localhost:8080/vnfdmgr/v1";
         String methodNames = "get";
         JSONObject bodyParam = new JSONObject();
@@ -124,17 +124,17 @@ public class VNFRestfulUtilTest {
     }
     @Test
     public void sendReqToAppTest3(){
-        new MockUp<VNFRestfulUtil>(){
-            @Mock
-            public RestfulResponse getRestResByDefault(String path, String methodNames, JSONObject bodyParam) {
-                RestfulResponse resp = new RestfulResponse();
-                resp.setStatus(500);
-                Map<String,Object> map = new HashMap<>();
-                map.put("retCode", -1);
-                resp.setResponseJson(toJson(map));
-                return resp;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>(){
+//            @Mock
+//            public RestfulResponse getRestResByDefault(String path, String methodNames, JSONObject bodyParam) {
+//                RestfulResponse resp = new RestfulResponse();
+//                resp.setStatus(500);
+//                Map<String,Object> map = new HashMap<>();
+//                map.put("retCode", -1);
+//                resp.setResponseJson(toJson(map));
+//                return resp;
+//            }
+//        };
         String path="http://localhost:8080/vnfdmgr/v1";
         String methodNames = "get";
         JSONObject bodyParam = new JSONObject();

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManagerTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManagerTest.java
index b79d041..a0381e9 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManagerTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManagerTest.java
@@ -20,25 +20,15 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.HttpMethodBase;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.DownloadCsarManager;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmUtil;
 import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.restclient.RestfulParametes;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.restclient.RestfulResponse;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken.VNFRestfulUtil;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect.ConnectMgrVnfm;
 import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.testutils.JsonUtil;
 
-import mockit.Mock;
-import mockit.MockUp;
-import net.sf.json.JSONArray;
 import net.sf.json.JSONException;
 import net.sf.json.JSONObject;
 
@@ -193,21 +183,21 @@ public class AdapterResourceManagerTest {
 
     @Test
     public void getVnfmConnInfoTestSuccess() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse resp = new RestfulResponse();
-                resp.setStatus(200);
-                Map<String, String> objMap = new HashMap<String, String>();
-                objMap.put("id", "test123");
-
-                String responseString = toJson(objMap);
-                resp.setResponseJson(responseString);
-                return resp;
-            }
-
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse resp = new RestfulResponse();
+//                resp.setStatus(200);
+//                Map<String, String> objMap = new HashMap<String, String>();
+//                objMap.put("id", "test123");
+//
+//                String responseString = toJson(objMap);
+//                resp.setResponseJson(responseString);
+//                return resp;
+//            }
+//
+//        };
         Map<String, String> paramsMap = new HashMap<String, String>();
         JSONObject res = manager.getVnfmConnInfo(paramsMap);
         assertTrue(res.get("id").equals("test123"));
@@ -215,15 +205,15 @@ public class AdapterResourceManagerTest {
 
     @Test
     public void getVnfmConnInfoTestNullResp() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-
-                return null;
-            }
-
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//
+//                return null;
+//            }
+//
+//        };
         Map<String, String> paramsMap = new HashMap<String, String>();
         JSONObject res = manager.getVnfmConnInfo(paramsMap);
         assertTrue(res.get("reason").equals("RestfulResponse is null."));
@@ -231,21 +221,21 @@ public class AdapterResourceManagerTest {
 
     @Test
     public void getVnfmConnInfoTestServerError() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse resp = new RestfulResponse();
-                resp.setStatus(500);
-                Map<String, String> objMap = new HashMap<String, String>();
-                objMap.put("id", "test123");
-
-                String responseString = toJson(objMap);
-                resp.setResponseJson(responseString);
-                return resp;
-            }
-
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse resp = new RestfulResponse();
+//                resp.setStatus(500);
+//                Map<String, String> objMap = new HashMap<String, String>();
+//                objMap.put("id", "test123");
+//
+//                String responseString = toJson(objMap);
+//                resp.setResponseJson(responseString);
+//                return resp;
+//            }
+//
+//        };
         Map<String, String> paramsMap = new HashMap<String, String>();
         JSONObject res = manager.getVnfmConnInfo(paramsMap);
         assertTrue(res.get("reason").equals("ESR return fail."));
@@ -293,22 +283,22 @@ public class AdapterResourceManagerTest {
     }
     @Test
     public void testUnzipCSAR4(){
-        new MockUp<DownloadCsarManager>(){
-            @Mock
-            public  int unzipCSAR(String fileName,String filePath){
-                return 0;
-            }
-        };
+//        new MockUp<DownloadCsarManager>(){
+//            @Mock
+//            public  int unzipCSAR(String fileName,String filePath){
+//                return 0;
+//            }
+//        };
         manager.unzipCSAR("vCpe.zip","/opt");
     }
     @Test
     public void testUnzipCSAR5(){
-        new MockUp<DownloadCsarManager>(){
-            @Mock
-            public  int unzipCSAR(String fileName,String filePath){
-                return -1;
-            }
-        };
+//        new MockUp<DownloadCsarManager>(){
+//            @Mock
+//            public  int unzipCSAR(String fileName,String filePath){
+//                return -1;
+//            }
+//        };
         manager.unzipCSAR("vCpe.zip","/opt");
     }
 
@@ -332,34 +322,34 @@ public class AdapterResourceManagerTest {
     @Test
     public void testgetVNFDPlanInfoConn(){
        
-       new MockUp<HttpClient>(){
-               @Mock
-               public int executeMethod(HttpMethod method) {
-                   return 200;
-               }
-           };
-       
-           new MockUp<HttpMethodBase>(){
-               
-               @Mock 
-                public int getStatusCode(){
-                       
-                       return 200;
-               }
-               
-               @Mock 
-                public String getResponseBodyAsString()
-                                  throws IOException
-                                 {
-                       JSONObject jobj = new JSONObject();
-                       jobj.put("Status", 200);
-                       jobj.put("UserName", "User");
-                       jobj.put("password", "pass");
-                       String str = jobj.toString();
-                       return str;
-                                  }
-               
-           };
+//     new MockUp<HttpClient>(){
+//             @Mock
+//             public int executeMethod(HttpMethod method) {
+//                 return 200;
+//             }
+//         };
+//     
+//         new MockUp<HttpMethodBase>(){
+//             
+//             @Mock 
+//              public int getStatusCode(){
+//                     
+//                     return 200;
+//             }
+//             
+//             @Mock 
+//              public String getResponseBodyAsString()
+//                                throws IOException
+//                               {
+//                     JSONObject jobj = new JSONObject();
+//                     jobj.put("Status", 200);
+//                     jobj.put("UserName", "User");
+//                     jobj.put("password", "pass");
+//                     String str = jobj.toString();
+//                     return str;
+//                                }
+//             
+//         };
        
        manager.getVNFDPlanInfo("https://127.0.0.1:80", "vnfd123", "accessSession");
        }
@@ -367,30 +357,30 @@ public class AdapterResourceManagerTest {
     @Test
     public void testgetVNFDPlanInfoConn500(){
        
-       new MockUp<HttpClient>(){
-               @Mock
-               public int executeMethod(HttpMethod method) {
-                   return 200;
-               }
-           };
-       
-           new MockUp<HttpMethodBase>(){
-               
-               @Mock 
-                public int getStatusCode(){
-                       
-                       return 500;
-               }
-               
-                @Mock 
-                public String getResponseBodyAsString()
-                                  throws IOException
-                                 {
-                       String str = "Failed";
-                       return str;
-                                  }
-               
-           };
+//     new MockUp<HttpClient>(){
+//             @Mock
+//             public int executeMethod(HttpMethod method) {
+//                 return 200;
+//             }
+//         };
+//     
+//         new MockUp<HttpMethodBase>(){
+//             
+//             @Mock 
+//              public int getStatusCode(){
+//                     
+//                     return 500;
+//             }
+//             
+//              @Mock 
+//              public String getResponseBodyAsString()
+//                                throws IOException
+//                               {
+//                     String str = "Failed";
+//                     return str;
+//                                }
+//             
+//         };
        
        manager.getVNFDPlanInfo("https://127.0.0.1:80", "vnfd123", "accessSession");
        }
@@ -399,34 +389,34 @@ public class AdapterResourceManagerTest {
     @Test
     public void testGetVnfdVersion200(){
        
-       new MockUp<HttpClient>(){
-               @Mock
-               public int executeMethod(HttpMethod method) {
-                   return 200;
-               }
-           };
-           
-           new MockUp<HttpMethodBase>(){
-               
-               @Mock 
-                public int getStatusCode(){
-                       
-                       return 200;
-               }
-               
-               @Mock 
-                public String getResponseBodyAsString()
-                                  throws IOException
-                                 {
-                       JSONObject jobj = new JSONObject();
-                       jobj.put("Status", 200);
-                       jobj.put("UserName", "User");
-                       jobj.put("password", "pass");
-                       String str = jobj.toString();
-                       return str;
-                                  }
-               
-           };
+//     new MockUp<HttpClient>(){
+//             @Mock
+//             public int executeMethod(HttpMethod method) {
+//                 return 200;
+//             }
+//         };
+//         
+//         new MockUp<HttpMethodBase>(){
+//             
+//             @Mock 
+//              public int getStatusCode(){
+//                     
+//                     return 200;
+//             }
+//             
+//             @Mock 
+//              public String getResponseBodyAsString()
+//                                throws IOException
+//                               {
+//                     JSONObject jobj = new JSONObject();
+//                     jobj.put("Status", 200);
+//                     jobj.put("UserName", "User");
+//                     jobj.put("password", "pass");
+//                     String str = jobj.toString();
+//                     return str;
+//                                }
+//             
+//         };
            
            JSONObject jobj = manager.getVnfdVersion("http://","127.0.0.1:80","accessSession");
     }
@@ -434,29 +424,29 @@ public class AdapterResourceManagerTest {
     @Test
     public void testGetVnfdVersion500(){
        
-       new MockUp<HttpClient>(){
-               @Mock
-               public int executeMethod(HttpMethod method) {
-                   return 200;
-               }
-           };
-           
-           new MockUp<HttpMethodBase>(){
-               
-               @Mock 
-                public int getStatusCode(){
-                       
-                       return 500;
-               }
-               
-           @Mock 
-        public String getResponseBodyAsString()
-                          throws IOException
-                         {
-               String str = "Failed";
-               return str;
-                          }
-           };
+//     new MockUp<HttpClient>(){
+//             @Mock
+//             public int executeMethod(HttpMethod method) {
+//                 return 200;
+//             }
+//         };
+//         
+//         new MockUp<HttpMethodBase>(){
+//             
+//             @Mock 
+//              public int getStatusCode(){
+//                     
+//                     return 500;
+//             }
+//             
+//         @Mock 
+//      public String getResponseBodyAsString()
+//                        throws IOException
+//                       {
+//             String str = "Failed";
+//             return str;
+//                        }
+//         };
            
         manager.getVnfdVersion("http://","127.0.0.1:80","accessSession");
     }
@@ -554,38 +544,38 @@ public class AdapterResourceManagerTest {
     @Test
     public void testGetAllCloudUrlandaccessSession(){
        
-       new MockUp<HttpClient>(){
-               @Mock
-               public int executeMethod(HttpMethod method) {
-                   return 200;
-               }
-           };
-           
-           new MockUp<HttpMethodBase>(){
-               
-               @Mock 
-                public int getStatusCode(){
-                       
-                       return 200;
-               }
-               
-               @Mock 
-                public String getResponseBodyAsString()
-                                  throws IOException
-                                 {
-                       String str = "{\n\t\"driverInfo\": {\n\t\t\"driverName\": \"hwvnfm\",\n\t\t\"instanceID\": \"hwvnfm-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\"services\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\"support_sys\": [{\n\t\t\t\t\"type\": \"vnfm\",\n\t\t\t\t\"version\": \"V100R001\"\n\t\t\t}]\n\t\t}]\n\t}\n}";
-                       JSONObject jobj = new JSONObject();
-                       jobj.put("Status", 200);
-                       jobj.put("UserName", "User");
-                       jobj.put("password", "pass");
-                       JSONArray ja = new JSONArray();
-                       ja.add(str);
-                       jobj.put("vim_info", ja);
-                       String str1 = jobj.toString();
-                       return str1;
-                                  }
-               
-           };
+//     new MockUp<HttpClient>(){
+//             @Mock
+//             public int executeMethod(HttpMethod method) {
+//                 return 200;
+//             }
+//         };
+//         
+//         new MockUp<HttpMethodBase>(){
+//             
+//             @Mock 
+//              public int getStatusCode(){
+//                     
+//                     return 200;
+//             }
+//             
+//             @Mock 
+//              public String getResponseBodyAsString()
+//                                throws IOException
+//                               {
+//                     String str = "{\n\t\"driverInfo\": {\n\t\t\"driverName\": \"hwvnfm\",\n\t\t\"instanceID\": \"hwvnfm-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\"services\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\"support_sys\": [{\n\t\t\t\t\"type\": \"vnfm\",\n\t\t\t\t\"version\": \"V100R001\"\n\t\t\t}]\n\t\t}]\n\t}\n}";
+//                     JSONObject jobj = new JSONObject();
+//                     jobj.put("Status", 200);
+//                     jobj.put("UserName", "User");
+//                     jobj.put("password", "pass");
+//                     JSONArray ja = new JSONArray();
+//                     ja.add(str);
+//                     jobj.put("vim_info", ja);
+//                     String str1 = jobj.toString();
+//                     return str1;
+//                                }
+//             
+//         };
            
            System.setProperty("catalina.base", "C:/Users/Huawei/Desktop");
         String url = "http://127.0.0.1:31943";
@@ -596,30 +586,30 @@ public class AdapterResourceManagerTest {
     @Test
     public void testGetAllCloudUrlandaccessSession500(){
        
-       new MockUp<HttpClient>(){
-               @Mock
-               public int executeMethod(HttpMethod method) {
-                   return 200;
-               }
-           };
-           
-           new MockUp<HttpMethodBase>(){
-               
-               @Mock 
-                public int getStatusCode(){
-                       
-                       return 500;
-               }
-               
-               @Mock 
-                public String getResponseBodyAsString()
-                                  throws IOException
-                                 {
-                       String str = "Failed";
-                       return str;
-                                  }
-               
-           };
+//     new MockUp<HttpClient>(){
+//             @Mock
+//             public int executeMethod(HttpMethod method) {
+//                 return 200;
+//             }
+//         };
+//         
+//         new MockUp<HttpMethodBase>(){
+//             
+//             @Mock 
+//              public int getStatusCode(){
+//                     
+//                     return 500;
+//             }
+//             
+//             @Mock 
+//              public String getResponseBodyAsString()
+//                                throws IOException
+//                               {
+//                     String str = "Failed";
+//                     return str;
+//                                }
+//             
+//         };
            
            System.setProperty("catalina.base", "C:/Users/Huawei/Desktop");
         String url = "http://127.0.0.1:31943";
@@ -630,34 +620,34 @@ public class AdapterResourceManagerTest {
     @Test
     public void testUpload(){
        
-       new MockUp<HttpClient>(){
-               @Mock
-               public int executeMethod(HttpMethod method) {
-                   return 200;
-               }
-           };
-           
-           new MockUp<HttpMethodBase>(){
-               
-               @Mock 
-                public int getStatusCode(){
-                       
-                       return 200;
-               }
-               
-               @Mock 
-                public String getResponseBodyAsString()
-                                  throws IOException
-                                 {
-                       JSONObject jobj = new JSONObject();
-                       jobj.put("Status", 200);
-                       jobj.put("UserName", "User");
-                       jobj.put("password", "pass");
-                       String str = jobj.toString();
-                       return str;
-                                  }
-               
-           };
+//     new MockUp<HttpClient>(){
+//             @Mock
+//             public int executeMethod(HttpMethod method) {
+//                 return 200;
+//             }
+//         };
+//         
+//         new MockUp<HttpMethodBase>(){
+//             
+//             @Mock 
+//              public int getStatusCode(){
+//                     
+//                     return 200;
+//             }
+//             
+//             @Mock 
+//              public String getResponseBodyAsString()
+//                                throws IOException
+//                               {
+//                     JSONObject jobj = new JSONObject();
+//                     jobj.put("Status", 200);
+//                     jobj.put("UserName", "User");
+//                     jobj.put("password", "pass");
+//                     String str = jobj.toString();
+//                     return str;
+//                                }
+//             
+//         };
            
        JSONObject vnfpackage = new JSONObject();
        vnfpackage.put("UserName", "User");
@@ -671,31 +661,31 @@ public class AdapterResourceManagerTest {
     @Test
     public void testUploadNoJson(){
        
-       new MockUp<HttpClient>(){
-               @Mock
-               public int executeMethod(HttpMethod method) {
-                   return 200;
-               }
-           };
-           
-           new MockUp<HttpMethodBase>(){
-               
-               @Mock 
-                public int getStatusCode(){
-                       
-                       return 200;
-               }
-               
-               @Mock 
-                public String getResponseBodyAsString()
-                                  throws IOException
-                                 {
-                       
-                       String str = "Test";
-                       return str;
-                                  }
-               
-           };
+//     new MockUp<HttpClient>(){
+//             @Mock
+//             public int executeMethod(HttpMethod method) {
+//                 return 200;
+//             }
+//         };
+//         
+//         new MockUp<HttpMethodBase>(){
+//             
+//             @Mock 
+//              public int getStatusCode(){
+//                     
+//                     return 200;
+//             }
+//             
+//             @Mock 
+//              public String getResponseBodyAsString()
+//                                throws IOException
+//                               {
+//                     
+//                     String str = "Test";
+//                     return str;
+//                                }
+//             
+//         };
            
        JSONObject vnfpackage = new JSONObject();
        vnfpackage.put("UserName", "User");
@@ -709,30 +699,30 @@ public class AdapterResourceManagerTest {
     @Test
     public void testUpload500(){
        
-       new MockUp<HttpClient>(){
-               @Mock
-               public int executeMethod(HttpMethod method) {
-                   return 200;
-               }
-           };
-           
-           new MockUp<HttpMethodBase>(){
-               
-               @Mock 
-                public int getStatusCode(){
-                       
-                       return 500;
-               }
-               
-               @Mock 
-                public String getResponseBodyAsString()
-                                  throws IOException
-                                 {
-                       String str = "Failed";
-                       return str;
-                                  }
-               
-           };
+//     new MockUp<HttpClient>(){
+//             @Mock
+//             public int executeMethod(HttpMethod method) {
+//                 return 200;
+//             }
+//         };
+//         
+//         new MockUp<HttpMethodBase>(){
+//             
+//             @Mock 
+//              public int getStatusCode(){
+//                     
+//                     return 500;
+//             }
+//             
+//             @Mock 
+//              public String getResponseBodyAsString()
+//                                throws IOException
+//                               {
+//                     String str = "Failed";
+//                     return str;
+//                                }
+//             
+//         };
            
        JSONObject vnfpackage = new JSONObject();
        vnfpackage.put("UserName", "User");
@@ -758,13 +748,13 @@ public class AdapterResourceManagerTest {
     @Test
     public void downloadCsarTest() {
        
-       new MockUp<DownloadCsarManager>(){
-       @Mock
-       public String download(String url, String filepath) {
-                       return "Success";
-       
-       }
-       };
+//     new MockUp<DownloadCsarManager>(){
+//     @Mock
+//     public String download(String url, String filepath) {
+//                     return "Success";
+//     
+//     }
+//     };
        
         String url = "http://localhost:8080";
         String filePath = "src/test/resources/Check.txt";
@@ -775,42 +765,42 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTest() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<RestfulResponse>(){
-               
-               @Mock
-                public String getResponseContent() {
-                       
-                               return "Success";
-                }
-               
-       };
-       
-       new MockUp<JSONObject>(){
-       @Mock
-       public JSONObject fromObject(Object object){
-               JSONObject js = new JSONObject();
-               js.put("Result", "Success");
-               js.put("Check", "Ok");
-               js.put("downloadUri", "http://127.0.0.1:80");
-               return js;
-       }
-       };
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<RestfulResponse>(){
+//             
+//             @Mock
+//              public String getResponseContent() {
+//                     
+//                             return "Success";
+//              }
+//             
+//     };
+//     
+//     new MockUp<JSONObject>(){
+//     @Mock
+//     public JSONObject fromObject(Object object){
+//             JSONObject js = new JSONObject();
+//             js.put("Result", "Success");
+//             js.put("Check", "Ok");
+//             js.put("downloadUri", "http://127.0.0.1:80");
+//             return js;
+//     }
+//     };
 
        JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -829,50 +819,50 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestSuccess() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<RestfulResponse>(){
-               
-               @Mock
-                public String getResponseContent() {
-                       
-                               return "Success";
-                }
-               
-       };
-       
-       new MockUp<JSONObject>(){
-       @Mock
-       public JSONObject fromObject(Object object){
-               JSONObject js = new JSONObject();
-               js.put("Result", "Success");
-               js.put("Check", "Ok");
-               js.put("downloadUri", "http://127.0.0.1:80");
-               return js;
-       }
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       return "Success";
-               
-               }
-               };
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<RestfulResponse>(){
+//             
+//             @Mock
+//              public String getResponseContent() {
+//                     
+//                             return "Success";
+//              }
+//             
+//     };
+//     
+//     new MockUp<JSONObject>(){
+//     @Mock
+//     public JSONObject fromObject(Object object){
+//             JSONObject js = new JSONObject();
+//             js.put("Result", "Success");
+//             js.put("Check", "Ok");
+//             js.put("downloadUri", "http://127.0.0.1:80");
+//             return js;
+//     }
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     return "Success";
+//             
+//             }
+//             };
        
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -891,58 +881,58 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestSuccessUNZIP() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<RestfulResponse>(){
-               
-               @Mock
-                public String getResponseContent() {
-                       
-                               return "Success";
-                }
-               
-       };
-       
-       new MockUp<JSONObject>(){
-       @Mock
-       public JSONObject fromObject(Object object){
-               JSONObject js = new JSONObject();
-               js.put("Result", "Success");
-               js.put("Check", "Ok");
-               js.put("downloadUri", "http://127.0.0.1:80");
-               return js;
-       }
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       return "Success";
-               
-               }
-               };
-       
-               new MockUp<DownloadCsarManager>(){
-               @Mock
-                public int unzipCSAR(String fileName, String filePath) {
-                               return 0;
-               
-               }
-               };
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<RestfulResponse>(){
+//             
+//             @Mock
+//              public String getResponseContent() {
+//                     
+//                             return "Success";
+//              }
+//             
+//     };
+//     
+//     new MockUp<JSONObject>(){
+//     @Mock
+//     public JSONObject fromObject(Object object){
+//             JSONObject js = new JSONObject();
+//             js.put("Result", "Success");
+//             js.put("Check", "Ok");
+//             js.put("downloadUri", "http://127.0.0.1:80");
+//             return js;
+//     }
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     return "Success";
+//             
+//             }
+//             };
+//     
+//             new MockUp<DownloadCsarManager>(){
+//             @Mock
+//              public int unzipCSAR(String fileName, String filePath) {
+//                             return 0;
+//             
+//             }
+//             };
                
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -961,58 +951,58 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestSuccessUNZIPFTPSClient() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<RestfulResponse>(){
-               
-               @Mock
-                public String getResponseContent() {
-                       
-                               return "Success";
-                }
-               
-       };
-       
-       new MockUp<JSONObject>(){
-       @Mock
-       public JSONObject fromObject(Object object){
-               JSONObject js = new JSONObject();
-               js.put("Result", "Success");
-               js.put("Check", "Ok");
-               js.put("downloadUri", "http://127.0.0.1:80");
-               return js;
-       }
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       return "Success";
-               
-               }
-               };
-       
-               new MockUp<DownloadCsarManager>(){
-               @Mock
-                public int unzipCSAR(String fileName, String filePath) {
-                               return 0;
-               
-               }
-               };
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<RestfulResponse>(){
+//             
+//             @Mock
+//              public String getResponseContent() {
+//                     
+//                             return "Success";
+//              }
+//             
+//     };
+//     
+//     new MockUp<JSONObject>(){
+//     @Mock
+//     public JSONObject fromObject(Object object){
+//             JSONObject js = new JSONObject();
+//             js.put("Result", "Success");
+//             js.put("Check", "Ok");
+//             js.put("downloadUri", "http://127.0.0.1:80");
+//             return js;
+//     }
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     return "Success";
+//             
+//             }
+//             };
+//     
+//             new MockUp<DownloadCsarManager>(){
+//             @Mock
+//              public int unzipCSAR(String fileName, String filePath) {
+//                             return 0;
+//             
+//             }
+//             };
                
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -1034,60 +1024,60 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestSuccessUNZIPWithUrl() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<RestfulResponse>(){
-               
-               @Mock
-                public String getResponseContent() {
-                       
-                               return "Success";
-                }
-               
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       return "Success";
-               
-               }
-               };
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       return js;
-               }
-               };
-               
-               new MockUp<DownloadCsarManager>(){
-               @Mock
-                public int unzipCSAR(String fileName, String filePath) {
-                               return 0;
-               
-               }
-               };
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<RestfulResponse>(){
+//             
+//             @Mock
+//              public String getResponseContent() {
+//                     
+//                             return "Success";
+//              }
+//             
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     return "Success";
+//             
+//             }
+//             };
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     return js;
+//             }
+//             };
+//             
+//             new MockUp<DownloadCsarManager>(){
+//             @Mock
+//              public int unzipCSAR(String fileName, String filePath) {
+//                             return 0;
+//             
+//             }
+//             };
                
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -1107,41 +1097,41 @@ public class AdapterResourceManagerTest {
     @Test
     public void uploadVNFPackageTestSuccessUNZIP1() {
        
-       new MockUp<RestfulResponse>(){
-               
-               @Mock
-                public String getResponseContent() {
-                       
-                               return "Success";
-                }
-               
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       return "Success";
-               
-               }
-               };
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       return js;
-               }
-               };
-               
-               new MockUp<DownloadCsarManager>(){
-               @Mock
-                public int unzipCSAR(String fileName, String filePath) {
-                               return 0;
-               
-               }
-               };
+//     new MockUp<RestfulResponse>(){
+//             
+//             @Mock
+//              public String getResponseContent() {
+//                     
+//                             return "Success";
+//              }
+//             
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     return "Success";
+//             
+//             }
+//             };
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     return js;
+//             }
+//             };
+//             
+//             new MockUp<DownloadCsarManager>(){
+//             @Mock
+//              public int unzipCSAR(String fileName, String filePath) {
+//                             return 0;
+//             
+//             }
+//             };
                
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -1160,71 +1150,71 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestSuccessConnect() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<RestfulResponse>(){
-               
-               @Mock
-                public String getResponseContent() {
-                       
-                               return "Success";
-                }
-               
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       return "Success";
-               
-               }
-               };
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       return js;
-               }
-               };
-               
-               new MockUp<DownloadCsarManager>(){
-               @Mock
-                public int unzipCSAR(String fileName, String filePath) {
-                               return 0;
-               
-               }
-               };
-               
-               new MockUp<ConnectMgrVnfm>(){
-                       
-                       @Mock
-                        public int connect(JSONObject vnfmObj, String authModel) {
-                               
-                               authModel = "accessSession";
-                               return 200;
-                       }
-                       
-               };
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<RestfulResponse>(){
+//             
+//             @Mock
+//              public String getResponseContent() {
+//                     
+//                             return "Success";
+//              }
+//             
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     return "Success";
+//             
+//             }
+//             };
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     return js;
+//             }
+//             };
+//             
+//             new MockUp<DownloadCsarManager>(){
+//             @Mock
+//              public int unzipCSAR(String fileName, String filePath) {
+//                             return 0;
+//             
+//             }
+//             };
+//             
+//             new MockUp<ConnectMgrVnfm>(){
+//                     
+//                     @Mock
+//                      public int connect(JSONObject vnfmObj, String authModel) {
+//                             
+//                             authModel = "accessSession";
+//                             return 200;
+//                     }
+//                     
+//             };
                
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -1243,113 +1233,113 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestSuccessConnectPath() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<RestfulResponse>(){
-               
-               @Mock
-                public String getResponseContent() {
-                       
-                               return "Success";
-                }
-               
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       return "Success";
-               
-               }
-               };
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       js.put("vim_info", ja);
-                       return js;
-               }
-               };
-               
-               new MockUp<DownloadCsarManager>(){
-               @Mock
-                public int unzipCSAR(String fileName, String filePath) {
-                               return 0;
-               
-               }
-               };
-               
-               new MockUp<ConnectMgrVnfm>(){
-                       
-                       @Mock
-                        public int connect(JSONObject vnfmObj, String authModel) {
-                               vnfmObj.put("connToken", "accessSession");
-                               vnfmObj.put("Content-Type", "Application/Json");
-                               authModel = "accessSession";
-                               return 200;
-                       }
-                       
-               };
-               
-               new MockUp<HttpClient>(){
-                       @Mock
-                       public int executeMethod(HttpMethod method) {
-                           return 200;
-                       }
-                   };
-                   
-               System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
-               
-                new MockUp<HttpMethodBase>(){
-                       
-                       @Mock 
-                        public int getStatusCode(){
-                               
-                               return 200;
-                       }
-                       
-                       @Mock 
-                        public String getResponseBodyAsString()
-                                          throws IOException
-                                         {
-                               String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                               JSONObject jobj = new JSONObject();
-                               jobj.put("Status", 200);
-                               jobj.put("UserName", "User");
-                               jobj.put("password", "pass");
-                               JSONArray ja = new JSONArray();
-                               ja.add(str);
-                               jobj.put("vim_info", ja);
-                               String str1 = jobj.toString();
-                               return str1;
-                                          }
-                   };
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<RestfulResponse>(){
+//             
+//             @Mock
+//              public String getResponseContent() {
+//                     
+//                             return "Success";
+//              }
+//             
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     return "Success";
+//             
+//             }
+//             };
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             js.put("vim_info", ja);
+//                     return js;
+//             }
+//             };
+//             
+//             new MockUp<DownloadCsarManager>(){
+//             @Mock
+//              public int unzipCSAR(String fileName, String filePath) {
+//                             return 0;
+//             
+//             }
+//             };
+//             
+//             new MockUp<ConnectMgrVnfm>(){
+//                     
+//                     @Mock
+//                      public int connect(JSONObject vnfmObj, String authModel) {
+//                             vnfmObj.put("connToken", "accessSession");
+//                             vnfmObj.put("Content-Type", "Application/Json");
+//                             authModel = "accessSession";
+//                             return 200;
+//                     }
+//                     
+//             };
+//             
+//             new MockUp<HttpClient>(){
+//                     @Mock
+//                     public int executeMethod(HttpMethod method) {
+//                         return 200;
+//                     }
+//                 };
+//                 
+//             System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//             
+//              new MockUp<HttpMethodBase>(){
+//                     
+//                     @Mock 
+//                      public int getStatusCode(){
+//                             
+//                             return 200;
+//                     }
+//                     
+//                     @Mock 
+//                      public String getResponseBodyAsString()
+//                                        throws IOException
+//                                       {
+//                             String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             JSONObject jobj = new JSONObject();
+//                             jobj.put("Status", 200);
+//                             jobj.put("UserName", "User");
+//                             jobj.put("password", "pass");
+//                             JSONArray ja = new JSONArray();
+//                             ja.add(str);
+//                             jobj.put("vim_info", ja);
+//                             String str1 = jobj.toString();
+//                             return str1;
+//                                        }
+//                 };
                
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -1367,114 +1357,114 @@ public class AdapterResourceManagerTest {
     
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestSuccessConnectPath500() {
-       
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<RestfulResponse>(){
-               
-               @Mock
-                public String getResponseContent() {
-                       
-                               return "Success";
-                }
-               
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       return "Success";
-               
-               }
-               };
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       js.put("vim_info", ja);
-                       return js;
-               }
-               };
-               
-               new MockUp<DownloadCsarManager>(){
-               @Mock
-                public int unzipCSAR(String fileName, String filePath) {
-                               return 0;
-               
-               }
-               };
-               
-               new MockUp<ConnectMgrVnfm>(){
-                       
-                       @Mock
-                        public int connect(JSONObject vnfmObj, String authModel) {
-                               vnfmObj.put("connToken", "accessSession");
-                               vnfmObj.put("Content-Type", "Application/Json");
-                               authModel = "accessSession";
-                               return 200;
-                       }
-                       
-               };
-               
-               new MockUp<HttpClient>(){
-                       @Mock
-                       public int executeMethod(HttpMethod method) {
-                           return 200;
-                       }
-                   };
-                   
-               System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
-               
-                new MockUp<HttpMethodBase>(){
-                       
-                       @Mock 
-                        public int getStatusCode(){
-                               
-                               return 500;
-                       }
-                       
-                       @Mock 
-                        public String getResponseBodyAsString()
-                                          throws IOException
-                                         {
-                               String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                               JSONObject jobj = new JSONObject();
-                               jobj.put("Status", 500);
-                               jobj.put("UserName", "User");
-                               jobj.put("password", "pass");
-                               JSONArray ja = new JSONArray();
-                               ja.add(str);
-                               jobj.put("vim_info", ja);
-                               String str1 = jobj.toString();
-                               return str1;
-                                          }
-                   };
+//     
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<RestfulResponse>(){
+//             
+//             @Mock
+//              public String getResponseContent() {
+//                     
+//                             return "Success";
+//              }
+//             
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     return "Success";
+//             
+//             }
+//             };
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             js.put("vim_info", ja);
+//                     return js;
+//             }
+//             };
+//             
+//             new MockUp<DownloadCsarManager>(){
+//             @Mock
+//              public int unzipCSAR(String fileName, String filePath) {
+//                             return 0;
+//             
+//             }
+//             };
+//             
+//             new MockUp<ConnectMgrVnfm>(){
+//                     
+//                     @Mock
+//                      public int connect(JSONObject vnfmObj, String authModel) {
+//                             vnfmObj.put("connToken", "accessSession");
+//                             vnfmObj.put("Content-Type", "Application/Json");
+//                             authModel = "accessSession";
+//                             return 200;
+//                     }
+//                     
+//             };
+//             
+//             new MockUp<HttpClient>(){
+//                     @Mock
+//                     public int executeMethod(HttpMethod method) {
+//                         return 200;
+//                     }
+//                 };
+//                 
+//             System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//             
+//              new MockUp<HttpMethodBase>(){
+//                     
+//                     @Mock 
+//                      public int getStatusCode(){
+//                             
+//                             return 500;
+//                     }
+//                     
+//                     @Mock 
+//                      public String getResponseBodyAsString()
+//                                        throws IOException
+//                                       {
+//                             String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             JSONObject jobj = new JSONObject();
+//                             jobj.put("Status", 500);
+//                             jobj.put("UserName", "User");
+//                             jobj.put("password", "pass");
+//                             JSONArray ja = new JSONArray();
+//                             ja.add(str);
+//                             jobj.put("vim_info", ja);
+//                             String str1 = jobj.toString();
+//                             return str1;
+//                                        }
+//                 };
                
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -1493,113 +1483,113 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestSuccessConnectPathEmpty() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<RestfulResponse>(){
-               
-               @Mock
-                public String getResponseContent() {
-                       
-                               return "Success";
-                }
-               
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       return "Success";
-               
-               }
-               };
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n\"vim_id\": \"\",\n\t\t\"vim-info\": \"1\",\n\t\t\"vim-name\": \"\"\n}";
-                       ja.add(str);
-                       js.put("vim_info", ja);
-                       return js;
-               }
-               };
-               
-               new MockUp<DownloadCsarManager>(){
-               @Mock
-                public int unzipCSAR(String fileName, String filePath) {
-                               return 0;
-               
-               }
-               };
-               
-               new MockUp<ConnectMgrVnfm>(){
-                       
-                       @Mock
-                        public int connect(JSONObject vnfmObj, String authModel) {
-                               vnfmObj.put("connToken", "accessSession");
-                               vnfmObj.put("Content-Type", "Application/Json");
-                               authModel = "accessSession";
-                               return 200;
-                       }
-                       
-               };
-               
-               new MockUp<HttpClient>(){
-                       @Mock
-                       public int executeMethod(HttpMethod method) {
-                           return 200;
-                       }
-                   };
-                   
-               System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
-               
-                new MockUp<HttpMethodBase>(){
-                       
-                       @Mock 
-                        public int getStatusCode(){
-                               
-                               return 200;
-                       }
-                       
-                       @Mock 
-                        public String getResponseBodyAsString()
-                                          throws IOException
-                                         {
-                               String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                               JSONObject jobj = new JSONObject();
-                               jobj.put("Status", 200);
-                               jobj.put("UserName", "User");
-                               jobj.put("password", "pass");
-                               JSONArray ja = new JSONArray();
-                               ja.add(str);
-                               jobj.put("vim_info", ja);
-                               String str1 = jobj.toString();
-                               return str1;
-                                          }
-                   };
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<RestfulResponse>(){
+//             
+//             @Mock
+//              public String getResponseContent() {
+//                     
+//                             return "Success";
+//              }
+//             
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     return "Success";
+//             
+//             }
+//             };
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n\"vim_id\": \"\",\n\t\t\"vim-info\": \"1\",\n\t\t\"vim-name\": \"\"\n}";
+//                             ja.add(str);
+//                             js.put("vim_info", ja);
+//                     return js;
+//             }
+//             };
+//             
+//             new MockUp<DownloadCsarManager>(){
+//             @Mock
+//              public int unzipCSAR(String fileName, String filePath) {
+//                             return 0;
+//             
+//             }
+//             };
+//             
+//             new MockUp<ConnectMgrVnfm>(){
+//                     
+//                     @Mock
+//                      public int connect(JSONObject vnfmObj, String authModel) {
+//                             vnfmObj.put("connToken", "accessSession");
+//                             vnfmObj.put("Content-Type", "Application/Json");
+//                             authModel = "accessSession";
+//                             return 200;
+//                     }
+//                     
+//             };
+//             
+//             new MockUp<HttpClient>(){
+//                     @Mock
+//                     public int executeMethod(HttpMethod method) {
+//                         return 200;
+//                     }
+//                 };
+//                 
+//             System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//             
+//              new MockUp<HttpMethodBase>(){
+//                     
+//                     @Mock 
+//                      public int getStatusCode(){
+//                             
+//                             return 200;
+//                     }
+//                     
+//                     @Mock 
+//                      public String getResponseBodyAsString()
+//                                        throws IOException
+//                                       {
+//                             String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             JSONObject jobj = new JSONObject();
+//                             jobj.put("Status", 200);
+//                             jobj.put("UserName", "User");
+//                             jobj.put("password", "pass");
+//                             JSONArray ja = new JSONArray();
+//                             ja.add(str);
+//                             jobj.put("vim_info", ja);
+//                             String str1 = jobj.toString();
+//                             return str1;
+//                                        }
+//                 };
                
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -1617,114 +1607,114 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestSuccessId() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<RestfulResponse>(){
-               
-               @Mock
-                public String getResponseContent() {
-                       
-                               return "Success";
-                }
-               
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       return "Success";
-               
-               }
-               };
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", "upload-id-123");
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       js.put("vim_info", ja);
-                       return js;
-               }
-               };
-               
-               new MockUp<DownloadCsarManager>(){
-               @Mock
-                public int unzipCSAR(String fileName, String filePath) {
-                               return 0;
-               
-               }
-               };
-               
-               new MockUp<ConnectMgrVnfm>(){
-                       
-                       @Mock
-                        public int connect(JSONObject vnfmObj, String authModel) {
-                               vnfmObj.put("connToken", "accessSession");
-                               vnfmObj.put("Content-Type", "Application/Json");
-                               authModel = "accessSession";
-                               return 200;
-                       }
-                       
-               };
-               
-               new MockUp<HttpClient>(){
-                       @Mock
-                       public int executeMethod(HttpMethod method) {
-                           return 200;
-                       }
-                   };
-                   
-               System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
-               
-                new MockUp<HttpMethodBase>(){
-                       
-                       @Mock 
-                        public int getStatusCode(){
-                               
-                               return 200;
-                       }
-                       
-                       @Mock 
-                        public String getResponseBodyAsString()
-                                          throws IOException
-                                         {
-                               String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                               JSONObject jobj = new JSONObject();
-                               jobj.put("Status", 200);
-                               jobj.put("UserName", "User");
-                               jobj.put("password", "pass");
-                               JSONArray ja = new JSONArray();
-                               ja.add(str);
-                               jobj.put("vim_info", ja);
-                               String str1 = jobj.toString();
-                               return str1;
-                                          }
-                   };
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<RestfulResponse>(){
+//             
+//             @Mock
+//              public String getResponseContent() {
+//                     
+//                             return "Success";
+//              }
+//             
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     return "Success";
+//             
+//             }
+//             };
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", "upload-id-123");
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             js.put("vim_info", ja);
+//                     return js;
+//             }
+//             };
+//             
+//             new MockUp<DownloadCsarManager>(){
+//             @Mock
+//              public int unzipCSAR(String fileName, String filePath) {
+//                             return 0;
+//             
+//             }
+//             };
+//             
+//             new MockUp<ConnectMgrVnfm>(){
+//                     
+//                     @Mock
+//                      public int connect(JSONObject vnfmObj, String authModel) {
+//                             vnfmObj.put("connToken", "accessSession");
+//                             vnfmObj.put("Content-Type", "Application/Json");
+//                             authModel = "accessSession";
+//                             return 200;
+//                     }
+//                     
+//             };
+//             
+//             new MockUp<HttpClient>(){
+//                     @Mock
+//                     public int executeMethod(HttpMethod method) {
+//                         return 200;
+//                     }
+//                 };
+//                 
+//             System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//             
+//              new MockUp<HttpMethodBase>(){
+//                     
+//                     @Mock 
+//                      public int getStatusCode(){
+//                             
+//                             return 200;
+//                     }
+//                     
+//                     @Mock 
+//                      public String getResponseBodyAsString()
+//                                        throws IOException
+//                                       {
+//                             String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             JSONObject jobj = new JSONObject();
+//                             jobj.put("Status", 200);
+//                             jobj.put("UserName", "User");
+//                             jobj.put("password", "pass");
+//                             JSONArray ja = new JSONArray();
+//                             ja.add(str);
+//                             jobj.put("vim_info", ja);
+//                             String str1 = jobj.toString();
+//                             return str1;
+//                                        }
+//                 };
                
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -1742,115 +1732,115 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestSuccessIdNull() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<RestfulResponse>(){
-               
-               @Mock
-                public String getResponseContent() {
-                       
-                               return "Success";
-                }
-               
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       return "Success";
-               
-               }
-               };
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", null);
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       js.put("vim_info", ja);
-                       return js;
-               }
-               };
-               
-               new MockUp<DownloadCsarManager>(){
-               @Mock
-                public int unzipCSAR(String fileName, String filePath) {
-                               return 0;
-               
-               }
-               };
-               
-               new MockUp<ConnectMgrVnfm>(){
-                       
-                       @Mock
-                        public int connect(JSONObject vnfmObj, String authModel) {
-                               vnfmObj.put("connToken", "accessSession");
-                               vnfmObj.put("Content-Type", "Application/Json");
-                               authModel = "accessSession";
-                               return 200;
-                       }
-                       
-               };
-               
-               new MockUp<HttpClient>(){
-                       @Mock
-                       public int executeMethod(HttpMethod method) {
-                           return 200;
-                       }
-                   };
-                   
-               System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
-               
-                new MockUp<HttpMethodBase>(){
-                       
-                       @Mock 
-                        public int getStatusCode(){
-                               
-                               return 200;
-                       }
-                       
-                       @Mock 
-                        public String getResponseBodyAsString()
-                                          throws IOException
-                                         {
-                               String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                               JSONObject jobj = new JSONObject();
-                               jobj.put("Status", 200);
-                               jobj.put("UserName", "User");
-                               jobj.put("password", "pass");
-                               JSONArray ja = new JSONArray();
-                               ja.add(str);
-                               jobj.put("vim_info", ja);
-                               String str1 = jobj.toString();
-                               return str1;
-                                          }
-                   };
-               
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<RestfulResponse>(){
+//             
+//             @Mock
+//              public String getResponseContent() {
+//                     
+//                             return "Success";
+//              }
+//             
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     return "Success";
+//             
+//             }
+//             };
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", null);
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             js.put("vim_info", ja);
+//                     return js;
+//             }
+//             };
+//             
+//             new MockUp<DownloadCsarManager>(){
+//             @Mock
+//              public int unzipCSAR(String fileName, String filePath) {
+//                             return 0;
+//             
+//             }
+//             };
+//             
+//             new MockUp<ConnectMgrVnfm>(){
+//                     
+//                     @Mock
+//                      public int connect(JSONObject vnfmObj, String authModel) {
+//                             vnfmObj.put("connToken", "accessSession");
+//                             vnfmObj.put("Content-Type", "Application/Json");
+//                             authModel = "accessSession";
+//                             return 200;
+//                     }
+//                     
+//             };
+//             
+//             new MockUp<HttpClient>(){
+//                     @Mock
+//                     public int executeMethod(HttpMethod method) {
+//                         return 200;
+//                     }
+//                 };
+//                 
+//             System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//             
+//              new MockUp<HttpMethodBase>(){
+//                     
+//                     @Mock 
+//                      public int getStatusCode(){
+//                             
+//                             return 200;
+//                     }
+//                     
+//                     @Mock 
+//                      public String getResponseBodyAsString()
+//                                        throws IOException
+//                                       {
+//                             String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             JSONObject jobj = new JSONObject();
+//                             jobj.put("Status", 200);
+//                             jobj.put("UserName", "User");
+//                             jobj.put("password", "pass");
+//                             JSONArray ja = new JSONArray();
+//                             ja.add(str);
+//                             jobj.put("vim_info", ja);
+//                             String str1 = jobj.toString();
+//                             return str1;
+//                                        }
+//                 };
+//             
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
         JSONObject obj = new JSONObject();
@@ -1867,114 +1857,114 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestSuccessIdFile0() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<RestfulResponse>(){
-               
-               @Mock
-                public String getResponseContent() {
-                       
-                               return "Success";
-                }
-               
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       return "Success";
-               
-               }
-               };
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", "");
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/Check10.txt");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       js.put("vim_info", ja);
-                       return js;
-               }
-               };
-               
-               new MockUp<DownloadCsarManager>(){
-               @Mock
-                public int unzipCSAR(String fileName, String filePath) {
-                               return 0;
-               
-               }
-               };
-               
-               new MockUp<ConnectMgrVnfm>(){
-                       
-                       @Mock
-                        public int connect(JSONObject vnfmObj, String authModel) {
-                               vnfmObj.put("connToken", "accessSession");
-                               vnfmObj.put("Content-Type", "Application/Json");
-                               authModel = "accessSession";
-                               return 200;
-                       }
-                       
-               };
-               
-               new MockUp<HttpClient>(){
-                       @Mock
-                       public int executeMethod(HttpMethod method) {
-                           return 200;
-                       }
-                   };
-                   
-               System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
-               
-                new MockUp<HttpMethodBase>(){
-                       
-                       @Mock 
-                        public int getStatusCode(){
-                               
-                               return 200;
-                       }
-                       
-                       @Mock 
-                        public String getResponseBodyAsString()
-                                          throws IOException
-                                         {
-                               String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                               JSONObject jobj = new JSONObject();
-                               jobj.put("Status", 200);
-                               jobj.put("UserName", "User");
-                               jobj.put("password", "pass");
-                               JSONArray ja = new JSONArray();
-                               ja.add(str);
-                               jobj.put("vim_info", ja);
-                               String str1 = jobj.toString();
-                               return str1;
-                                          }
-                   };
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<RestfulResponse>(){
+//             
+//             @Mock
+//              public String getResponseContent() {
+//                     
+//                             return "Success";
+//              }
+//             
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     return "Success";
+//             
+//             }
+//             };
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", "");
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/Check10.txt");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             js.put("vim_info", ja);
+//                     return js;
+//             }
+//             };
+//             
+//             new MockUp<DownloadCsarManager>(){
+//             @Mock
+//              public int unzipCSAR(String fileName, String filePath) {
+//                             return 0;
+//             
+//             }
+//             };
+//             
+//             new MockUp<ConnectMgrVnfm>(){
+//                     
+//                     @Mock
+//                      public int connect(JSONObject vnfmObj, String authModel) {
+//                             vnfmObj.put("connToken", "accessSession");
+//                             vnfmObj.put("Content-Type", "Application/Json");
+//                             authModel = "accessSession";
+//                             return 200;
+//                     }
+//                     
+//             };
+//             
+//             new MockUp<HttpClient>(){
+//                     @Mock
+//                     public int executeMethod(HttpMethod method) {
+//                         return 200;
+//                     }
+//                 };
+//                 
+//             System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//             
+//              new MockUp<HttpMethodBase>(){
+//                     
+//                     @Mock 
+//                      public int getStatusCode(){
+//                             
+//                             return 200;
+//                     }
+//                     
+//                     @Mock 
+//                      public String getResponseBodyAsString()
+//                                        throws IOException
+//                                       {
+//                             String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             JSONObject jobj = new JSONObject();
+//                             jobj.put("Status", 200);
+//                             jobj.put("UserName", "User");
+//                             jobj.put("password", "pass");
+//                             JSONArray ja = new JSONArray();
+//                             ja.add(str);
+//                             jobj.put("vim_info", ja);
+//                             String str1 = jobj.toString();
+//                             return str1;
+//                                        }
+//                 };
                
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -1993,90 +1983,90 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestSuccessId500() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<RestfulResponse>(){
-               
-               @Mock
-                public String getResponseContent() {
-                       
-                               return "Success";
-                }
-               
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       return "Success";
-               
-               }
-               };
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", "upload-id-123");
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       js.put("vim_info", ja);
-                       return js;
-               }
-               };
-               
-               new MockUp<DownloadCsarManager>(){
-               @Mock
-                public int unzipCSAR(String fileName, String filePath) {
-                               return 0;
-               
-               }
-               };
-               
-               new MockUp<ConnectMgrVnfm>(){
-                       
-                       @Mock
-                        public int connect(JSONObject vnfmObj, String authModel) {
-                               vnfmObj.put("connToken", "accessSession");
-                               vnfmObj.put("Content-Type", "Application/Json");
-                               authModel = "accessSession";
-                               return 200;
-                       }
-                       
-               };
-               
-               new MockUp<HttpClient>(){
-                       @Mock
-                       public int executeMethod(HttpMethod method) {
-                           return 200;
-                       }
-                   };
-                   
-               System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
-               
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<RestfulResponse>(){
+//             
+//             @Mock
+//              public String getResponseContent() {
+//                     
+//                             return "Success";
+//              }
+//             
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     return "Success";
+//             
+//             }
+//             };
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", "upload-id-123");
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             js.put("vim_info", ja);
+//                     return js;
+//             }
+//             };
+//             
+//             new MockUp<DownloadCsarManager>(){
+//             @Mock
+//              public int unzipCSAR(String fileName, String filePath) {
+//                             return 0;
+//             
+//             }
+//             };
+//             
+//             new MockUp<ConnectMgrVnfm>(){
+//                     
+//                     @Mock
+//                      public int connect(JSONObject vnfmObj, String authModel) {
+//                             vnfmObj.put("connToken", "accessSession");
+//                             vnfmObj.put("Content-Type", "Application/Json");
+//                             authModel = "accessSession";
+//                             return 200;
+//                     }
+//                     
+//             };
+//             
+//             new MockUp<HttpClient>(){
+//                     @Mock
+//                     public int executeMethod(HttpMethod method) {
+//                         return 200;
+//                     }
+//                 };
+//                 
+//             System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//             
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
         JSONObject obj = new JSONObject();
@@ -2094,90 +2084,90 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestSuccessIdEmpty() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<RestfulResponse>(){
-               
-               @Mock
-                public String getResponseContent() {
-                       
-                               return "Success";
-                }
-               
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       return "Success";
-               
-               }
-               };
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", "");
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       js.put("vim_info", ja);
-                       return js;
-               }
-               };
-               
-               new MockUp<DownloadCsarManager>(){
-               @Mock
-                public int unzipCSAR(String fileName, String filePath) {
-                               return 0;
-               
-               }
-               };
-               
-               new MockUp<ConnectMgrVnfm>(){
-                       
-                       @Mock
-                        public int connect(JSONObject vnfmObj, String authModel) {
-                               vnfmObj.put("connToken", "accessSession");
-                               vnfmObj.put("Content-Type", "Application/Json");
-                               authModel = "accessSession";
-                               return 200;
-                       }
-                       
-               };
-               
-               new MockUp<HttpClient>(){
-                       @Mock
-                       public int executeMethod(HttpMethod method) {
-                           return 200;
-                       }
-                   };
-                   
-               System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
-               
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<RestfulResponse>(){
+//             
+//             @Mock
+//              public String getResponseContent() {
+//                     
+//                             return "Success";
+//              }
+//             
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     return "Success";
+//             
+//             }
+//             };
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", "");
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             js.put("vim_info", ja);
+//                     return js;
+//             }
+//             };
+//             
+//             new MockUp<DownloadCsarManager>(){
+//             @Mock
+//              public int unzipCSAR(String fileName, String filePath) {
+//                             return 0;
+//             
+//             }
+//             };
+//             
+//             new MockUp<ConnectMgrVnfm>(){
+//                     
+//                     @Mock
+//                      public int connect(JSONObject vnfmObj, String authModel) {
+//                             vnfmObj.put("connToken", "accessSession");
+//                             vnfmObj.put("Content-Type", "Application/Json");
+//                             authModel = "accessSession";
+//                             return 200;
+//                     }
+//                     
+//             };
+//             
+//             new MockUp<HttpClient>(){
+//                     @Mock
+//                     public int executeMethod(HttpMethod method) {
+//                         return 200;
+//                     }
+//                 };
+//                 
+//             System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//             
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
         JSONObject obj = new JSONObject();
@@ -2195,93 +2185,93 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestSuccessTemplete() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<RestfulResponse>(){
-               
-               @Mock
-                public String getResponseContent() {
-                       
-                               return "Success";
-                }
-               
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       return "Success";
-               
-               }
-               };
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", "upload-id-123");
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       JSONArray ja1 = new JSONArray();
-                       String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja1.add(str1);
-                       js.put("vim_info", ja);
-                       js.put("templates", ja1);
-                       return js;
-               }
-               };
-               
-               new MockUp<DownloadCsarManager>(){
-               @Mock
-                public int unzipCSAR(String fileName, String filePath) {
-                               return 0;
-               
-               }
-               };
-               
-               new MockUp<ConnectMgrVnfm>(){
-                       
-                       @Mock
-                        public int connect(JSONObject vnfmObj, String authModel) {
-                               vnfmObj.put("connToken", "accessSession");
-                               vnfmObj.put("Content-Type", "Application/Json");
-                               authModel = "accessSession";
-                               return 200;
-                       }
-                       
-               };
-               
-               new MockUp<HttpClient>(){
-                       @Mock
-                       public int executeMethod(HttpMethod method) {
-                           return 200;
-                       }
-                   };
-                   
-               System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<RestfulResponse>(){
+//             
+//             @Mock
+//              public String getResponseContent() {
+//                     
+//                             return "Success";
+//              }
+//             
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     return "Success";
+//             
+//             }
+//             };
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", "upload-id-123");
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             JSONArray ja1 = new JSONArray();
+//                             String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja1.add(str1);
+//                             js.put("vim_info", ja);
+//                             js.put("templates", ja1);
+//                     return js;
+//             }
+//             };
+//             
+//             new MockUp<DownloadCsarManager>(){
+//             @Mock
+//              public int unzipCSAR(String fileName, String filePath) {
+//                             return 0;
+//             
+//             }
+//             };
+//             
+//             new MockUp<ConnectMgrVnfm>(){
+//                     
+//                     @Mock
+//                      public int connect(JSONObject vnfmObj, String authModel) {
+//                             vnfmObj.put("connToken", "accessSession");
+//                             vnfmObj.put("Content-Type", "Application/Json");
+//                             authModel = "accessSession";
+//                             return 200;
+//                     }
+//                     
+//             };
+//             
+//             new MockUp<HttpClient>(){
+//                     @Mock
+//                     public int executeMethod(HttpMethod method) {
+//                         return 200;
+//                     }
+//                 };
+//                 
+//             System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
                
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -2300,101 +2290,101 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestSuccessTempleteForVPlan() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<RestfulResponse>(){
-               
-               @Mock
-                public String getResponseContent() {
-                       
-                               return "Success";
-                }
-               
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       return "Success";
-               
-               }
-               };
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", "upload-id-123");
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       JSONArray ja1 = new JSONArray();
-                       String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
-                       ja1.add(str1);
-                       JSONArray ja2 = new JSONArray();
-                       String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
-                       ja2.add(str2);
-                       JSONObject jsObject = new JSONObject();
-                       jsObject.put("downloadUrl", "http://localhost:80");
-                       jsObject.put("csarName", "Csar_Check");
-                       js.put("vim_info", ja);
-                       js.put("template", ja2);
-                       js.put("templates", ja1);
-                       js.put("packageInfo", jsObject);
-                       return js;
-               }
-               };
-               
-               new MockUp<DownloadCsarManager>(){
-               @Mock
-                public int unzipCSAR(String fileName, String filePath) {
-                               return 0;
-               
-               }
-               };
-               
-               new MockUp<ConnectMgrVnfm>(){
-                       
-                       @Mock
-                        public int connect(JSONObject vnfmObj, String authModel) {
-                               vnfmObj.put("connToken", "accessSession");
-                               vnfmObj.put("Content-Type", "Application/Json");
-                               authModel = "accessSession";
-                               return 200;
-                       }
-                       
-               };
-               
-               new MockUp<HttpClient>(){
-                       @Mock
-                       public int executeMethod(HttpMethod method) {
-                           return 200;
-                       }
-                   };
-                   
-               System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<RestfulResponse>(){
+//             
+//             @Mock
+//              public String getResponseContent() {
+//                     
+//                             return "Success";
+//              }
+//             
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     return "Success";
+//             
+//             }
+//             };
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", "upload-id-123");
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             JSONArray ja1 = new JSONArray();
+//                             String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
+//                             ja1.add(str1);
+//                             JSONArray ja2 = new JSONArray();
+//                             String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
+//                             ja2.add(str2);
+//                             JSONObject jsObject = new JSONObject();
+//                             jsObject.put("downloadUrl", "http://localhost:80");
+//                             jsObject.put("csarName", "Csar_Check");
+//                             js.put("vim_info", ja);
+//                             js.put("template", ja2);
+//                             js.put("templates", ja1);
+//                             js.put("packageInfo", jsObject);
+//                     return js;
+//             }
+//             };
+//             
+//             new MockUp<DownloadCsarManager>(){
+//             @Mock
+//              public int unzipCSAR(String fileName, String filePath) {
+//                             return 0;
+//             
+//             }
+//             };
+//             
+//             new MockUp<ConnectMgrVnfm>(){
+//                     
+//                     @Mock
+//                      public int connect(JSONObject vnfmObj, String authModel) {
+//                             vnfmObj.put("connToken", "accessSession");
+//                             vnfmObj.put("Content-Type", "Application/Json");
+//                             authModel = "accessSession";
+//                             return 200;
+//                     }
+//                     
+//             };
+//             
+//             new MockUp<HttpClient>(){
+//                     @Mock
+//                     public int executeMethod(HttpMethod method) {
+//                         return 200;
+//                     }
+//                 };
+//                 
+//             System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
                
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -2463,101 +2453,101 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestWithCscf() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<RestfulResponse>(){
-               
-               @Mock
-                public String getResponseContent() {
-                       
-                               return "Success";
-                }
-               
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       return "Success";
-               
-               }
-               };
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", "upload-id-123");
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       JSONArray ja1 = new JSONArray();
-                       String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
-                       ja1.add(str1);
-                       JSONArray ja2 = new JSONArray();
-                       String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
-                       ja2.add(str2);
-                       JSONObject jsObject = new JSONObject();
-                       jsObject.put("downloadUrl", "http://localhost:80");
-                       jsObject.put("csarName", "CSCF_SI");
-                       js.put("vim_info", ja);
-                       js.put("template", ja2);
-                       js.put("templates", ja1);
-                       js.put("packageInfo", jsObject);
-                       return js;
-               }
-               };
-               
-               new MockUp<DownloadCsarManager>(){
-               @Mock
-                public int unzipCSAR(String fileName, String filePath) {
-                               return 0;
-               
-               }
-               };
-               
-               new MockUp<ConnectMgrVnfm>(){
-                       
-                       @Mock
-                        public int connect(JSONObject vnfmObj, String authModel) {
-                               vnfmObj.put("connToken", "accessSession");
-                               vnfmObj.put("Content-Type", "Application/Json");
-                               authModel = "accessSession";
-                               return 200;
-                       }
-                       
-               };
-               
-               new MockUp<HttpClient>(){
-                       @Mock
-                       public int executeMethod(HttpMethod method) {
-                           return 200;
-                       }
-                   };
-                   
-               System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<RestfulResponse>(){
+//             
+//             @Mock
+//              public String getResponseContent() {
+//                     
+//                             return "Success";
+//              }
+//             
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     return "Success";
+//             
+//             }
+//             };
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", "upload-id-123");
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             JSONArray ja1 = new JSONArray();
+//                             String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
+//                             ja1.add(str1);
+//                             JSONArray ja2 = new JSONArray();
+//                             String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
+//                             ja2.add(str2);
+//                             JSONObject jsObject = new JSONObject();
+//                             jsObject.put("downloadUrl", "http://localhost:80");
+//                             jsObject.put("csarName", "CSCF_SI");
+//                             js.put("vim_info", ja);
+//                             js.put("template", ja2);
+//                             js.put("templates", ja1);
+//                             js.put("packageInfo", jsObject);
+//                     return js;
+//             }
+//             };
+//             
+//             new MockUp<DownloadCsarManager>(){
+//             @Mock
+//              public int unzipCSAR(String fileName, String filePath) {
+//                             return 0;
+//             
+//             }
+//             };
+//             
+//             new MockUp<ConnectMgrVnfm>(){
+//                     
+//                     @Mock
+//                      public int connect(JSONObject vnfmObj, String authModel) {
+//                             vnfmObj.put("connToken", "accessSession");
+//                             vnfmObj.put("Content-Type", "Application/Json");
+//                             authModel = "accessSession";
+//                             return 200;
+//                     }
+//                     
+//             };
+//             
+//             new MockUp<HttpClient>(){
+//                     @Mock
+//                     public int executeMethod(HttpMethod method) {
+//                         return 200;
+//                     }
+//                 };
+//                 
+//             System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
                
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -2576,57 +2566,57 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestWithMME() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", "upload-id-123");
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       JSONArray ja1 = new JSONArray();
-                       String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
-                       ja1.add(str1);
-                       JSONArray ja2 = new JSONArray();
-                       String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
-                       ja2.add(str2);
-                       JSONObject jsObject = new JSONObject();
-                       jsObject.put("downloadUrl", "http://localhost:80");
-                       jsObject.put("csarName", "MME");
-                       js.put("vim_info", ja);
-                       js.put("template", ja2);
-                       js.put("templates", ja1);
-                       js.put("packageInfo", jsObject);
-                       return js;
-               }
-               };
-               
-               System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", "upload-id-123");
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             JSONArray ja1 = new JSONArray();
+//                             String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
+//                             ja1.add(str1);
+//                             JSONArray ja2 = new JSONArray();
+//                             String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
+//                             ja2.add(str2);
+//                             JSONObject jsObject = new JSONObject();
+//                             jsObject.put("downloadUrl", "http://localhost:80");
+//                             jsObject.put("csarName", "MME");
+//                             js.put("vim_info", ja);
+//                             js.put("template", ja2);
+//                             js.put("templates", ja1);
+//                             js.put("packageInfo", jsObject);
+//                     return js;
+//             }
+//             };
+//             
+//             System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
                
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -2645,57 +2635,57 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestWithSPGW() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", "upload-id-123");
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       JSONArray ja1 = new JSONArray();
-                       String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
-                       ja1.add(str1);
-                       JSONArray ja2 = new JSONArray();
-                       String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
-                       ja2.add(str2);
-                       JSONObject jsObject = new JSONObject();
-                       jsObject.put("downloadUrl", "http://localhost:80");
-                       jsObject.put("csarName", "SPGW");
-                       js.put("vim_info", ja);
-                       js.put("template", ja2);
-                       js.put("templates", ja1);
-                       js.put("packageInfo", jsObject);
-                       return js;
-               }
-               };
-               
-               System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", "upload-id-123");
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             JSONArray ja1 = new JSONArray();
+//                             String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
+//                             ja1.add(str1);
+//                             JSONArray ja2 = new JSONArray();
+//                             String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
+//                             ja2.add(str2);
+//                             JSONObject jsObject = new JSONObject();
+//                             jsObject.put("downloadUrl", "http://localhost:80");
+//                             jsObject.put("csarName", "SPGW");
+//                             js.put("vim_info", ja);
+//                             js.put("template", ja2);
+//                             js.put("templates", ja1);
+//                             js.put("packageInfo", jsObject);
+//                     return js;
+//             }
+//             };
+//             
+//             System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
                
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -2714,57 +2704,57 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestWithHSS() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", "upload-id-123");
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       JSONArray ja1 = new JSONArray();
-                       String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
-                       ja1.add(str1);
-                       JSONArray ja2 = new JSONArray();
-                       String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
-                       ja2.add(str2);
-                       JSONObject jsObject = new JSONObject();
-                       jsObject.put("downloadUrl", "http://localhost:80");
-                       jsObject.put("csarName", "HSS");
-                       js.put("vim_info", ja);
-                       js.put("template", ja2);
-                       js.put("templates", ja1);
-                       js.put("packageInfo", jsObject);
-                       return js;
-               }
-               };
-               
-               System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", "upload-id-123");
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             JSONArray ja1 = new JSONArray();
+//                             String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
+//                             ja1.add(str1);
+//                             JSONArray ja2 = new JSONArray();
+//                             String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
+//                             ja2.add(str2);
+//                             JSONObject jsObject = new JSONObject();
+//                             jsObject.put("downloadUrl", "http://localhost:80");
+//                             jsObject.put("csarName", "HSS");
+//                             js.put("vim_info", ja);
+//                             js.put("template", ja2);
+//                             js.put("templates", ja1);
+//                             js.put("packageInfo", jsObject);
+//                     return js;
+//             }
+//             };
+//             
+//             System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
                
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -2783,57 +2773,57 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestWithSBC() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", "upload-id-123");
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       JSONArray ja1 = new JSONArray();
-                       String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
-                       ja1.add(str1);
-                       JSONArray ja2 = new JSONArray();
-                       String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
-                       ja2.add(str2);
-                       JSONObject jsObject = new JSONObject();
-                       jsObject.put("downloadUrl", "http://localhost:80");
-                       jsObject.put("csarName", "SBC");
-                       js.put("vim_info", ja);
-                       js.put("template", ja2);
-                       js.put("templates", ja1);
-                       js.put("packageInfo", jsObject);
-                       return js;
-               }
-               };
-               
-               System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", "upload-id-123");
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             JSONArray ja1 = new JSONArray();
+//                             String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
+//                             ja1.add(str1);
+//                             JSONArray ja2 = new JSONArray();
+//                             String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
+//                             ja2.add(str2);
+//                             JSONObject jsObject = new JSONObject();
+//                             jsObject.put("downloadUrl", "http://localhost:80");
+//                             jsObject.put("csarName", "SBC");
+//                             js.put("vim_info", ja);
+//                             js.put("template", ja2);
+//                             js.put("templates", ja1);
+//                             js.put("packageInfo", jsObject);
+//                     return js;
+//             }
+//             };
+//             
+//             System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
                
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -2852,57 +2842,57 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestWithPCRF() {
        
-               new MockUp<VNFRestfulUtil>(){
-                       @Mock
-                       public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                               RestfulResponse rr = new RestfulResponse();
-                               Map<String, String> header = new HashMap<>();
-                               header.put("Content-Type", "Application/Json");
-                               header.put("X-FormId", "jhfdl");
-                               rr.setRespHeaderMap(header);
-                               rr.setStatus(200);
-                               rr.setResponseJson("shdfhj");
-                               
-                               return rr;
-                               
-                       }
-               };
-       
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", "upload-id-123");
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       JSONArray ja1 = new JSONArray();
-                       String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
-                       ja1.add(str1);
-                       JSONArray ja2 = new JSONArray();
-                       String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
-                       ja2.add(str2);
-                       JSONObject jsObject = new JSONObject();
-                       jsObject.put("downloadUrl", "http://localhost:80");
-                       jsObject.put("csarName", "PCRF");
-                       js.put("vim_info", ja);
-                       js.put("template", ja2);
-                       js.put("templates", ja1);
-                       js.put("packageInfo", jsObject);
-                       return js;
-               }
-               };
-               
-        System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//             new MockUp<VNFRestfulUtil>(){
+//                     @Mock
+//                     public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                             RestfulResponse rr = new RestfulResponse();
+//                             Map<String, String> header = new HashMap<>();
+//                             header.put("Content-Type", "Application/Json");
+//                             header.put("X-FormId", "jhfdl");
+//                             rr.setRespHeaderMap(header);
+//                             rr.setStatus(200);
+//                             rr.setResponseJson("shdfhj");
+//                             
+//                             return rr;
+//                             
+//                     }
+//             };
+//     
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", "upload-id-123");
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             JSONArray ja1 = new JSONArray();
+//                             String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
+//                             ja1.add(str1);
+//                             JSONArray ja2 = new JSONArray();
+//                             String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
+//                             ja2.add(str2);
+//                             JSONObject jsObject = new JSONObject();
+//                             jsObject.put("downloadUrl", "http://localhost:80");
+//                             jsObject.put("csarName", "PCRF");
+//                             js.put("vim_info", ja);
+//                             js.put("template", ja2);
+//                             js.put("templates", ja1);
+//                             js.put("packageInfo", jsObject);
+//                     return js;
+//             }
+//             };
+//             
+//        System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
                
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -2921,57 +2911,57 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestWithTAS() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", "upload-id-123");
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       JSONArray ja1 = new JSONArray();
-                       String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
-                       ja1.add(str1);
-                       JSONArray ja2 = new JSONArray();
-                       String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
-                       ja2.add(str2);
-                       JSONObject jsObject = new JSONObject();
-                       jsObject.put("downloadUrl", "http://localhost:80");
-                       jsObject.put("csarName", "TAS");
-                       js.put("vim_info", ja);
-                       js.put("template", ja2);
-                       js.put("templates", ja1);
-                       js.put("packageInfo", jsObject);
-                       return js;
-               }
-               };
-               
-               System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", "upload-id-123");
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             JSONArray ja1 = new JSONArray();
+//                             String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
+//                             ja1.add(str1);
+//                             JSONArray ja2 = new JSONArray();
+//                             String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
+//                             ja2.add(str2);
+//                             JSONObject jsObject = new JSONObject();
+//                             jsObject.put("downloadUrl", "http://localhost:80");
+//                             jsObject.put("csarName", "TAS");
+//                             js.put("vim_info", ja);
+//                             js.put("template", ja2);
+//                             js.put("templates", ja1);
+//                             js.put("packageInfo", jsObject);
+//                     return js;
+//             }
+//             };
+//             
+//             System.setProperty("catalina.base", "D:/ONAP-VFC/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
                
         JSONObject vnfpkg = new JSONObject();
         vnfpkg.put("name", "test");
@@ -2990,66 +2980,66 @@ public class AdapterResourceManagerTest {
     @Test
     public void uploadVNFPackageTestWithCSCF() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", "upload-id-123");
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       JSONArray ja1 = new JSONArray();
-                       String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
-                       ja1.add(str1);
-                       JSONArray ja2 = new JSONArray();
-                       String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
-                       ja2.add(str2);
-                       JSONObject jsObject = new JSONObject();
-                       jsObject.put("downloadUrl", "http://localhost:80");
-                       jsObject.put("csarName", "CSCF");
-                       JSONObject jsEms = new JSONObject();
-                       jsEms.put("emsUuid", "123erbhi-hjdek123");
-                       JSONObject jsCsar = new JSONObject();
-                       jsCsar.put("csar_file_path", "/home/ubuntu/check/");
-                       jsCsar.put("csar_file_name", "Csar_File");
-                       jsCsar.put("emsUuid", jsEms);
-                       JSONObject jsTemp = new JSONObject();
-                       jsTemp.put("template", jsCsar);
-                       js.put("vCSCF", jsTemp);
-                       js.put("vim_info", ja);
-                       js.put("template", ja2);
-                       js.put("templates", ja1);
-                       js.put("packageInfo", jsObject);
-                       return js;
-               }
-               };
-               
-               System.setProperty("catalina.base", "D:/VFC/23-08-2018/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", "upload-id-123");
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             JSONArray ja1 = new JSONArray();
+//                             String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
+//                             ja1.add(str1);
+//                             JSONArray ja2 = new JSONArray();
+//                             String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
+//                             ja2.add(str2);
+//                             JSONObject jsObject = new JSONObject();
+//                             jsObject.put("downloadUrl", "http://localhost:80");
+//                             jsObject.put("csarName", "CSCF");
+//                             JSONObject jsEms = new JSONObject();
+//                             jsEms.put("emsUuid", "123erbhi-hjdek123");
+//                             JSONObject jsCsar = new JSONObject();
+//                             jsCsar.put("csar_file_path", "/home/ubuntu/check/");
+//                             jsCsar.put("csar_file_name", "Csar_File");
+//                             jsCsar.put("emsUuid", jsEms);
+//                             JSONObject jsTemp = new JSONObject();
+//                             jsTemp.put("template", jsCsar);
+//                             js.put("vCSCF", jsTemp);
+//                             js.put("vim_info", ja);
+//                             js.put("template", ja2);
+//                             js.put("templates", ja1);
+//                             js.put("packageInfo", jsObject);
+//                     return js;
+//             }
+//             };
+//             
+//             System.setProperty("catalina.base", "D:/VFC/23-08-2018/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
                
         JSONObject vnfpkg = new JSONObject();
         JSONObject vnfpkg1 = new JSONObject();
@@ -3068,63 +3058,63 @@ public class AdapterResourceManagerTest {
     @Test
     public void uploadVNFPackageTestWithOutEmsUid() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", "upload-id-123");
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       JSONArray ja1 = new JSONArray();
-                       String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
-                       ja1.add(str1);
-                       JSONArray ja2 = new JSONArray();
-                       String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
-                       ja2.add(str2);
-                       JSONObject jsObject = new JSONObject();
-                       jsObject.put("downloadUrl", "http://localhost:80");
-                       jsObject.put("csarName", "CSCF");
-                       JSONObject jsCsar = new JSONObject();
-                       jsCsar.put("csar_file_path", "/home/ubuntu/check/");
-                       jsCsar.put("csar_file_name", "Csar_File");
-                       JSONObject jsTemp = new JSONObject();
-                       jsTemp.put("template", jsCsar);
-                       js.put("vCSCF", jsTemp);
-                       js.put("vim_info", ja);
-                       js.put("template", ja2);
-                       js.put("templates", ja1);
-                       js.put("packageInfo", jsObject);
-                       return js;
-               }
-               };
-               
-               System.setProperty("catalina.base", "D:/VFC/23-08-2018/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", "upload-id-123");
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             JSONArray ja1 = new JSONArray();
+//                             String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
+//                             ja1.add(str1);
+//                             JSONArray ja2 = new JSONArray();
+//                             String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
+//                             ja2.add(str2);
+//                             JSONObject jsObject = new JSONObject();
+//                             jsObject.put("downloadUrl", "http://localhost:80");
+//                             jsObject.put("csarName", "CSCF");
+//                             JSONObject jsCsar = new JSONObject();
+//                             jsCsar.put("csar_file_path", "/home/ubuntu/check/");
+//                             jsCsar.put("csar_file_name", "Csar_File");
+//                             JSONObject jsTemp = new JSONObject();
+//                             jsTemp.put("template", jsCsar);
+//                             js.put("vCSCF", jsTemp);
+//                             js.put("vim_info", ja);
+//                             js.put("template", ja2);
+//                             js.put("templates", ja1);
+//                             js.put("packageInfo", jsObject);
+//                     return js;
+//             }
+//             };
+//             
+//             System.setProperty("catalina.base", "D:/VFC/23-08-2018/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
                
         JSONObject vnfpkg = new JSONObject();
         JSONObject vnfpkg1 = new JSONObject();
@@ -3143,74 +3133,74 @@ public class AdapterResourceManagerTest {
     @Test
     public void uploadVNFPackageTestWithCSDowCsar() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       String response = "Success";
-                       return response;
-               }
-       };
-       
-               new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", "upload-id-123");
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       JSONArray ja1 = new JSONArray();
-                       String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
-                       ja1.add(str1);
-                       JSONArray ja2 = new JSONArray();
-                       String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
-                       ja2.add(str2);
-                       JSONObject jsObject = new JSONObject();
-                       jsObject.put("downloadUrl", "http://localhost:80");
-                       jsObject.put("csarName", "CSCF");
-                       JSONObject jsEms = new JSONObject();
-                       jsEms.put("emsUuid", "123erbhi-hjdek123");
-                       JSONObject jsCsar = new JSONObject();
-                       jsCsar.put("csar_file_path", "/home/ubuntu/check/");
-                       jsCsar.put("csar_file_name", "Csar_File");
-                       jsCsar.put("emsUuid", jsEms);
-                       JSONObject jsTemp = new JSONObject();
-                       jsTemp.put("template", jsCsar);
-                       js.put("vCSCF", jsTemp);
-                       js.put("vim_info", ja);
-                       js.put("template", ja2);
-                       js.put("templates", ja1);
-                       js.put("packageInfo", jsObject);
-                       return js;
-               }
-               };
-               
-               System.setProperty("catalina.base", "D:/VFC/23-08-2018/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     String response = "Success";
+//                     return response;
+//             }
+//     };
+//     
+//             new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", "upload-id-123");
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             JSONArray ja1 = new JSONArray();
+//                             String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
+//                             ja1.add(str1);
+//                             JSONArray ja2 = new JSONArray();
+//                             String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
+//                             ja2.add(str2);
+//                             JSONObject jsObject = new JSONObject();
+//                             jsObject.put("downloadUrl", "http://localhost:80");
+//                             jsObject.put("csarName", "CSCF");
+//                             JSONObject jsEms = new JSONObject();
+//                             jsEms.put("emsUuid", "123erbhi-hjdek123");
+//                             JSONObject jsCsar = new JSONObject();
+//                             jsCsar.put("csar_file_path", "/home/ubuntu/check/");
+//                             jsCsar.put("csar_file_name", "Csar_File");
+//                             jsCsar.put("emsUuid", jsEms);
+//                             JSONObject jsTemp = new JSONObject();
+//                             jsTemp.put("template", jsCsar);
+//                             js.put("vCSCF", jsTemp);
+//                             js.put("vim_info", ja);
+//                             js.put("template", ja2);
+//                             js.put("templates", ja1);
+//                             js.put("packageInfo", jsObject);
+//                     return js;
+//             }
+//             };
+//             
+//             System.setProperty("catalina.base", "D:/VFC/23-08-2018/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
                
         JSONObject vnfpkg = new JSONObject();
         JSONObject vnfpkg1 = new JSONObject();
@@ -3229,102 +3219,102 @@ public class AdapterResourceManagerTest {
     @Test
     public void uploadVNFPackageTestWithUnZipCsar() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<VnfmUtil>(){
-               @Mock
-               public JSONObject getVnfmById(String vnfmId) {
-                       
-                       JSONObject jsonObject = new JSONObject();
-                       jsonObject.put("url", "https://localhost:80");
-                       jsonObject.put("userName", "ubuntu");
-                       jsonObject.put("password", "******");
-                       return jsonObject;
-                       
-               }
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       String response = "Success";
-                       return response;
-               }
-               
-               @Mock
-                public int unzipCSAR(String fileName, String filePath) {                       
-                       
-                       return 0;
-               }
-       };
-       
-       new MockUp<ConnectMgrVnfm>(){
-               @Mock
-               public int connect(JSONObject vnfmObj, String authModel) {
-                       
-                       
-                       return 404;
-                       
-               }
-       };
-       
-        new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", "upload-id-123");
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       JSONArray ja1 = new JSONArray();
-                       String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
-                       ja1.add(str1);
-                       JSONArray ja2 = new JSONArray();
-                       String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
-                       ja2.add(str2);
-                       JSONObject jsObject = new JSONObject();
-                       jsObject.put("downloadUrl", "http://localhost:80");
-                       jsObject.put("csarName", "CSCF");
-                       JSONObject jsEms = new JSONObject();
-                       jsEms.put("emsUuid", "123erbhi-hjdek123");
-                       JSONObject jsCsar = new JSONObject();
-                       jsCsar.put("csar_file_path", "/home/ubuntu/check/");
-                       jsCsar.put("csar_file_name", "Csar_File");
-                       jsCsar.put("emsUuid", jsEms);
-                       JSONObject jsTemp = new JSONObject();
-                       jsTemp.put("template", jsCsar);
-                       js.put("vCSCF", jsTemp);
-                       js.put("vim_info", ja);
-                       js.put("template", ja2);
-                       js.put("templates", ja1);
-                       js.put("packageInfo", jsObject);
-                       return js;
-               }
-               };
-               
-        System.setProperty("catalina.base", "D:/VFC/23-08-2018/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<VnfmUtil>(){
+//             @Mock
+//             public JSONObject getVnfmById(String vnfmId) {
+//                     
+//                     JSONObject jsonObject = new JSONObject();
+//                     jsonObject.put("url", "https://localhost:80");
+//                     jsonObject.put("userName", "ubuntu");
+//                     jsonObject.put("password", "******");
+//                     return jsonObject;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     String response = "Success";
+//                     return response;
+//             }
+//             
+//             @Mock
+//              public int unzipCSAR(String fileName, String filePath) {                       
+//                     
+//                     return 0;
+//             }
+//     };
+//     
+//     new MockUp<ConnectMgrVnfm>(){
+//             @Mock
+//             public int connect(JSONObject vnfmObj, String authModel) {
+//                     
+//                     
+//                     return 404;
+//                     
+//             }
+//     };
+//     
+//        new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", "upload-id-123");
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             JSONArray ja1 = new JSONArray();
+//                             String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
+//                             ja1.add(str1);
+//                             JSONArray ja2 = new JSONArray();
+//                             String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
+//                             ja2.add(str2);
+//                             JSONObject jsObject = new JSONObject();
+//                             jsObject.put("downloadUrl", "http://localhost:80");
+//                             jsObject.put("csarName", "CSCF");
+//                             JSONObject jsEms = new JSONObject();
+//                             jsEms.put("emsUuid", "123erbhi-hjdek123");
+//                             JSONObject jsCsar = new JSONObject();
+//                             jsCsar.put("csar_file_path", "/home/ubuntu/check/");
+//                             jsCsar.put("csar_file_name", "Csar_File");
+//                             jsCsar.put("emsUuid", jsEms);
+//                             JSONObject jsTemp = new JSONObject();
+//                             jsTemp.put("template", jsCsar);
+//                             js.put("vCSCF", jsTemp);
+//                             js.put("vim_info", ja);
+//                             js.put("template", ja2);
+//                             js.put("templates", ja1);
+//                             js.put("packageInfo", jsObject);
+//                     return js;
+//             }
+//             };
+//             
+//        System.setProperty("catalina.base", "D:/VFC/23-08-2018/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
                
         JSONObject vnfpkg = new JSONObject();
         JSONObject vnfpkg1 = new JSONObject();
@@ -3343,126 +3333,126 @@ public class AdapterResourceManagerTest {
     @Test(expected=JSONException.class)
     public void uploadVNFPackageTestWithConnectMgr() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<VnfmUtil>(){
-               @Mock
-               public JSONObject getVnfmById(String vnfmId) {
-                       
-                       JSONObject jsonObject = new JSONObject();
-                       jsonObject.put("url", "https://localhost:80");
-                       jsonObject.put("userName", "ubuntu");
-                       jsonObject.put("password", "******");
-                       return jsonObject;
-                       
-               }
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       String response = "Success";
-                       return response;
-               }
-               
-               @Mock
-                public int unzipCSAR(String fileName, String filePath) {                       
-                       
-                       return 0;
-               }
-       };
-       
-       new MockUp<HttpClient>(){
-               @Mock
-               public int executeMethod(HttpMethod method) {
-                   return 200;
-               }
-           };
-           
-           new MockUp<HttpMethodBase>(){
-               
-               @Mock 
-                public int getStatusCode(){
-                       
-                       return 200;
-               }
-               
-           };
-           
-       new MockUp<ConnectMgrVnfm>(){
-               @Mock
-               public int connect(JSONObject vnfmObj, String authModel) {
-                       
-                       
-                       return 200;
-                       
-               }
-               
-               @Mock
-               public String getAccessSession() {
-                       
-                       return "conn";
-               }
-       };
-       
-        new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", "upload-id-123");
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       JSONArray ja1 = new JSONArray();
-                       String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
-                       ja1.add(str1);
-                       JSONArray ja2 = new JSONArray();
-                       String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
-                       ja2.add(str2);
-                       JSONObject jsObject = new JSONObject();
-                       jsObject.put("downloadUrl", "http://localhost:80");
-                       jsObject.put("csarName", "CSCF");
-                       JSONObject jsEms = new JSONObject();
-                       jsEms.put("emsUuid", "123erbhi-hjdek123");
-                       JSONObject jsCsar = new JSONObject();
-                       jsCsar.put("csar_file_path", "/home/ubuntu/check/");
-                       jsCsar.put("csar_file_name", "Csar_File");
-                       jsCsar.put("emsUuid", jsEms);
-                       JSONObject jsTemp = new JSONObject();
-                       jsTemp.put("template", jsCsar);
-                       js.put("vCSCF", jsTemp);
-                       js.put("vim_info", ja);
-                       js.put("template", ja2);
-                       js.put("templates", ja1);
-                       js.put("packageInfo", jsObject);
-                       return js;
-               }
-               };
-               
-        System.setProperty("catalina.base", "D:/VFC/23-08-2018/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<VnfmUtil>(){
+//             @Mock
+//             public JSONObject getVnfmById(String vnfmId) {
+//                     
+//                     JSONObject jsonObject = new JSONObject();
+//                     jsonObject.put("url", "https://localhost:80");
+//                     jsonObject.put("userName", "ubuntu");
+//                     jsonObject.put("password", "******");
+//                     return jsonObject;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     String response = "Success";
+//                     return response;
+//             }
+//             
+//             @Mock
+//              public int unzipCSAR(String fileName, String filePath) {                       
+//                     
+//                     return 0;
+//             }
+//     };
+//     
+//     new MockUp<HttpClient>(){
+//             @Mock
+//             public int executeMethod(HttpMethod method) {
+//                 return 200;
+//             }
+//         };
+//         
+//         new MockUp<HttpMethodBase>(){
+//             
+//             @Mock 
+//              public int getStatusCode(){
+//                     
+//                     return 200;
+//             }
+//             
+//         };
+//         
+//     new MockUp<ConnectMgrVnfm>(){
+//             @Mock
+//             public int connect(JSONObject vnfmObj, String authModel) {
+//                     
+//                     
+//                     return 200;
+//                     
+//             }
+//             
+//             @Mock
+//             public String getAccessSession() {
+//                     
+//                     return "conn";
+//             }
+//     };
+//     
+//        new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", "upload-id-123");
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             JSONArray ja1 = new JSONArray();
+//                             String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
+//                             ja1.add(str1);
+//                             JSONArray ja2 = new JSONArray();
+//                             String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
+//                             ja2.add(str2);
+//                             JSONObject jsObject = new JSONObject();
+//                             jsObject.put("downloadUrl", "http://localhost:80");
+//                             jsObject.put("csarName", "CSCF");
+//                             JSONObject jsEms = new JSONObject();
+//                             jsEms.put("emsUuid", "123erbhi-hjdek123");
+//                             JSONObject jsCsar = new JSONObject();
+//                             jsCsar.put("csar_file_path", "/home/ubuntu/check/");
+//                             jsCsar.put("csar_file_name", "Csar_File");
+//                             jsCsar.put("emsUuid", jsEms);
+//                             JSONObject jsTemp = new JSONObject();
+//                             jsTemp.put("template", jsCsar);
+//                             js.put("vCSCF", jsTemp);
+//                             js.put("vim_info", ja);
+//                             js.put("template", ja2);
+//                             js.put("templates", ja1);
+//                             js.put("packageInfo", jsObject);
+//                     return js;
+//             }
+//             };
+//             
+//        System.setProperty("catalina.base", "D:/VFC/23-08-2018/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
                
         JSONObject vnfpkg = new JSONObject();
         JSONObject vnfpkg1 = new JSONObject();
@@ -3481,109 +3471,109 @@ public class AdapterResourceManagerTest {
     @Test
     public void uploadVNFPackageTestWithConnectMgrGetAllFail() {
        
-       new MockUp<VNFRestfulUtil>(){
-               @Mock
-               public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                       RestfulResponse rr = new RestfulResponse();
-                       Map<String, String> header = new HashMap<>();
-                       header.put("Content-Type", "Application/Json");
-                       header.put("X-FormId", "jhfdl");
-                       rr.setRespHeaderMap(header);
-                       rr.setStatus(200);
-                       rr.setResponseJson("shdfhj");
-                       
-                       return rr;
-                       
-               }
-       };
-       
-       new MockUp<VnfmUtil>(){
-               @Mock
-               public JSONObject getVnfmById(String vnfmId) {
-                       
-                       JSONObject jsonObject = new JSONObject();
-                       jsonObject.put("url", "https://localhost:80");
-                       jsonObject.put("userName", "ubuntu");
-                       jsonObject.put("password", "******");
-                       return jsonObject;
-                       
-               }
-       };
-       
-       new MockUp<DownloadCsarManager>(){
-               @Mock
-               public String download(String url, String filepath) {
-                       String response = "Success";
-                       return response;
-               }
-               
-               @Mock
-                public int unzipCSAR(String fileName, String filePath) {                       
-                       
-                       return 0;
-               }
-       };
-       
-       new MockUp<ConnectMgrVnfm>(){
-               @Mock
-               public int connect(JSONObject vnfmObj, String authModel) {
-                       
-                       
-                       return 200;
-                       
-               }
-               
-               @Mock
-               public String getAccessSession() {
-                       
-                       return "conn";
-               }
-       };
-       
-        new MockUp<JSONObject>(){
-               @Mock
-               public JSONObject fromObject(Object object){
-                       JSONObject js = new JSONObject();
-                       js.put("id", "upload-id-123");
-                       js.put("Result", "Success");
-                       js.put("Check", "Ok");
-                       js.put("url", "http://localhost:80");
-                       js.put("userName", "User");
-                       js.put("password", "pass");
-                       js.put("downloadUri", "http://127.0.0.1:80");
-                       js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                       js.put("keyStorePass", "Changeme_123");
-                       js.put("keyStoreType", "PKCS12");
-                       JSONArray ja = new JSONArray();
-                       String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                       ja.add(str);
-                       JSONArray ja1 = new JSONArray();
-                       String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
-                       ja1.add(str1);
-                       JSONArray ja2 = new JSONArray();
-                       String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
-                       ja2.add(str2);
-                       JSONObject jsObject = new JSONObject();
-                       jsObject.put("downloadUrl", "http://localhost:80");
-                       jsObject.put("csarName", "CSCF");
-                       JSONObject jsEms = new JSONObject();
-                       jsEms.put("emsUuid", "123erbhi-hjdek123");
-                       JSONObject jsCsar = new JSONObject();
-                       jsCsar.put("csar_file_path", "/home/ubuntu/check/");
-                       jsCsar.put("csar_file_name", "Csar_File");
-                       jsCsar.put("emsUuid", jsEms);
-                       JSONObject jsTemp = new JSONObject();
-                       jsTemp.put("template", jsCsar);
-                       js.put("vCSCF", jsTemp);
-                       js.put("vim_info", ja);
-                       js.put("template", ja2);
-                       js.put("templates", ja1);
-                       js.put("packageInfo", jsObject);
-                       return js;
-               }
-               };
-               
-        System.setProperty("catalina.base", "D:/VFC/23-08-2018/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//     new MockUp<VNFRestfulUtil>(){
+//             @Mock
+//             public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                     RestfulResponse rr = new RestfulResponse();
+//                     Map<String, String> header = new HashMap<>();
+//                     header.put("Content-Type", "Application/Json");
+//                     header.put("X-FormId", "jhfdl");
+//                     rr.setRespHeaderMap(header);
+//                     rr.setStatus(200);
+//                     rr.setResponseJson("shdfhj");
+//                     
+//                     return rr;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<VnfmUtil>(){
+//             @Mock
+//             public JSONObject getVnfmById(String vnfmId) {
+//                     
+//                     JSONObject jsonObject = new JSONObject();
+//                     jsonObject.put("url", "https://localhost:80");
+//                     jsonObject.put("userName", "ubuntu");
+//                     jsonObject.put("password", "******");
+//                     return jsonObject;
+//                     
+//             }
+//     };
+//     
+//     new MockUp<DownloadCsarManager>(){
+//             @Mock
+//             public String download(String url, String filepath) {
+//                     String response = "Success";
+//                     return response;
+//             }
+//             
+//             @Mock
+//              public int unzipCSAR(String fileName, String filePath) {                       
+//                     
+//                     return 0;
+//             }
+//     };
+//     
+//     new MockUp<ConnectMgrVnfm>(){
+//             @Mock
+//             public int connect(JSONObject vnfmObj, String authModel) {
+//                     
+//                     
+//                     return 200;
+//                     
+//             }
+//             
+//             @Mock
+//             public String getAccessSession() {
+//                     
+//                     return "conn";
+//             }
+//     };
+//     
+//        new MockUp<JSONObject>(){
+//             @Mock
+//             public JSONObject fromObject(Object object){
+//                     JSONObject js = new JSONObject();
+//                     js.put("id", "upload-id-123");
+//                     js.put("Result", "Success");
+//                     js.put("Check", "Ok");
+//                     js.put("url", "http://localhost:80");
+//                     js.put("userName", "User");
+//                     js.put("password", "pass");
+//                     js.put("downloadUri", "http://127.0.0.1:80");
+//                     js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                     js.put("keyStorePass", "Changeme_123");
+//                     js.put("keyStoreType", "PKCS12");
+//                     JSONArray ja = new JSONArray();
+//                     String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             JSONArray ja1 = new JSONArray();
+//                             String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";;
+//                             ja1.add(str1);
+//                             JSONArray ja2 = new JSONArray();
+//                             String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
+//                             ja2.add(str2);
+//                             JSONObject jsObject = new JSONObject();
+//                             jsObject.put("downloadUrl", "http://localhost:80");
+//                             jsObject.put("csarName", "CSCF");
+//                             JSONObject jsEms = new JSONObject();
+//                             jsEms.put("emsUuid", "123erbhi-hjdek123");
+//                             JSONObject jsCsar = new JSONObject();
+//                             jsCsar.put("csar_file_path", "/home/ubuntu/check/");
+//                             jsCsar.put("csar_file_name", "Csar_File");
+//                             jsCsar.put("emsUuid", jsEms);
+//                             JSONObject jsTemp = new JSONObject();
+//                             jsTemp.put("template", jsCsar);
+//                             js.put("vCSCF", jsTemp);
+//                             js.put("vim_info", ja);
+//                             js.put("template", ja2);
+//                             js.put("templates", ja1);
+//                             js.put("packageInfo", jsObject);
+//                     return js;
+//             }
+//             };
+//             
+//        System.setProperty("catalina.base", "D:/VFC/23-08-2018/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
                
         JSONObject vnfpkg = new JSONObject();
         JSONObject vnfpkg1 = new JSONObject();
@@ -3602,110 +3592,110 @@ public class AdapterResourceManagerTest {
        @Test
        public void uploadVNFPackageTestVnfdPlanInfo() throws IOException {
 
-               new MockUp<VNFRestfulUtil>() {
-                       @Mock
-                       public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                               RestfulResponse rr = new RestfulResponse();
-                               Map<String, String> header = new HashMap<>();
-                               header.put("Content-Type", "Application/Json");
-                               header.put("X-FormId", "jhfdl");
-                               rr.setRespHeaderMap(header);
-                               rr.setStatus(200);
-                               rr.setResponseJson("shdfhj");
-
-                               return rr;
-
-                       }
-               };
-
-               new MockUp<VnfmUtil>() {
-                       @Mock
-                       public JSONObject getVnfmById(String vnfmId) {
-
-                               JSONObject jsonObject = new JSONObject();
-                               jsonObject.put("url", "https://localhost:80");
-                               jsonObject.put("userName", "ubuntu");
-                               jsonObject.put("password", "******");
-                               return jsonObject;
-
-                       }
-               };
-
-               new MockUp<DownloadCsarManager>() {
-                       @Mock
-                       public String download(String url, String filepath) {
-                               String response = "Success";
-                               return response;
-                       }
-
-                       @Mock
-                       public int unzipCSAR(String fileName, String filePath) {
-
-                               return 0;
-                       }
-               };
-
-               new MockUp<ConnectMgrVnfm>() {
-                       @Mock
-                       public int connect(JSONObject vnfmObj, String authModel) {
-
-                               return 200;
-
-                       }
-
-                       @Mock
-                       public String getAccessSession() {
-
-                               return "conn";
-                       }
-               };
-
-               new MockUp<JSONObject>() {
-                       @Mock
-                       public JSONObject fromObject(Object object) {
-                               JSONObject js = new JSONObject();
-                               js.put("id", "upload-id-123");
-                               js.put("Result", "Success");
-                               js.put("Check", "Ok");
-                               js.put("url", "http://localhost:80");
-                               js.put("userName", "User");
-                               js.put("password", "pass");
-                               js.put("downloadUri", "http://127.0.0.1:80");
-                               js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                               js.put("keyStorePass", "Changeme_123");
-                               js.put("keyStoreType", "PKCS12");
-                               JSONArray ja = new JSONArray();
-                               String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                               ja.add(str);
-                               JSONArray ja1 = new JSONArray();
-                               String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                               ;
-                               ja1.add(str1);
-                               JSONArray ja2 = new JSONArray();
-                               String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
-                               ja2.add(str2);
-                               JSONObject jsObject = new JSONObject();
-                               jsObject.put("downloadUrl", "http://localhost:80");
-                               jsObject.put("csarName", "CSCF");
-                               JSONObject jsEms = new JSONObject();
-                               jsEms.put("emsUuid", "123erbhi-hjdek123");
-                               JSONObject jsCsar = new JSONObject();
-                               jsCsar.put("csar_file_path", "/home/ubuntu/check/");
-                               jsCsar.put("csar_file_name", "Csar_File");
-                               jsCsar.put("emsUuid", jsEms);
-                               JSONObject jsTemp = new JSONObject();
-                               jsTemp.put("template", jsCsar);
-                               js.put("vCSCF", jsTemp);
-                               js.put("vim_info", ja);
-                               js.put("template", ja2);
-                               js.put("templates", ja1);
-                               js.put("packageInfo", jsObject);
-                               return js;
-                       }
-               };
-
-               System.setProperty("catalina.base",
-                               "D:/VFC/23-08-2018/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//             new MockUp<VNFRestfulUtil>() {
+//                     @Mock
+//                     public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                             RestfulResponse rr = new RestfulResponse();
+//                             Map<String, String> header = new HashMap<>();
+//                             header.put("Content-Type", "Application/Json");
+//                             header.put("X-FormId", "jhfdl");
+//                             rr.setRespHeaderMap(header);
+//                             rr.setStatus(200);
+//                             rr.setResponseJson("shdfhj");
+//
+//                             return rr;
+//
+//                     }
+//             };
+//
+//             new MockUp<VnfmUtil>() {
+//                     @Mock
+//                     public JSONObject getVnfmById(String vnfmId) {
+//
+//                             JSONObject jsonObject = new JSONObject();
+//                             jsonObject.put("url", "https://localhost:80");
+//                             jsonObject.put("userName", "ubuntu");
+//                             jsonObject.put("password", "******");
+//                             return jsonObject;
+//
+//                     }
+//             };
+//
+//             new MockUp<DownloadCsarManager>() {
+//                     @Mock
+//                     public String download(String url, String filepath) {
+//                             String response = "Success";
+//                             return response;
+//                     }
+//
+//                     @Mock
+//                     public int unzipCSAR(String fileName, String filePath) {
+//
+//                             return 0;
+//                     }
+//             };
+//
+//             new MockUp<ConnectMgrVnfm>() {
+//                     @Mock
+//                     public int connect(JSONObject vnfmObj, String authModel) {
+//
+//                             return 200;
+//
+//                     }
+//
+//                     @Mock
+//                     public String getAccessSession() {
+//
+//                             return "conn";
+//                     }
+//             };
+//
+//             new MockUp<JSONObject>() {
+//                     @Mock
+//                     public JSONObject fromObject(Object object) {
+//                             JSONObject js = new JSONObject();
+//                             js.put("id", "upload-id-123");
+//                             js.put("Result", "Success");
+//                             js.put("Check", "Ok");
+//                             js.put("url", "http://localhost:80");
+//                             js.put("userName", "User");
+//                             js.put("password", "pass");
+//                             js.put("downloadUri", "http://127.0.0.1:80");
+//                             js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                             js.put("keyStorePass", "Changeme_123");
+//                             js.put("keyStoreType", "PKCS12");
+//                             JSONArray ja = new JSONArray();
+//                             String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             JSONArray ja1 = new JSONArray();
+//                             String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ;
+//                             ja1.add(str1);
+//                             JSONArray ja2 = new JSONArray();
+//                             String str2 = "{\n  \"template_name\": \"vnfd-name-123\",\n  \"topology_template\": [{\n\t\t\t\"service_url\": \"/api/hwvnfm/v1\",\n\t\t\t\n\t\t}]\n\t\n\t\n}";
+//                             ja2.add(str2);
+//                             JSONObject jsObject = new JSONObject();
+//                             jsObject.put("downloadUrl", "http://localhost:80");
+//                             jsObject.put("csarName", "CSCF");
+//                             JSONObject jsEms = new JSONObject();
+//                             jsEms.put("emsUuid", "123erbhi-hjdek123");
+//                             JSONObject jsCsar = new JSONObject();
+//                             jsCsar.put("csar_file_path", "/home/ubuntu/check/");
+//                             jsCsar.put("csar_file_name", "Csar_File");
+//                             jsCsar.put("emsUuid", jsEms);
+//                             JSONObject jsTemp = new JSONObject();
+//                             jsTemp.put("template", jsCsar);
+//                             js.put("vCSCF", jsTemp);
+//                             js.put("vim_info", ja);
+//                             js.put("template", ja2);
+//                             js.put("templates", ja1);
+//                             js.put("packageInfo", jsObject);
+//                             return js;
+//                     }
+//             };
+//
+//             System.setProperty("catalina.base",
+//                             "D:/VFC/23-08-2018/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
 
                JSONObject vnfpkg = new JSONObject();
                JSONObject vnfpkg1 = new JSONObject();
@@ -3726,128 +3716,128 @@ public class AdapterResourceManagerTest {
        @Test
        public void uploadVNFPackageSuccessTest() {
 
-               new MockUp<VNFRestfulUtil>() {
-                       @Mock
-                       public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                               RestfulResponse rr = new RestfulResponse();
-                               Map<String, String> header = new HashMap<>();
-                               header.put("Content-Type", "Application/Json");
-                               header.put("X-FormId", "jhfdl");
-                               rr.setRespHeaderMap(header);
-                               rr.setStatus(200);
-                               rr.setResponseJson("shdfhj");
-
-                               return rr;
-
-                       }
-               };
-
-               new MockUp<VnfmUtil>() {
-                       @Mock
-                       public JSONObject getVnfmById(String vnfmId) {
-
-                               JSONObject jsonObject = new JSONObject();
-                               jsonObject.put("url", "https://localhost:80");
-                               jsonObject.put("userName", "ubuntu");
-                               jsonObject.put("password", "******");
-                               return jsonObject;
-
-                       }
-               };
-
-               new MockUp<DownloadCsarManager>() {
-                       @Mock
-                       public String download(String url, String filepath) {
-                               String response = "Success";
-                               return response;
-                       }
-
-                       @Mock
-                       public int unzipCSAR(String fileName, String filePath) {
-
-                               return 0;
-                       }
-               };
-
-               new MockUp<HttpClient>() {
-                       @Mock
-                       public int executeMethod(HttpMethod method) {
-                               return 200;
-                       }
-               };
-
-               new MockUp<HttpMethodBase>() {
-
-                       @Mock
-                       public int getStatusCode() {
-
-                               return 200;
-                       }
-
-               };
-
-               new MockUp<ConnectMgrVnfm>() {
-                       @Mock
-                       public int connect(JSONObject vnfmObj, String authModel) {
-
-                               return 200;
-
-                       }
-
-                       @Mock
-                       public String getAccessSession() {
-
-                               return "conn";
-                       }
-               };
-
-               new MockUp<JSONObject>() {
-                       @Mock
-                       public JSONObject fromObject(Object object) {
-                               JSONObject js = new JSONObject();
-                               js.put("id", "upload-id-123");
-                               js.put("Result", "Success");
-                               js.put("Check", "Ok");
-                               js.put("url", "http://localhost:80");
-                               js.put("userName", "User");
-                               js.put("password", "pass");
-                               js.put("downloadUri", "http://127.0.0.1:80");
-                               js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
-                               js.put("keyStorePass", "Changeme_123");
-                               js.put("keyStoreType", "PKCS12");
-                               JSONArray ja = new JSONArray();
-                               String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                               ja.add(str);
-                               JSONArray ja1 = new JSONArray();
-                               String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
-                               ;
-                               ja1.add(str1);
-                               JSONArray ja2 = new JSONArray();
-                               String str2 = "{\"template_name\": \"VNFD_vUGW\",\"topology_template\":[{\"plan_name\": \"Normal_E9K\",\"plan_id\": \"Normal_E9K\"}]}";
-                               ja2.add(str2);
-                               JSONObject verTmpObj = ja2.getJSONObject(0);
-                               JSONObject jsObject = new JSONObject();
-                               jsObject.put("downloadUrl", "http://localhost:80");
-                               jsObject.put("csarName", "CSCF");
-                               JSONObject jsEms = new JSONObject();
-                               jsEms.put("emsUuid", "123erbhi-hjdek123");
-                               JSONObject jsCsar = new JSONObject();
-                               jsCsar.put("csar_file_path", "/home/ubuntu/check/");
-                               jsCsar.put("csar_file_name", "Csar_File");
-                               jsCsar.put("emsUuid", jsEms);
-                               JSONObject jsTemp = new JSONObject();
-                               jsTemp.put("template", jsCsar);
-                               js.put("vCSCF", jsTemp);
-                               js.put("vim_info", ja);
-                               js.put("template", verTmpObj);
-                               js.put("templates", ja1);
-                               js.put("packageInfo", jsObject);
-                               return js;
-                       }
-               };
-
-               System.setProperty("catalina.base",
-                               "D:/VFC/23-08-2018/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
+//             new MockUp<VNFRestfulUtil>() {
+//                     @Mock
+//                     public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                             RestfulResponse rr = new RestfulResponse();
+//                             Map<String, String> header = new HashMap<>();
+//                             header.put("Content-Type", "Application/Json");
+//                             header.put("X-FormId", "jhfdl");
+//                             rr.setRespHeaderMap(header);
+//                             rr.setStatus(200);
+//                             rr.setResponseJson("shdfhj");
+//
+//                             return rr;
+//
+//                     }
+//             };
+//
+//             new MockUp<VnfmUtil>() {
+//                     @Mock
+//                     public JSONObject getVnfmById(String vnfmId) {
+//
+//                             JSONObject jsonObject = new JSONObject();
+//                             jsonObject.put("url", "https://localhost:80");
+//                             jsonObject.put("userName", "ubuntu");
+//                             jsonObject.put("password", "******");
+//                             return jsonObject;
+//
+//                     }
+//             };
+//
+//             new MockUp<DownloadCsarManager>() {
+//                     @Mock
+//                     public String download(String url, String filepath) {
+//                             String response = "Success";
+//                             return response;
+//                     }
+//
+//                     @Mock
+//                     public int unzipCSAR(String fileName, String filePath) {
+//
+//                             return 0;
+//                     }
+//             };
+//
+//             new MockUp<HttpClient>() {
+//                     @Mock
+//                     public int executeMethod(HttpMethod method) {
+//                             return 200;
+//                     }
+//             };
+//
+//             new MockUp<HttpMethodBase>() {
+//
+//                     @Mock
+//                     public int getStatusCode() {
+//
+//                             return 200;
+//                     }
+//
+//             };
+//
+//             new MockUp<ConnectMgrVnfm>() {
+//                     @Mock
+//                     public int connect(JSONObject vnfmObj, String authModel) {
+//
+//                             return 200;
+//
+//                     }
+//
+//                     @Mock
+//                     public String getAccessSession() {
+//
+//                             return "conn";
+//                     }
+//             };
+//
+//             new MockUp<JSONObject>() {
+//                     @Mock
+//                     public JSONObject fromObject(Object object) {
+//                             JSONObject js = new JSONObject();
+//                             js.put("id", "upload-id-123");
+//                             js.put("Result", "Success");
+//                             js.put("Check", "Ok");
+//                             js.put("url", "http://localhost:80");
+//                             js.put("userName", "User");
+//                             js.put("password", "pass");
+//                             js.put("downloadUri", "http://127.0.0.1:80");
+//                             js.put("keyStore", "C:/Users/Huawei/Desktop/etc/conf/server.p12");
+//                             js.put("keyStorePass", "Changeme_123");
+//                             js.put("keyStoreType", "PKCS12");
+//                             JSONArray ja = new JSONArray();
+//                             String str = "{\n  \"vim_id\": \"vim-0-1\",\n\t\"vim-info\": {\n\t\t\"vim-name\": \"vim-name-123\",\n\t\t\"vim-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ja.add(str);
+//                             JSONArray ja1 = new JSONArray();
+//                             String str1 = "{\n  \"vnfdVersion\": \"1.0version\",\n\t\"vnfd-info\": {\n\t\t\"vnfd-name\": \"vnfd-name-123\",\n\t\t\"vnfd-id\": \"vim-0-1\",\n\t\t\"ip\": \"127.0.0.1\",\n\t\t\"port\": \"8482\",\n\t\t\"protocol\": \"http\",\n\t\t\n\t}\n}";
+//                             ;
+//                             ja1.add(str1);
+//                             JSONArray ja2 = new JSONArray();
+//                             String str2 = "{\"template_name\": \"VNFD_vUGW\",\"topology_template\":[{\"plan_name\": \"Normal_E9K\",\"plan_id\": \"Normal_E9K\"}]}";
+//                             ja2.add(str2);
+//                             JSONObject verTmpObj = ja2.getJSONObject(0);
+//                             JSONObject jsObject = new JSONObject();
+//                             jsObject.put("downloadUrl", "http://localhost:80");
+//                             jsObject.put("csarName", "CSCF");
+//                             JSONObject jsEms = new JSONObject();
+//                             jsEms.put("emsUuid", "123erbhi-hjdek123");
+//                             JSONObject jsCsar = new JSONObject();
+//                             jsCsar.put("csar_file_path", "/home/ubuntu/check/");
+//                             jsCsar.put("csar_file_name", "Csar_File");
+//                             jsCsar.put("emsUuid", jsEms);
+//                             JSONObject jsTemp = new JSONObject();
+//                             jsTemp.put("template", jsCsar);
+//                             js.put("vCSCF", jsTemp);
+//                             js.put("vim_info", ja);
+//                             js.put("template", verTmpObj);
+//                             js.put("templates", ja1);
+//                             js.put("packageInfo", jsObject);
+//                             return js;
+//                     }
+//             };
+//
+//             System.setProperty("catalina.base",
+//                             "D:/VFC/23-08-2018/svnfm/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release");
 
                JSONObject vnfpkg = new JSONObject();
                JSONObject vnfpkg1 = new JSONObject();
@@ -3862,4 +3852,109 @@ public class AdapterResourceManagerTest {
                JSONObject res = manager.uploadVNFPackage(vnfpkg1, paramsMap);
                assertEquals(res.get("retCode"), 200);
        }
+       
+       
+       @Test
+       public void transferFromCsarSI() throws Exception {
+               
+               AdapterResourceManager arManager = new AdapterResourceManager();
+               Method m =AdapterResourceManager.class.getDeclaredMethod("transferFromCsar", new Class[] {String.class});
+               m.setAccessible(true);
+               m.invoke(arManager, "CSCF_SI");
+       } 
+       
+       @Test
+       public void transferFromCsarCSCF() throws Exception {
+               
+               AdapterResourceManager arManager = new AdapterResourceManager();
+               Method m =AdapterResourceManager.class.getDeclaredMethod("transferFromCsar", new Class[] {String.class});
+               m.setAccessible(true);
+               m.invoke(arManager, "CSCF");
+       }
+       
+       @Test
+       public void transferFromCsarMME() throws Exception {
+               
+               AdapterResourceManager arManager = new AdapterResourceManager();
+               Method m =AdapterResourceManager.class.getDeclaredMethod("transferFromCsar", new Class[] {String.class});
+               m.setAccessible(true);
+               m.invoke(arManager, "MME");
+       } 
+       
+       @Test
+       public void transferFromCsarSPGW() throws Exception {
+               
+               AdapterResourceManager arManager = new AdapterResourceManager();
+               Method m =AdapterResourceManager.class.getDeclaredMethod("transferFromCsar", new Class[] {String.class});
+               m.setAccessible(true);
+               m.invoke(arManager, "SPGW");
+       } 
+       
+       @Test
+       public void transferFromCsarHSS() throws Exception {
+               
+               AdapterResourceManager arManager = new AdapterResourceManager();
+               Method m =AdapterResourceManager.class.getDeclaredMethod("transferFromCsar", new Class[] {String.class});
+               m.setAccessible(true);
+               m.invoke(arManager, "HSS");
+       } 
+       
+       @Test
+       public void transferFromCsarSBC() throws Exception {
+               
+               AdapterResourceManager arManager = new AdapterResourceManager();
+               Method m =AdapterResourceManager.class.getDeclaredMethod("transferFromCsar", new Class[] {String.class});
+               m.setAccessible(true);
+               m.invoke(arManager, "SBC");
+       }
+       
+       @Test
+       public void transferFromCsarPCRF() throws Exception {
+               
+               AdapterResourceManager arManager = new AdapterResourceManager();
+               Method m =AdapterResourceManager.class.getDeclaredMethod("transferFromCsar", new Class[] {String.class});
+               m.setAccessible(true);
+               m.invoke(arManager, "PCRF");
+       }
+       
+       @Test
+       public void transferFromCsarTAS() throws Exception {
+               
+               AdapterResourceManager arManager = new AdapterResourceManager();
+               Method m =AdapterResourceManager.class.getDeclaredMethod("transferFromCsar", new Class[] {String.class});
+               m.setAccessible(true);
+               m.invoke(arManager, "TAS");
+       }
+       
+       @Test
+       public void transferFromCsar() throws Exception {
+               
+               AdapterResourceManager arManager = new AdapterResourceManager();
+               Method m =AdapterResourceManager.class.getDeclaredMethod("transferFromCsar", new Class[] {String.class});
+               m.setAccessible(true);
+               m.invoke(arManager, "transferFromCsar");
+       }
+       
+       @Test
+       public void uploadCsar()  throws Exception {
+               JSONObject vnfpkg = new JSONObject();
+               vnfpkg.put("ftp_server_ip","127.0.0.1");
+               vnfpkg.put("ftp_username","ftp_username");
+               vnfpkg.put("ftp_password","ftp_password");
+               AdapterResourceManager arManager = new AdapterResourceManager();
+               Method m =AdapterResourceManager.class.getDeclaredMethod("uploadCsar", new Class[] {JSONObject.class,String.class});
+               m.setAccessible(true);
+               m.invoke(arManager, vnfpkg,"csarfilepath");
+               
+       }
+       
+       
+       @Test
+       public void readVnfdIdInfoFromJson() throws Exception{
+               AdapterResourceManager arManager = new AdapterResourceManager();
+               Method m =AdapterResourceManager.class.getDeclaredMethod("readVnfdIdInfoFromJson");     
+               m.setAccessible(true);
+               m.invoke(arManager);
+       }
+       
 }
\ No newline at end of file

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/Driver2MSBManagerTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/Driver2MSBManagerTest.java
index 9226362..94a256a 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/Driver2MSBManagerTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/Driver2MSBManagerTest.java
@@ -60,15 +60,15 @@ public class Driver2MSBManagerTest {
 
     @Test
     public void registerDriverTestNullResp() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-
-                return null;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//
+//                return null;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -79,18 +79,18 @@ public class Driver2MSBManagerTest {
 
     @Test
     public void registerDriverCreateSuccess() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(201);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(201);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -101,18 +101,18 @@ public class Driver2MSBManagerTest {
 
     @Test
     public void registerDriverOkSuccess() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(200);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(200);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -123,18 +123,18 @@ public class Driver2MSBManagerTest {
 
     @Test
     public void registerDriverTestInvalidParams() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(415);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(415);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -145,18 +145,18 @@ public class Driver2MSBManagerTest {
 
     @Test
     public void registerDriverTestInternalError() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(500);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(500);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -167,15 +167,15 @@ public class Driver2MSBManagerTest {
 
     @Test
     public void unregisterDriverTestNullResp() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-
-                return null;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//
+//                return null;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -186,18 +186,18 @@ public class Driver2MSBManagerTest {
 
     @Test
     public void unregisterDriverDeleteSuccess() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(204);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(204);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -208,18 +208,18 @@ public class Driver2MSBManagerTest {
 
     @Test
     public void unregisterDriverResourceNotFound() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(404);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(404);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -230,18 +230,18 @@ public class Driver2MSBManagerTest {
 
     @Test
     public void unregisterDriverTestInvalidParams() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(415);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(415);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -252,18 +252,18 @@ public class Driver2MSBManagerTest {
 
     @Test
     public void unregisterDriverTestInternalError() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(500);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(500);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java
index 7af73f8..df9ecbe 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java
@@ -60,15 +60,15 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void registerDriverTestNullResp() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-
-                return null;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//
+//                return null;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -79,18 +79,18 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void registerDriverCreateSuccess() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(201);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(201);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -101,18 +101,18 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void registerDriverOkSuccess() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(200);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(200);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -123,18 +123,18 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void registerDriverTestInvalidParams() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(415);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(415);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -145,18 +145,18 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void registerDriverTestInternalError() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(500);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(500);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -167,15 +167,15 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void unregisterDriverTestNullResp() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-
-                return null;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//
+//                return null;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -186,18 +186,18 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void unregisterDriverDeleteSuccess() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(204);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(204);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -208,18 +208,18 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void unregisterDriverResourceNotFound() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(404);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(404);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -230,18 +230,18 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void unregisterDriverTestInvalidParams() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(415);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(415);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
@@ -252,18 +252,18 @@ public class VnfmAdapter2DriverManagerTest {
 
     @Test
     public void unregisterDriverTestInternalError() {
-        new MockUp<VNFRestfulUtil>() {
-
-            @Mock
-            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
-                RestfulResponse response = new RestfulResponse();
-                response.setStatus(500);
-
-                String vimStr = toJson(vim);
-                response.setResponseJson(vimStr);
-                return response;
-            }
-        };
+//        new MockUp<VNFRestfulUtil>() {
+//
+//            @Mock
+//            public RestfulResponse getRemoteResponse(Map<String, String> paramsMap, String params) {
+//                RestfulResponse response = new RestfulResponse();
+//                response.setStatus(500);
+//
+//                String vimStr = toJson(vim);
+//                response.setResponseJson(vimStr);
+//                return response;
+//            }
+//        };
         Map<String, String> paramsMap = new HashMap<>();
         paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapter2DriverMgrServiceTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapter2DriverMgrServiceTest.java
index d61c3b1..97c967c 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapter2DriverMgrServiceTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapter2DriverMgrServiceTest.java
@@ -40,13 +40,13 @@ public class VnfmAdapter2DriverMgrServiceTest {
 
     @Test
     public void testRegister2(){
-        new MockUp<VnfmAdapter2DriverMgrService>(){
-            @Mock
-            public  String readVnfmAdapterInfoFromJson() throws IOException {
-                return "{'url':'http://127.0.0.1'}";
-
-            }
-        };
+//        new MockUp<VnfmAdapter2DriverMgrService>(){
+//            @Mock
+//            public  String readVnfmAdapterInfoFromJson() throws IOException {
+//                return "{'url':'http://127.0.0.1'}";
+//
+//            }
+//        };
         VnfmAdapter2DriverMgrService mgr = new VnfmAdapter2DriverMgrService();
         mgr.register();
         mgr.unregister();

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapterMgrServiceTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapterMgrServiceTest.java
index 56e1eea..d1c1a5c 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapterMgrServiceTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/ai/internalsvc/impl/VnfmAdapterMgrServiceTest.java
@@ -32,13 +32,13 @@ import mockit.MockUp;
 public class VnfmAdapterMgrServiceTest {
     @Test
     public void testRegister(){
-        new MockUp<VnfmAdapterMgrService>(){
-
-            @Mock
-            public  String readVnfmAdapterInfoFromJson() throws IOException {
-                return "{'abc':'123'}";
-            }
-        };
+//        new MockUp<VnfmAdapterMgrService>(){
+//
+//            @Mock
+//            public  String readVnfmAdapterInfoFromJson() throws IOException {
+//                return "{'abc':'123'}";
+//            }
+//        };
         VnfmAdapterMgrService mgr = new VnfmAdapterMgrService();
         mgr.register();
 

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfmTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfmTest.java
index 1e4937b..3c1d249 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfmTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfmTest.java
@@ -18,13 +18,12 @@ package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.vnf;
 
 import static org.junit.Assert.assertEquals;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 import org.junit.Test;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.ResultRequestUtil;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.impl.AdapterResourceManager;
 import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
 
-import mockit.Mock;
-import mockit.MockUp;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
@@ -40,21 +39,21 @@ public class VnfMgrVnfmTest {
 
     @Test
     public void testCreateVnf() {
-        new MockUp<ResultRequestUtil>() {
-
-            @Mock
-            public JSONObject call(JSONObject vnfmObjcet, String path, String methodName, String paramsJson, String authModel) {
-                JSONObject resultJson = new JSONObject();
-                resultJson.put("retCode", Constant.HTTP_CREATED);
-                JSONObject appInfo = new JSONObject();
-                appInfo.put("vnfinstanceid", "id");
-                appInfo.put("project_id", "project_id");
-                JSONObject data = new JSONObject();
-                data.put("app_info", appInfo);
-                resultJson.put("data", data);
-                return resultJson;
-            }
-        };
+//        new MockUp<ResultRequestUtil>() {
+//
+//            @Mock
+//            public JSONObject call(JSONObject vnfmObjcet, String path, String methodName, String paramsJson, String authModel) {
+//                JSONObject resultJson = new JSONObject();
+//                resultJson.put("retCode", Constant.HTTP_CREATED);
+//                JSONObject appInfo = new JSONObject();
+//                appInfo.put("vnfinstanceid", "id");
+//                appInfo.put("project_id", "project_id");
+//                JSONObject data = new JSONObject();
+//                data.put("app_info", appInfo);
+//                resultJson.put("data", data);
+//                return resultJson;
+//            }
+//        };
 
 
         String data = "{\"vnfmInfo\":{\"url\":\"url\"}}";
@@ -68,15 +67,15 @@ public class VnfMgrVnfmTest {
 
     @Test
     public void testCreateVnfByBadRequest() {
-        new MockUp<ResultRequestUtil>() {
-
-            @Mock
-            public JSONObject call(JSONObject vnfmObjcet, String path, String methodName, String paramsJson, String authModel) {
-                JSONObject resultJson = new JSONObject();
-                resultJson.put("retCode", Constant.HTTP_BAD_REQUEST);
-                return resultJson;
-            }
-        };
+//        new MockUp<ResultRequestUtil>() {
+//
+//            @Mock
+//            public JSONObject call(JSONObject vnfmObjcet, String path, String methodName, String paramsJson, String authModel) {
+//                JSONObject resultJson = new JSONObject();
+//                resultJson.put("retCode", Constant.HTTP_BAD_REQUEST);
+//                return resultJson;
+//            }
+//        };
         String data = "{\"vnfmInfo\":{\"url\":\"url\"}}";
         JSONObject subJsonObject = JSONObject.fromObject(data);
         VnfMgrVnfm vnfMgrVnfm = new VnfMgrVnfm();
@@ -90,15 +89,15 @@ public class VnfMgrVnfmTest {
 
     @Test
     public void testCreateVnfByNotFound() {
-        new MockUp<ResultRequestUtil>() {
-
-            @Mock
-            public JSONObject call(JSONObject vnfmObjcet, String path, String methodName, String paramsJson, String authModel) {
-                JSONObject resultJson = new JSONObject();
-                resultJson.put("retCode", Constant.HTTP_NOTFOUND);
-                return resultJson;
-            }
-        };
+//        new MockUp<ResultRequestUtil>() {
+//
+//            @Mock
+//            public JSONObject call(JSONObject vnfmObjcet, String path, String methodName, String paramsJson, String authModel) {
+//                JSONObject resultJson = new JSONObject();
+//                resultJson.put("retCode", Constant.HTTP_NOTFOUND);
+//                return resultJson;
+//            }
+//        };
         String data = "{\"vnfmInfo\":{\"url\":\"url\"}}";
         JSONObject subJsonObject = JSONObject.fromObject(data);
         JSONObject vnfmObjcet = new JSONObject();
@@ -112,14 +111,14 @@ public class VnfMgrVnfmTest {
 
     @Test
     public void testCreateVnfByJSONException() {
-        new MockUp<ResultRequestUtil>() {
-
-            @Mock
-            public JSONObject call(JSONObject vnfmObjcet, String path, String methodName, String paramsJson, String authModel) {
-                JSONObject resultJson = new JSONObject();
-                return resultJson;
-            }
-        };
+//        new MockUp<ResultRequestUtil>() {
+//
+//            @Mock
+//            public JSONObject call(JSONObject vnfmObjcet, String path, String methodName, String paramsJson, String authModel) {
+//                JSONObject resultJson = new JSONObject();
+//                return resultJson;
+//            }
+//        };
         String data = "{\"vnfmInfo\":{\"url\":\"url\"}}";
         JSONObject subJsonObject = JSONObject.fromObject(data);
         JSONObject vnfmObjcet = new JSONObject();
@@ -133,15 +132,15 @@ public class VnfMgrVnfmTest {
 
     @Test
     public void testRemoveVnf() {
-        new MockUp<ResultRequestUtil>() {
-
-            @Mock
-            public JSONObject call(JSONObject vnfmObjcet, String path, String methodName, String paramsJson, String authModel) {
-                JSONObject resultJson = new JSONObject();
-                resultJson.put("retCode", Constant.HTTP_NOCONTENT);
-                return resultJson;
-            }
-        };
+//        new MockUp<ResultRequestUtil>() {
+//
+//            @Mock
+//            public JSONObject call(JSONObject vnfmObjcet, String path, String methodName, String paramsJson, String authModel) {
+//                JSONObject resultJson = new JSONObject();
+//                resultJson.put("retCode", Constant.HTTP_NOCONTENT);
+//                return resultJson;
+//            }
+//        };
         VnfMgrVnfm vnfMgrVnfm = new VnfMgrVnfm();
         JSONObject vnfmObject = new JSONObject();
         JSONObject vnfObject = new JSONObject();
@@ -158,15 +157,15 @@ public class VnfMgrVnfmTest {
 
     @Test
     public void testRemoveVnfByCsmError() {
-        new MockUp<ResultRequestUtil>() {
-
-            @Mock
-            public JSONObject call(JSONObject vnfmObjcet, String path, String methodName, String paramsJson, String authModel) {
-                JSONObject resultJson = new JSONObject();
-                resultJson.put("retCode", Constant.HTTP_INNERERROR);
-                return resultJson;
-            }
-        };
+//        new MockUp<ResultRequestUtil>() {
+//
+//            @Mock
+//            public JSONObject call(JSONObject vnfmObjcet, String path, String methodName, String paramsJson, String authModel) {
+//                JSONObject resultJson = new JSONObject();
+//                resultJson.put("retCode", Constant.HTTP_INNERERROR);
+//                return resultJson;
+//            }
+//        };
         VnfMgrVnfm vnfMgrVnfm = new VnfMgrVnfm();
         JSONObject vnfmObject = new JSONObject();
         vnfmObject.put("url", "url");
@@ -179,22 +178,22 @@ public class VnfMgrVnfmTest {
     }
     @Test
     public void getJobTestNormal(){
-        new MockUp<ResultRequestUtil>(){
-            @Mock
-            public JSONObject call(JSONObject vnfmObject, String path, String methodName, String paramsJson, String authModel) {
-                JSONObject obj = new JSONObject();
-                JSONObject dataobj = new JSONObject();
-                dataobj.put("id", "2839");
-                obj.put("retCode", 200);
-                JSONArray basics = new JSONArray();
-                basics.add("test123");
-                JSONObject basicsData = new JSONObject();
-                basicsData.put("vnf_list", basics);
-                obj.put("data", basicsData);
-                return obj;
-            }
-
-        };
+//        new MockUp<ResultRequestUtil>(){
+//            @Mock
+//            public JSONObject call(JSONObject vnfmObject, String path, String methodName, String paramsJson, String authModel) {
+//                JSONObject obj = new JSONObject();
+//                JSONObject dataobj = new JSONObject();
+//                dataobj.put("id", "2839");
+//                obj.put("retCode", 200);
+//                JSONArray basics = new JSONArray();
+//                basics.add("test123");
+//                JSONObject basicsData = new JSONObject();
+//                basicsData.put("vnf_list", basics);
+//                obj.put("data", basicsData);
+//                return obj;
+//            }
+//
+//        };
         VnfMgrVnfm vnfMgrVnfm = new VnfMgrVnfm();
         JSONObject vnfmObject = new JSONObject();
 
@@ -205,22 +204,22 @@ public class VnfMgrVnfmTest {
 
     @Test
     public void getJobTestCreatedNormal(){
-        new MockUp<ResultRequestUtil>(){
-            @Mock
-            public JSONObject call(JSONObject vnfmObject, String path, String methodName, String paramsJson, String authModel) {
-                JSONObject obj = new JSONObject();
-                JSONObject dataobj = new JSONObject();
-                dataobj.put("id", "2839");
-                obj.put("retCode", 201);
-                JSONArray basics = new JSONArray();
-                basics.add("test123");
-                JSONObject basicsData = new JSONObject();
-                basicsData.put("vnf_list", basics);
-                obj.put("data", basicsData);
-                return obj;
-            }
-
-        };
+//        new MockUp<ResultRequestUtil>(){
+//            @Mock
+//            public JSONObject call(JSONObject vnfmObject, String path, String methodName, String paramsJson, String authModel) {
+//                JSONObject obj = new JSONObject();
+//                JSONObject dataobj = new JSONObject();
+//                dataobj.put("id", "2839");
+//                obj.put("retCode", 201);
+//                JSONArray basics = new JSONArray();
+//                basics.add("test123");
+//                JSONObject basicsData = new JSONObject();
+//                basicsData.put("vnf_list", basics);
+//                obj.put("data", basicsData);
+//                return obj;
+//            }
+//
+//        };
         VnfMgrVnfm vnfMgrVnfm = new VnfMgrVnfm();
         JSONObject vnfmObject = new JSONObject();
 
@@ -231,22 +230,22 @@ public class VnfMgrVnfmTest {
 
     @Test
     public void getJobTestNullData(){
-        new MockUp<ResultRequestUtil>(){
-            @Mock
-            public JSONObject call(JSONObject vnfmObject, String path, String methodName, String paramsJson, String authModel) {
-                JSONObject obj = new JSONObject();
-                JSONObject dataobj = new JSONObject();
-                dataobj.put("id", "2839");
-                obj.put("retCode", 201);
-                JSONArray basics = new JSONArray();
-                basics.add("test123");
-                JSONObject basicsData = new JSONObject();
-                basicsData.put("basic", basics);
-                obj.put("data", null);
-                return obj;
-            }
-
-        };
+//        new MockUp<ResultRequestUtil>(){
+//            @Mock
+//            public JSONObject call(JSONObject vnfmObject, String path, String methodName, String paramsJson, String authModel) {
+//                JSONObject obj = new JSONObject();
+//                JSONObject dataobj = new JSONObject();
+//                dataobj.put("id", "2839");
+//                obj.put("retCode", 201);
+//                JSONArray basics = new JSONArray();
+//                basics.add("test123");
+//                JSONObject basicsData = new JSONObject();
+//                basicsData.put("basic", basics);
+//                obj.put("data", null);
+//                return obj;
+//            }
+//
+//        };
         VnfMgrVnfm vnfMgrVnfm = new VnfMgrVnfm();
         JSONObject vnfmObject = new JSONObject();
 
@@ -257,22 +256,22 @@ public class VnfMgrVnfmTest {
 
     @Test
     public void getJobTestInternalError(){
-        new MockUp<ResultRequestUtil>(){
-            @Mock
-            public JSONObject call(JSONObject vnfmObject, String path, String methodName, String paramsJson, String authModel) {
-                JSONObject obj = new JSONObject();
-                JSONObject dataobj = new JSONObject();
-                dataobj.put("id", "2839");
-                obj.put("retCode", 500);
-                JSONArray basics = new JSONArray();
-                basics.add("test123");
-                JSONObject basicsData = new JSONObject();
-                basicsData.put("basic", basics);
-                obj.put("data", null);
-                return obj;
-            }
-
-        };
+//        new MockUp<ResultRequestUtil>(){
+//            @Mock
+//            public JSONObject call(JSONObject vnfmObject, String path, String methodName, String paramsJson, String authModel) {
+//                JSONObject obj = new JSONObject();
+//                JSONObject dataobj = new JSONObject();
+//                dataobj.put("id", "2839");
+//                obj.put("retCode", 500);
+//                JSONArray basics = new JSONArray();
+//                basics.add("test123");
+//                JSONObject basicsData = new JSONObject();
+//                basicsData.put("basic", basics);
+//                obj.put("data", null);
+//                return obj;
+//            }
+//
+//        };
         VnfMgrVnfm vnfMgrVnfm = new VnfMgrVnfm();
         JSONObject vnfmObject = new JSONObject();
 
@@ -284,21 +283,21 @@ public class VnfMgrVnfmTest {
 
     @Test
     public void testScaleVnfOut() {
-        new MockUp<ResultRequestUtil>() {
-
-            @Mock
-            public JSONObject call(JSONObject vnfmObjcet, String path, String methodName, String paramsJson, String authModel) {
-                JSONObject resultJson = new JSONObject();
-                resultJson.put("retCode", Constant.HTTP_CREATED);
-                JSONObject appInfo = new JSONObject();
-                appInfo.put("vnfinstanceid", "id");
-                appInfo.put("project_id", "project_id");
-                JSONObject data = new JSONObject();
-                data.put("app_info", appInfo);
-                resultJson.put("data", data);
-                return resultJson;
-            }
-        };
+//        new MockUp<ResultRequestUtil>() {
+//
+//            @Mock
+//            public JSONObject call(JSONObject vnfmObjcet, String path, String methodName, String paramsJson, String authModel) {
+//                JSONObject resultJson = new JSONObject();
+//                resultJson.put("retCode", Constant.HTTP_CREATED);
+//                JSONObject appInfo = new JSONObject();
+//                appInfo.put("vnfinstanceid", "id");
+//                appInfo.put("project_id", "project_id");
+//                JSONObject data = new JSONObject();
+//                data.put("app_info", appInfo);
+//                resultJson.put("data", data);
+//                return resultJson;
+//            }
+//        };
         String data = "{\"type\":\"SCALE_OUT\"}}";
         JSONObject subJsonObject = JSONObject.fromObject(data);
         JSONObject vnfmObjcet = new JSONObject();
@@ -310,32 +309,32 @@ public class VnfMgrVnfmTest {
 
     @Test
     public void testScaleVnfIn() {
-        new MockUp<ResultRequestUtil>() {
-
-            @Mock
-            public JSONObject call(JSONObject vnfmObjcet, String path, String methodName, String paramsJson, String authModel) {
-                JSONObject resultJson = new JSONObject();
-                resultJson.put("retCode", Constant.HTTP_CREATED);
-                JSONObject appInfo = new JSONObject();
-                appInfo.put("vnfinstanceid", "id");
-                appInfo.put("project_id", "project_id");
-                JSONObject data = new JSONObject();
-                data.put("app_info", appInfo);
-                resultJson.put("data", data);
-                return resultJson;
-            }
-        };
-
-        new MockUp<AdapterResourceManager>() {
-
-            @Mock
-            public JSONObject readScaleInVmIdFromJson() {
-                JSONObject resultJson = new JSONObject();
-                JSONArray vm_list = new JSONArray();
-                resultJson.put("vm_list", vm_list);
-                return resultJson;
-            }
-        };
+//        new MockUp<ResultRequestUtil>() {
+//
+//            @Mock
+//            public JSONObject call(JSONObject vnfmObjcet, String path, String methodName, String paramsJson, String authModel) {
+//                JSONObject resultJson = new JSONObject();
+//                resultJson.put("retCode", Constant.HTTP_CREATED);
+//                JSONObject appInfo = new JSONObject();
+//                appInfo.put("vnfinstanceid", "id");
+//                appInfo.put("project_id", "project_id");
+//                JSONObject data = new JSONObject();
+//                data.put("app_info", appInfo);
+//                resultJson.put("data", data);
+//                return resultJson;
+//            }
+//        };
+//
+//        new MockUp<AdapterResourceManager>() {
+//
+//            @Mock
+//            public JSONObject readScaleInVmIdFromJson() {
+//                JSONObject resultJson = new JSONObject();
+//                JSONArray vm_list = new JSONArray();
+//                resultJson.put("vm_list", vm_list);
+//                return resultJson;
+//            }
+//        };
         String data = "{\"type\":\"SCALE_IN\"}}";
         JSONObject subJsonObject = JSONObject.fromObject(data);
         JSONObject vnfmObjcet = new JSONObject();
@@ -344,4 +343,95 @@ public class VnfMgrVnfmTest {
 
         assertEquals(Constant.REST_SUCCESS, result.get("retCode"));
     }
+    
+    
+       @Test
+       public void getVduType() throws Exception {
+               JSONObject vnfmObject = new JSONObject();
+               JSONObject queryResult = new JSONObject();
+               VnfMgrVnfm vnfMgrVnfm = new VnfMgrVnfm();
+               Method m = VnfMgrVnfm.class.getDeclaredMethod("getVduType", new Class[] { JSONObject.class, JSONObject.class });
+               m.setAccessible(true);
+               m.invoke(vnfMgrVnfm, vnfmObject, queryResult);
+       }
+
+       @Test
+       public void getScaleTypeScaleOut() throws Exception {
+               VnfMgrVnfm vnfMgrVnfm = new VnfMgrVnfm();
+               Method m = VnfMgrVnfm.class.getDeclaredMethod("getScaleType", new Class[] { String.class });
+               m.setAccessible(true);
+               m.invoke(vnfMgrVnfm, "SCALE_OUT");
+
+       }
+
+       @Test
+       public void getScaleType() throws Exception {
+               VnfMgrVnfm vnfMgrVnfm = new VnfMgrVnfm();
+               Method m = VnfMgrVnfm.class.getDeclaredMethod("getScaleType", new Class[] { String.class });
+               m.setAccessible(true);
+               m.invoke(vnfMgrVnfm, "SCALE_IN");
+
+       }
+
+       @Test
+       public void getScaleTypeNoMatch() throws Exception {
+               VnfMgrVnfm vnfMgrVnfm = new VnfMgrVnfm();
+               Method m = VnfMgrVnfm.class.getDeclaredMethod("getScaleType", new Class[] { String.class });
+               m.setAccessible(true);
+               m.invoke(vnfMgrVnfm, "getScaleType");
+
+       }
+
+       @Test
+       public void handleResponseWithJobId() throws Exception {
+               JSONObject result = new JSONObject();
+               JSONObject returnObj = new JSONObject();
+               returnObj.put("job_id", "job_id");
+               VnfMgrVnfm vnfMgrVnfm = new VnfMgrVnfm();
+               Method m = VnfMgrVnfm.class.getDeclaredMethod("handleResponse",
+                               new Class[] { JSONObject.class, JSONObject.class, String.class, String.class });
+               m.setAccessible(true);
+               m.invoke(vnfMgrVnfm, result, returnObj, "vnfInstanceId", "type");
+
+       }
+
+       @Test
+       public void handleResponse() throws Exception {
+               JSONObject result = new JSONObject();
+               JSONObject returnObj = new JSONObject();
+               VnfMgrVnfm vnfMgrVnfm = new VnfMgrVnfm();
+               Method m = VnfMgrVnfm.class.getDeclaredMethod("handleResponse",
+                               new Class[] { JSONObject.class, JSONObject.class, String.class, String.class });
+               m.setAccessible(true);
+               m.invoke(vnfMgrVnfm, result, returnObj, "vnfInstanceId", "type");
+
+       }
+       
+       
+       @Test
+       public void getNativeVmId() throws Exception {
+               JSONObject returnObj = new JSONObject();
+               VnfMgrVnfm vnfMgrVnfm = new VnfMgrVnfm();
+               Method m = VnfMgrVnfm.class.getDeclaredMethod("getNativeVmId",
+                               new Class[] {String.class , JSONObject.class, String.class, });
+               m.setAccessible(true);
+               m.invoke(vnfMgrVnfm, "vnfInstanceId", returnObj, "type");
+
+       }
+       
+       
+       
+       @Test
+       public void healVnf() {
+               JSONObject json = new JSONObject();
+               JSONObject affectedvm = new JSONObject();
+               affectedvm.put("vmid","vmid" );
+               json.put("affectedvm",affectedvm );
+               json.put("action", "action");
+               json.put("url","url");
+               json.put(Constant.USERNAME, Constant.USERNAME);
+               json.put(Constant.PASSWORD,Constant.PASSWORD);
+               VnfMgrVnfm vnfMgrVnfm = new VnfMgrVnfm();
+               vnfMgrVnfm.healVnf(json, json, "vnfmId", "vnfInstanceId");
+       }
 }

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgrTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgrTest.java
index af97c25..88855d0 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgrTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/AuthMgrTest.java
@@ -45,20 +45,11 @@ public class AuthMgrTest {
 
     @Test
     public void testAuthToken() {
-//        new MockUp<VnfmRestfulUtil>() {
-//
-//            @Mock
-//            public RestfulResponse getRestResByDefault(String auth, String method, JSONObject authParams) {
-//                RestfulResponse response = null;
-//                return response;
-//            }
-//        };
 
         AuthMgr authMgr = new AuthMgr();
-        String data = "{\"auth\":{\"identity\":{\"password\":{\"user\":{\"name\":\"om_team\",\"password\":\"123\"}}}}}";
-        JSONObject params = JSONObject.fromObject(data);
-
+        JSONObject params = new JSONObject();
+        params.put(Constant.USERNAME, Constant.USERNAME);
         JSONObject result = authMgr.authToken(params);
-        assertEquals(Constant.REST_FAIL, result.getInt("retCode"));
+        assertEquals(Constant.REST_SUCCESS, result.getInt("retCode"));
     }
 }

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgrTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgrTest.java
index bbf2367..b2a5949 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgrTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgrTest.java
@@ -20,24 +20,15 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.IOException;
-import java.util.Map;
+import java.lang.reflect.Method;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.ResultRequestUtil;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmUtil;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.restclient.ServiceException;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.impl.AdapterResourceManager;
 import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.vnf.VnfMgrVnfm;
 import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.dao.impl.VnfmDaoImpl;
 import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.dao.inf.VnfmDao;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.entity.Vnfm;
 
-import mockit.Mock;
-import mockit.MockUp;
 import net.sf.json.JSONArray;
-import net.sf.json.JSONException;
 import net.sf.json.JSONObject;
 
 public class VnfMgrTest {
@@ -158,8 +149,11 @@ public class VnfMgrTest {
 
         String data =
                 "{\"vnfPackageId\": \"vnfPackageId\",\"vnfId\": \"vnfId\",\"additionalParam\":{\"parameters\":{\"input\":\"input\"}}}";
-        JSONObject subJsonObject = JSONObject.fromObject(data);
+        //JSONObject subJsonObject = JSONObject.fromObject(data);
         VnfMgr vnfMgr = new VnfMgr();
+        JSONObject subJsonObject = new JSONObject();
+        subJsonObject.put("vnfDescriptorId", "vnfDescriptorId");
+        subJsonObject.put("vnfPackageId", "vnfPackageId");
         JSONObject result = vnfMgr.addVnf(subJsonObject, "vnfmId");
 
         JSONObject restJson = new JSONObject();
@@ -344,14 +338,16 @@ public class VnfMgrTest {
         vnfMgr.setVnfmDao(dao);
         JSONObject vnfObject = new JSONObject();
         vnfObject.put("retCode", Constant.REST_SUCCESS);
-        vnfObject.put("vnfInstanceId", "vnfInstanceId");
+        
         vnfObject.put("vnfPackageId", "vnfPackageId");
+        
         JSONObject resObject = new JSONObject();
         resObject.put("vnfdVersion", "vnfdVersion");
         resObject.put("vnfdId", "vnfdId");
         JSONObject data = new JSONObject();
-        data.put("data", resObject);
-        vnfMgr.saveVnfInfo(vnfObject, data);
+        data.put("vnfInstanceId", "vnfInstanceId");
+        vnfObject.put("data", data);
+        vnfMgr.saveVnfInfo(vnfObject, resObject);
     }
 
     @Test
@@ -496,10 +492,148 @@ public class VnfMgrTest {
                 "{\"vnfPackageId\": \"vnfPackageId\",\"vnfId\": \"vnfId\",\"additionalParam\":{\"parameters\":{\"input\":\"input\"}}}";
         JSONObject subJsonObject = JSONObject.fromObject(data);
         VnfMgr vnfMgr = new VnfMgr();
+        vnfMgr.setConfigedVduType("configedVduType");
         JSONObject result = vnfMgr.scaleVNF(subJsonObject, "testId", "testId");
 
         JSONObject restJson = new JSONObject();
         restJson.put("retCode", Constant.REST_SUCCESS);
         assertEquals(restJson, result);
     }
+    
+    
+    @Test
+    public void scaleVNFObjectNull() {
+       VnfMgr vnfMgr = new VnfMgr();
+       vnfMgr.setConfigedVduType("configedVduType");
+       vnfMgr.scaleVNF(new JSONObject(), "vnfmId", "vnfInstanceId");
+    }
+    
+    @Test
+    public void addVnfJSONObjectNull() {
+       VnfMgr vnfMgr = new VnfMgr();
+       assertNotNull(vnfMgr.addVnf(new JSONObject(), "vnfmId"));
+    }
+    
+    
+    @Test
+    public void getVnfBody() throws Exception {
+       JSONObject restJson =new JSONObject();
+       JSONObject data =new JSONObject();
+       data.put("vnf_id", "vnf_id");
+       data.put("vnf_name", "vnf_name");
+       data.put("vnf_type", "vnf_type");
+       data.put("vnfd_id", "vnfd_id");
+       data.put(Constant.STATUS, Constant.STATUS);
+       data.put(Constant.RETCODE, Constant.REST_SUCCESS);
+       restJson.put("data", new JSONObject[] {data});
+       JSONObject ipObj =new JSONObject();
+       ipObj.put("data",data);
+       ipObj.put(Constant.RETCODE, Constant.REST_SUCCESS);
+       VnfMgr vnfMgr = new VnfMgr();
+       Method m = VnfMgr.class.getDeclaredMethod("getVnfBody",new Class[] {JSONObject.class,JSONObject.class});
+        m.setAccessible(true);
+        assertNotNull(m.invoke(vnfMgr, restJson,ipObj));
+       
+    }
+    
+    @Test
+    public void getVnfBodyJSONException() throws Exception {
+       JSONObject restJson =new JSONObject();
+       JSONObject ipObj =new JSONObject();
+       VnfMgr vnfMgr = new VnfMgr();
+       Method m = VnfMgr.class.getDeclaredMethod("getVnfBody",new Class[] {JSONObject.class,JSONObject.class});
+        m.setAccessible(true);
+        assertNotNull( m.invoke(vnfMgr, restJson,ipObj));
+       
+    }
+    
+    @Test
+    public void getVnfBodyIndexOutOfBoundsException() throws Exception {
+       JSONObject restJson =new JSONObject();
+       restJson.put("data", new JSONObject[] {});
+       JSONObject ipObj =new JSONObject();
+       VnfMgr vnfMgr = new VnfMgr();
+       Method m = VnfMgr.class.getDeclaredMethod("getVnfBody",new Class[] {JSONObject.class,JSONObject.class});
+        m.setAccessible(true);
+        assertNotNull(m.invoke(vnfMgr, restJson,ipObj));
+    }
+    
+    @Test
+    public void transferVnfBody() throws Exception {
+       JSONObject vnfObject =new JSONObject();
+       vnfObject.put("vnfInstanceName", "vnfInstanceName");
+       JSONObject ipObj =new JSONObject();
+       ipObj.put(Constant.VNFDID, Constant.VNFDID);
+       ipObj.put("planId", "planId");
+       ipObj.put("emsUuid", "emsUuid");
+       VnfMgr vnfMgr = new VnfMgr();
+       Method m = VnfMgr.class.getDeclaredMethod("transferVnfBody",new Class[] {JSONObject.class,JSONObject.class,String.class});
+        m.setAccessible(true);
+        assertNotNull(m.invoke(vnfMgr, vnfObject,ipObj,"vnfmId"));
+    }
+    
+    @Test
+    public void transferToLcm() {
+       JSONObject restJson = new JSONObject();
+       JSONObject data = new JSONObject();
+       JSONObject jobInfo = new JSONObject();
+       jobInfo.put("job_id", "job_id");
+       jobInfo.put("task_progress_rate", "1");
+       jobInfo.put("task_status", "Successfully");
+       jobInfo.put("error_code", "error_code");
+       data.put("job_info", jobInfo);
+       restJson.put("data",data);
+       VnfMgr vnfMgr = new VnfMgr();
+       assertNotNull(vnfMgr.transferToLcm(restJson));
+    }
+    
+    @Test
+    public void transferToLcmFailed() {
+       JSONObject restJson = new JSONObject();
+       JSONObject data = new JSONObject();
+       JSONObject jobInfo = new JSONObject();
+       jobInfo.put("job_id", "job_id");
+       jobInfo.put("task_progress_rate", "1");
+       jobInfo.put("task_status", "Failed");
+       jobInfo.put("error_code", "error_code");
+       data.put("job_info", jobInfo);
+       restJson.put("data",data);
+       VnfMgr vnfMgr = new VnfMgr();
+       assertNotNull(vnfMgr.transferToLcm(restJson));
+    }
+    
+    @Test
+    public void getVmsFromVnfm() {
+       VnfMgr vnfMgr = new VnfMgr();
+       assertNotNull(vnfMgr.getVmsFromVnfm("vnfmId", "vnfInstanceId"));
+    }
+    
+    @Test
+    public void getVmsFromVnfmVnfInstanceId() {
+       VnfMgr vnfMgr = new VnfMgr();
+       assertNotNull(vnfMgr.getVmsFromVnfm("vnfmId", null));
+    }
+    
+    @Test
+    public void getJobFromVnfm() {
+       VnfMgr vnfMgr = new VnfMgr();
+       vnfMgr.getJobFromVnfm("jobId", "vnfmId");
+    }
+    
+    
+    @Test
+    public void healVnfNullObject() {
+       VnfMgr vnfMgr = new VnfMgr();
+       JSONObject jsonObject = new JSONObject();
+       vnfMgr.healVnf(jsonObject, "vnfInstanceId", "vnfmId");
+    }
+    
+    @Test
+    public void healVnf() {
+       VnfMgr vnfMgr = new VnfMgr();
+       JSONObject jsonObject = new JSONObject();
+       jsonObject.put("id", "id");
+       vnfMgr.healVnf(jsonObject, "vnfInstanceId", "vnfmId");
+    }
+    
 }

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoaTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoaTest.java
index 2369b02..96ac5a6 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoaTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoaTest.java
@@ -19,20 +19,24 @@ package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import java.io.IOException;
+
+import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmJsonUtil;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
 import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.AuthMgr;
 
-import mockit.Mock;
 import mockit.MockUp;
 import net.sf.json.JSONObject;
-
+@RunWith(MockitoJUnitRunner.class)
 public class AuthRoaTest {
 
     private AuthRoa authRoa;
@@ -45,7 +49,16 @@ public class AuthRoaTest {
         authMgr = new AuthMgr();
         authRoa.setAuthMgr(authMgr);
     }
-
+    
+    @Mock
+    HttpServletRequest context;
+    
+    @Mock
+    HttpServletResponse resp;
+    
+    @Mock
+    ServletInputStream servletInputStream;
+    
     @After
     public void tearDown() {
         authRoa = null;
@@ -56,13 +69,13 @@ public class AuthRoaTest {
     public void testAuthTokenBySubJsonObjectNull() {
         MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {};
         HttpServletRequest mockInstance = proxyStub.getMockInstance();
-        new MockUp<VnfmJsonUtil>() {
-
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest context) {
-                return null;
-            }
-        };
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest context) {
+//                return null;
+//            }
+//        };
 
         MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
         HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
@@ -80,25 +93,25 @@ public class AuthRoaTest {
         MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
         HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
 
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest context) {
-                JSONObject subJsonObject = new JSONObject();
-                return (T)subJsonObject;
-            }
-        };
-        new MockUp<AuthMgr>() {
-
-            @Mock
-            public JSONObject authToken(JSONObject params) {
-                JSONObject restJson = new JSONObject();
-                restJson.put("retCode", Constant.REST_FAIL);
-                restJson.put("data", "Fail!");
-                return restJson;
-            }
-        };
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest context) {
+//                JSONObject subJsonObject = new JSONObject();
+//                return (T)subJsonObject;
+//            }
+//        };
+//        new MockUp<AuthMgr>() {
+//
+//            @Mock
+//            public JSONObject authToken(JSONObject params) {
+//                JSONObject restJson = new JSONObject();
+//                restJson.put("retCode", Constant.REST_FAIL);
+//                restJson.put("data", "Fail!");
+//                return restJson;
+//            }
+//        };
         String result = authRoa.authToken(mockInstance, mockResInstance);
 
         assertEquals("{\"Information\": \"Fail!\"}", result);
@@ -112,72 +125,73 @@ public class AuthRoaTest {
         MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
         HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
 
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest context) {
-                JSONObject subJsonObject = new JSONObject();
-                return (T)subJsonObject;
-            }
-        };
-        new MockUp<AuthMgr>() {
-
-            @Mock
-            public JSONObject authToken(JSONObject params) {
-                JSONObject restJson = new JSONObject();
-                restJson.put("retCode", Constant.HTTP_INNERERROR);
-                restJson.put("data", "HttpInnerError!");
-                return restJson;
-            }
-        };
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest context) {
+//                JSONObject subJsonObject = new JSONObject();
+//                return (T)subJsonObject;
+//            }
+//        };
+//        new MockUp<AuthMgr>() {
+//
+//            @Mock
+//            public JSONObject authToken(JSONObject params) {
+//                JSONObject restJson = new JSONObject();
+//                restJson.put("retCode", Constant.HTTP_INNERERROR);
+//                restJson.put("data", "HttpInnerError!");
+//                return restJson;
+//            }
+//        };
         String result = authRoa.authToken(mockInstance, mockResInstance);
 
         assertEquals("{\"Information\": \"HttpInnerError!\"}", result);
     }
 
     @Test
-    public void testAuthToken() {
-        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {};
-        HttpServletRequest mockInstance = proxyStub.getMockInstance();
-
-        MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
-        HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest context) {
-                JSONObject subJsonObject = new JSONObject();
-                return (T)subJsonObject;
-            }
-        };
-        new MockUp<AuthMgr>() {
-
-            @Mock
-            public JSONObject authToken(JSONObject params) {
-                JSONObject restJson = new JSONObject();
-                restJson.put("retCode", Constant.REST_SUCCESS);
-                JSONObject data = new JSONObject();
-                data.put("accessSession", "accessSession");
-                data.put("userName", "userName");
-                data.put("roaRand", "roaRand");
-                restJson.put("data", data);
-                return restJson;
-            }
-        };
-        String result = authRoa.authToken(mockInstance, mockResInstance);
+    public void testAuthToken() throws Exception {
+//        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {};
+//        HttpServletRequest mockInstance = proxyStub.getMockInstance();
+//
+//        MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
+//        HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest context) {
+//                JSONObject subJsonObject = new JSONObject();
+//                return (T)subJsonObject;
+//            }
+//        };
+//        new MockUp<AuthMgr>() {
+//
+//            @Mock
+//            public JSONObject authToken(JSONObject params) {
+//                JSONObject restJson = new JSONObject();
+//                restJson.put("retCode", Constant.REST_SUCCESS);
+//                JSONObject data = new JSONObject();
+//                data.put("accessSession", "accessSession");
+//                data.put("userName", "userName");
+//                data.put("roaRand", "roaRand");
+//                restJson.put("data", data);
+//                return restJson;
+//            }
+//        };
+        Mockito.when(context.getInputStream()).thenReturn(servletInputStream);
+        String result = authRoa.authToken(context, resp);
 
         assertNotNull(result);
     }
 
     @Test
     public void testDelAuthToken() {
-        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {};
-
-        MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
-        HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
-        String result = authRoa.delAuthToken(null, null, mockResInstance);
+//        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {};
+//
+//        MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
+//        HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
+        String result = authRoa.delAuthToken(null, null, resp);
 
         JSONObject resultJson = new JSONObject();
         resultJson.put("Information", "Operation success");
@@ -186,15 +200,20 @@ public class AuthRoaTest {
 
     @Test
     public void testShakehand() {
-        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {};
-
-        MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
-        HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
-        String result = authRoa.shakehand(null, mockResInstance);
+        String result = authRoa.shakehand("roattr", resp);
 
         JSONObject resultJson = new JSONObject();
         resultJson.put("status", "running");
         resultJson.put("description", "Operation success");
         assertEquals(resultJson.toString(), result);
     }
+    
+    @Test
+    public void testShakehandOld() {
+        String result = authRoa.shakehandOld("roattr", resp);
+        JSONObject resultJson = new JSONObject();
+        resultJson.put("status", "running");
+        resultJson.put("description", "Operation success");
+        assertEquals(resultJson.toString(), result);
+    }
 }

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoaTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoaTest.java
index 58c584d..db2a394 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoaTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoaTest.java
@@ -37,16 +37,16 @@ public class VnfAdapterResourceRoaTest {
 
     @Test
     public void testGetAllCloudInfo() {
-        new MockUp<AdapterResourceManager>() {
-
-            @Mock
-            public JSONObject getAllCloud(String url, String conntoken) {
-                JSONObject resultObj = new JSONObject();
-                resultObj.put("dn", "test");
-                resultObj.put("vim_id", "12345");
-                return resultObj;
-            }
-        };
+//        new MockUp<AdapterResourceManager>() {
+//
+//            @Mock
+//            public JSONObject getAllCloud(String url, String conntoken) {
+//                JSONObject resultObj = new JSONObject();
+//                resultObj.put("dn", "test");
+//                resultObj.put("vim_id", "12345");
+//                return resultObj;
+//            }
+//        };
 
         VnfAdapterResourceRoa vnfAdapter = new VnfAdapterResourceRoa();
         String result = vnfAdapter.getAllCloudInfo();

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfResourceRoaTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfResourceRoaTest.java
index ddf6e44..50c0626 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfResourceRoaTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfResourceRoaTest.java
@@ -19,26 +19,34 @@ package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.IOException;
+import java.lang.reflect.Method;
 
+import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmJsonUtil;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmUtil;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
 import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
 import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.VnfResourceMgr;
 
-import mockit.Mock;
-import mockit.MockUp;
 import net.sf.json.JSONObject;
-
+@RunWith(MockitoJUnitRunner.class)
 public class VnfResourceRoaTest {
 
     private VnfResourceRoa vnfResourceRoa;
 
     private VnfResourceMgr vnfResourceMgr;
+    
+    @Mock
+    HttpServletRequest context;
+    
+    @Mock
+    ServletInputStream servletInputStream;
 
     @Before
     public void setUp() {
@@ -54,19 +62,9 @@ public class VnfResourceRoaTest {
     }
 
     @Test
-    public void testGrantVnfResByDataObjectNull() {
-        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {};
-        HttpServletRequest mockInstance = proxyStub.getMockInstance();
-        new MockUp<VnfmJsonUtil>() {
-
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest context) {
-                return null;
-            }
-        };
-
-        String result = vnfResourceRoa.grantVnfRes(mockInstance, "vnfId");
-
+    public void testGrantVnfResByDataObjectNull() throws Exception {
+        Mockito.when(context.getInputStream()).thenReturn(servletInputStream);
+        String result = vnfResourceRoa.grantVnfRes(context, "vnfId");
         JSONObject restJson = new JSONObject();
         restJson.put("retCode", Constant.REST_FAIL);
         restJson.put("data", "Params error");
@@ -75,29 +73,29 @@ public class VnfResourceRoaTest {
 
     @Test
     public void testGrantVnfResByGrantObjNull() {
-        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {};
-        HttpServletRequest mockInstance = proxyStub.getMockInstance();
+   //     MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {};
+  //      HttpServletRequest mockInstance = proxyStub.getMockInstance();
         final JSONObject dataObject = new JSONObject();
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest context) {
-                return (T)dataObject;
-            }
-        };
-        new MockUp<JSONObject>() {
-
-            @Mock
-            public JSONObject getJSONObject(String key) {
-                if(key == "grant") {
-                    return null;
-                }
-                return dataObject;
-            }
-        };
-
-        String result = vnfResourceRoa.grantVnfRes(mockInstance, "vnfId");
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest context) {
+//                return (T)dataObject;
+//            }
+//        };
+//        new MockUp<JSONObject>() {
+//
+//            @Mock
+//            public JSONObject getJSONObject(String key) {
+//                if(key == "grant") {
+//                    return null;
+//                }
+//                return dataObject;
+//            }
+//        };
+
+        String result = vnfResourceRoa.grantVnfRes(null, "vnfId");
 
         JSONObject restJson = new JSONObject();
         restJson.put("retCode", Constant.REST_FAIL);
@@ -107,47 +105,47 @@ public class VnfResourceRoaTest {
 
     @Test
     public void testGrantVnfRes() {
-        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {
-
-            @Mock
-            public String getHeader(String name) {
-                return "127.0.0.1";
-            }
-        };
-        HttpServletRequest mockInstance = proxyStub.getMockInstance();
+//        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {
+//
+//            @Mock
+//            public String getHeader(String name) {
+//                return "127.0.0.1";
+//            }
+//        };
+//       HttpServletRequest mockInstance = proxyStub.getMockInstance();
         final JSONObject dataObject = new JSONObject();
         JSONObject grant = new JSONObject();
         grant.put("project_id", "project_id");
         dataObject.put("grant", grant);
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest context) {
-                return (T)dataObject;
-            }
-        };
-        new MockUp<VnfmUtil>() {
-
-            @Mock
-            public String getVnfmIdByIp(String ip) {
-                return "vnfmId";
-            }
-        };
-
-        new MockUp<VnfResourceMgr>() {
-
-            @Mock
-            public JSONObject grantVnfResource(JSONObject vnfObj, String vnfId, String vnfmId) {
-                JSONObject resultJson = new JSONObject();
-                resultJson.put("retCode", Constant.REST_SUCCESS);
-                JSONObject data = new JSONObject();
-                data.put("data", "success");
-                resultJson.put("data", data);
-                return resultJson;
-            }
-        };
-        String result = vnfResourceRoa.grantVnfRes(mockInstance, "vnfId");
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest context) {
+//                return (T)dataObject;
+//            }
+//        };
+//        new MockUp<VnfmUtil>() {
+//
+//            @Mock
+//            public String getVnfmIdByIp(String ip) {
+//                return "vnfmId";
+//            }
+//        };
+//
+//        new MockUp<VnfResourceMgr>() {
+//
+//            @Mock
+//            public JSONObject grantVnfResource(JSONObject vnfObj, String vnfId, String vnfmId) {
+//                JSONObject resultJson = new JSONObject();
+//                resultJson.put("retCode", Constant.REST_SUCCESS);
+//                JSONObject data = new JSONObject();
+//                data.put("data", "success");
+//                resultJson.put("data", data);
+//                return resultJson;
+//            }
+//        };
+        String result = vnfResourceRoa.grantVnfRes(null, "vnfId");
 
         JSONObject restJson = new JSONObject();
         restJson.put("retCode", Constant.REST_SUCCESS);
@@ -159,45 +157,46 @@ public class VnfResourceRoaTest {
 
     @Test
     public void testGrantVnfResByFail() {
-        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {
-
-            @Mock
-            public String getHeader(String name) {
-                return "127.0.0.1";
-            }
-        };
-        HttpServletRequest mockInstance = proxyStub.getMockInstance();
+//        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {
+//
+//            @Mock
+//            public String getHeader(String name) {
+//                return "127.0.0.1";
+//            }
+//        };
+ //       HttpServletRequest mockInstance = proxyStub.getMockInstance();
         final JSONObject dataObject = new JSONObject();
         JSONObject grant = new JSONObject();
         grant.put("project_id", "project_id");
         dataObject.put("grant", grant);
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest context) {
-                return (T)dataObject;
-            }
-        };
-        new MockUp<VnfmUtil>() {
-
-            @Mock
-            public String getVnfmIdByIp(String ip) {
-                return "vnfmId";
-            }
-        };
-
-        new MockUp<VnfResourceMgr>() {
-
-            @Mock
-            public JSONObject grantVnfResource(JSONObject vnfObj, String vnfId, String vnfmId) {
-                JSONObject resultJson = new JSONObject();
-                resultJson.put("retCode", Constant.REST_FAIL);
-                resultJson.put("data", "Fail!");
-                return resultJson;
-            }
-        };
-        String result = vnfResourceRoa.grantVnfRes(mockInstance, "vnfId");
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest context) {
+//                return (T)dataObject;
+//            }
+//        };
+//        new MockUp<VnfmUtil>() {
+//
+//            @Mock
+//            public String getVnfmIdByIp(String ip) {
+//                return "vnfmId";
+//            }
+//        };
+//
+//        new MockUp<VnfResourceMgr>() {
+//
+//            @Mock
+//            public JSONObject grantVnfResource(JSONObject vnfObj, String vnfId, String vnfmId) {
+//                JSONObject resultJson = new JSONObject();
+//                resultJson.put("retCode", Constant.REST_FAIL);
+//                resultJson.put("data", "Fail!");
+//                return resultJson;
+//            }
+//        };
+
+        String result = vnfResourceRoa.grantVnfRes(null, "vnfId");
 
         JSONObject restJson = new JSONObject();
         restJson.put("retCode", Constant.REST_FAIL);
@@ -207,44 +206,37 @@ public class VnfResourceRoaTest {
 
     @Test
     public void testGrantVnfResByDataNull() {
-        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {
-
-            @Mock
-            public String getHeader(String name) {
-                return "127.0.0.1";
-            }
-        };
-        HttpServletRequest mockInstance = proxyStub.getMockInstance();
+        //HttpServletRequest mockInstance = proxyStub.getMockInstance();
         final JSONObject dataObject = new JSONObject();
         JSONObject grant = new JSONObject();
         grant.put("project_id", "project_id");
         dataObject.put("grant", grant);
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest context) {
-                return (T)dataObject;
-            }
-        };
-        new MockUp<VnfmUtil>() {
-
-            @Mock
-            public String getVnfmIdByIp(String ip) {
-                return "vnfmId";
-            }
-        };
-
-        new MockUp<VnfResourceMgr>() {
-
-            @Mock
-            public JSONObject grantVnfResource(JSONObject vnfObj, String vnfId, String vnfmId) {
-                JSONObject resultJson = new JSONObject();
-                resultJson.put("retCode", Constant.REST_FAIL);
-                return resultJson;
-            }
-        };
-        String result = vnfResourceRoa.grantVnfRes(mockInstance, "vnfId");
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest context) {
+//                return (T)dataObject;
+//            }
+//        };
+//        new MockUp<VnfmUtil>() {
+//
+//            @Mock
+//            public String getVnfmIdByIp(String ip) {
+//                return "vnfmId";
+//            }
+//        };
+//
+//        new MockUp<VnfResourceMgr>() {
+//
+//            @Mock
+//            public JSONObject grantVnfResource(JSONObject vnfObj, String vnfId, String vnfmId) {
+//                JSONObject resultJson = new JSONObject();
+//                resultJson.put("retCode", Constant.REST_FAIL);
+//                return resultJson;
+//            }
+//        };
+        String result = vnfResourceRoa.grantVnfRes(null, "vnfId");
 
         JSONObject restJson = new JSONObject();
         restJson.put("retCode", Constant.REST_FAIL);
@@ -253,18 +245,31 @@ public class VnfResourceRoaTest {
 
     @Test
     public void testNotify() throws IOException {
-        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {
-
-            @Mock
-            public String getHeader(String name) {
-                return "127.0.0.1";
-            }
-        };
-        HttpServletRequest mockInstance = proxyStub.getMockInstance();
-        String result = vnfResourceRoa.notify(mockInstance);
+//        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {
+//
+//            @Mock
+//            public String getHeader(String name) {
+//                return "127.0.0.1";
+//            }
+//        };
+//       HttpServletRequest mockInstance = proxyStub.getMockInstance();
+       
+       Mockito.when(context.getInputStream()).thenReturn(servletInputStream);
+       String result = vnfResourceRoa.notify(context);
 
         JSONObject restJson = new JSONObject();
         restJson.put(Constant.RETCODE, Constant.REST_SUCCESS);
         assertNotNull(result);
     }
+    
+    
+    @Test
+    public void callLcmNotify() throws Exception{
+       VnfResourceRoa vnfRoa = new VnfResourceRoa();
+       JSONObject json = new JSONObject();
+       Method m = VnfResourceRoa.class.getDeclaredMethod("callLcmNotify", new Class[] {JSONObject.class});
+       m.setAccessible(true);
+       m.invoke(vnfRoa, json);
+       
+    }
 }

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoaTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoaTest.java
index b13b409..d98ef42 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoaTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoaTest.java
@@ -20,29 +20,44 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.IOException;
+import java.lang.reflect.Method;
 
+import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmJsonUtil;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmUtil;
+import org.junit.runner.RunWith;
+import org.mockito.Matchers;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
 import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.restclient.ServiceException;
 import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant;
 import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.VnfMgr;
 
-import mockit.Mock;
 import mockit.MockUp;
-import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
-
+@RunWith(MockitoJUnitRunner.class)
 public class VnfRoaTest {
 
     private VnfRoa vnfRoa;
 
     private VnfMgr vnfMgr;
+    
+    @Mock
+    HttpServletRequest context;
+    
+    @Mock
+    HttpServletResponse resp;
+    
+    @Mock
+    ServletInputStream servletInputStream;
+    
+    @Mock
+    VnfMgr vnfMgr1;
 
     @Before
     public void setUp() {
@@ -58,36 +73,35 @@ public class VnfRoaTest {
     }
 
     @Test
-    public void testAddVnf() throws ServiceException {
+    public void testAddVnf() throws ServiceException, IOException {
         final JSONObject restJson = new JSONObject();
         restJson.put("retCode", Constant.REST_SUCCESS);
-        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {};
-        HttpServletRequest mockInstance = proxyStub.getMockInstance();
-
-        MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
-        HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
-
-        new MockUp<VnfMgr>() {
-
-            @Mock
-            public JSONObject addVnf(JSONObject subJsonObject, String vnfmId) {
-                JSONObject retJson = new JSONObject();
-                retJson.put("id", "123");
-                restJson.put("data", retJson);
-                return restJson;
-            }
-        };
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
-                return (T)restJson;
-            }
-        };
-
-        String result = vnfRoa.addVnf(mockInstance, mockResInstance, "vnfmId");
-
+//        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {};
+//        HttpServletRequest mockInstance = proxyStub.getMockInstance();
+//
+//        MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
+//        HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
+
+//        new MockUp<VnfMgr>() {
+//
+//            @Mock
+//            public JSONObject addVnf(JSONObject subJsonObject, String vnfmId) {
+//                JSONObject retJson = new JSONObject();
+//                retJson.put("id", "123");
+//                restJson.put("data", retJson);
+//                return restJson;
+//            }
+//        };
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
+//                return (T)restJson;
+//            }
+//        };
+        Mockito.when(context.getInputStream()).thenReturn(servletInputStream);
+        String result = vnfRoa.addVnf(context, resp, "vnfmId");
         JSONObject retJson = new JSONObject();
         retJson.put("id", "123");
         assertEquals(retJson.toString(), result);
@@ -104,21 +118,21 @@ public class VnfRoaTest {
         MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
         HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
 
-        new MockUp<VnfMgr>() {
-
-            @Mock
-            public JSONObject addVnf(JSONObject subJsonObject, String vnfmId) {
-                return restJson;
-            }
-        };
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
-                return (T)restJson;
-            }
-        };
+//        new MockUp<VnfMgr>() {
+//
+//            @Mock
+//            public JSONObject addVnf(JSONObject subJsonObject, String vnfmId) {
+//                return restJson;
+//            }
+//        };
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
+//                return (T)restJson;
+//            }
+//        };
 
         String result = vnfRoa.addVnf(mockInstance, mockResInstance, "vnfmId");
 
@@ -135,13 +149,13 @@ public class VnfRoaTest {
         MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
         HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
 
-        new MockUp<VnfmJsonUtil>() {
-
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest context) {
-                return null;
-            }
-        };
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest context) {
+//                return null;
+//            }
+//        };
 
         String result = vnfRoa.addVnf(mockInstance, mockResInstance, "vnfmId");
 
@@ -150,36 +164,36 @@ public class VnfRoaTest {
     }
 
     @Test
-    public void testDelVnf() throws ServiceException {
+    public void testDelVnf() throws ServiceException, IOException {
         final JSONObject restJson = new JSONObject();
         restJson.put("retCode", Constant.REST_SUCCESS);
-        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {};
-        HttpServletRequest mockInstance = proxyStub.getMockInstance();
-
-        MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
-        HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
-
-        new MockUp<VnfMgr>() {
-
-            @Mock
-            public JSONObject deleteVnf(String vnfId, String vnfmId, JSONObject vnfObject) {
-                JSONObject retJson = new JSONObject();
-                retJson.put("id", "123");
-                restJson.put("data", retJson);
-                return restJson;
-            }
-        };
-
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
-                return (T)restJson;
-            }
-        };
-
-        String result = vnfRoa.delVnf("vnfmId", mockResInstance, "vnfId", mockInstance);
+//        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {};
+//        HttpServletRequest mockInstance = proxyStub.getMockInstance();
+//
+//        MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
+//        HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
+
+//        new MockUp<VnfMgr>() {
+//
+//            @Mock
+//            public JSONObject deleteVnf(String vnfId, String vnfmId, JSONObject vnfObject) {
+//                JSONObject retJson = new JSONObject();
+//                retJson.put("id", "123");
+//                restJson.put("data", retJson);
+//                return restJson;
+//            }
+//        };
+
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
+//                return (T)restJson;
+//            }
+//        };
+        Mockito.when(context.getInputStream()).thenReturn(servletInputStream);
+        String result = vnfRoa.delVnf("vnfmId", resp, "vnfId", context);
         JSONObject retJson = new JSONObject();
         retJson.put("id", "123");
         assertEquals(retJson.toString(), result);
@@ -194,14 +208,14 @@ public class VnfRoaTest {
         MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
         HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
 
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
-                return (T)restJson;
-            }
-        };
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
+//                return (T)restJson;
+//            }
+//        };
 
         String result = vnfRoa.delVnf("vnfmId", mockResInstance, "", mockInstance);
 
@@ -217,14 +231,14 @@ public class VnfRoaTest {
         MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
         HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
 
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
-                return (T)restJson;
-            }
-        };
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
+//                return (T)restJson;
+//            }
+//        };
 
         String result = vnfRoa.delVnf("", mockResInstance, "vnfId", mockInstance);
 
@@ -240,14 +254,14 @@ public class VnfRoaTest {
         MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
         HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
 
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
-                return (T)restJson;
-            }
-        };
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
+//                return (T)restJson;
+//            }
+//        };
 
         String result = vnfRoa.delVnf("", mockResInstance, "", mockInstance);
 
@@ -264,22 +278,22 @@ public class VnfRoaTest {
         MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
         HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
 
-        new MockUp<VnfMgr>() {
-
-            @Mock
-            public JSONObject deleteVnf(String vnfId, String vnfmId, JSONObject vnfObject) {
-                return restJson;
-            }
-        };
-
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
-                return (T)restJson;
-            }
-        };
+//        new MockUp<VnfMgr>() {
+//
+//            @Mock
+//            public JSONObject deleteVnf(String vnfId, String vnfmId, JSONObject vnfObject) {
+//                return restJson;
+//            }
+//        };
+//
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
+//                return (T)restJson;
+//            }
+//        };
 
         String result = vnfRoa.delVnf("vnfmId", mockResInstance, "vnfId", mockInstance);
         assertEquals(restJson.toString(), result);
@@ -294,14 +308,14 @@ public class VnfRoaTest {
         MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
         HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
 
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
-                return (T)restJson;
-            }
-        };
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
+//                return (T)restJson;
+//            }
+//        };
 
         String result = vnfRoa.getVnf("vnfmId", mockResInstance, "");
 
@@ -317,14 +331,14 @@ public class VnfRoaTest {
         MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
         HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
 
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
-                return (T)restJson;
-            }
-        };
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
+//                return (T)restJson;
+//            }
+//        };
 
         String result = vnfRoa.getVnf("", mockResInstance, "vnfId");
 
@@ -341,22 +355,22 @@ public class VnfRoaTest {
         MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
         HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
 
-        new MockUp<VnfMgr>() {
-
-            @Mock
-            public JSONObject getVnf(String vnfId, String vnfmId) {
-                return restJson;
-            }
-        };
-
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
-                return (T)restJson;
-            }
-        };
+//        new MockUp<VnfMgr>() {
+//
+//            @Mock
+//            public JSONObject getVnf(String vnfId, String vnfmId) {
+//                return restJson;
+//            }
+//        };
+//
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
+//                return (T)restJson;
+//            }
+//        };
 
         String result = vnfRoa.getVnf("vnfmId", mockResInstance, "vnfId");
         assertEquals(restJson.toString(), result);
@@ -372,35 +386,35 @@ public class VnfRoaTest {
         MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
         HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
 
-        new MockUp<VnfMgr>() {
-
-            @Mock
-            public JSONObject getVnf(String vnfId, String vnfmId) {
-                JSONObject retJson = new JSONObject();
-                JSONObject basicInfoJson = new JSONObject();
-                basicInfoJson.put("vnfInstanceId", "123");
-                basicInfoJson.put("vnfInstanceName", "1");
-                basicInfoJson.put("vnfInstanceDescription", "vFW");
-                basicInfoJson.put("vnfdId", "1");
-                basicInfoJson.put("vnfdPackageId", "vFW");
-                basicInfoJson.put("version", "vFW");
-                basicInfoJson.put("vnfProvider", "hw");
-                basicInfoJson.put("vnfType", "fw");
-                basicInfoJson.put("vnfStatus", "active");
-                retJson.put("vnfInfo", basicInfoJson);
-                retJson.put(Constant.RETCODE, Constant.REST_SUCCESS);
-                return retJson;
-            }
-        };
-
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
-                return (T)restJson;
-            }
-        };
+//        new MockUp<VnfMgr>() {
+//
+//            @Mock
+//            public JSONObject getVnf(String vnfId, String vnfmId) {
+//                JSONObject retJson = new JSONObject();
+//                JSONObject basicInfoJson = new JSONObject();
+//                basicInfoJson.put("vnfInstanceId", "123");
+//                basicInfoJson.put("vnfInstanceName", "1");
+//                basicInfoJson.put("vnfInstanceDescription", "vFW");
+//                basicInfoJson.put("vnfdId", "1");
+//                basicInfoJson.put("vnfdPackageId", "vFW");
+//                basicInfoJson.put("version", "vFW");
+//                basicInfoJson.put("vnfProvider", "hw");
+//                basicInfoJson.put("vnfType", "fw");
+//                basicInfoJson.put("vnfStatus", "active");
+//                retJson.put("vnfInfo", basicInfoJson);
+//                retJson.put(Constant.RETCODE, Constant.REST_SUCCESS);
+//                return retJson;
+//            }
+//        };
+
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
+//                return (T)restJson;
+//            }
+//        };
 
         String result = vnfRoa.getVnf("vnfmId", mockResInstance, "vnfId");
         JSONObject basicInfoJson = new JSONObject();
@@ -440,105 +454,107 @@ public class VnfRoaTest {
     public void testGetJobByVnfMgrFail() throws ServiceException {
         MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
         HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
-        new MockUp<VnfMgr>() {
-
-            @Mock
-            public JSONObject getJob(String jobId, String vnfmId) {
-                JSONObject restJson = new JSONObject();
-                restJson.put(Constant.RETCODE, Constant.REST_FAIL);
-                return restJson;
-            }
-        };
+//        new MockUp<VnfMgr>() {
+//
+//            @Mock
+//            public JSONObject getJob(String jobId, String vnfmId) {
+//                JSONObject restJson = new JSONObject();
+//                restJson.put(Constant.RETCODE, Constant.REST_FAIL);
+//                return restJson;
+//            }
+//        };
         String result = vnfRoa.getJob("123", "1234", mockResInstance, "1111");
         assertEquals("{\"retCode\":-1}", result);
     }
 
     @Test
     public void testGetJob() throws ServiceException {
-        new MockUp<VnfMgr>() {
-
-            @Mock
-            public JSONObject getJob(String jobId, String vnfmId) {
-                JSONObject restJson = new JSONObject();
-                JSONArray data = new JSONArray();
-                JSONObject obj = new JSONObject();
-                obj.put("id", "11111");
-                obj.put("status", "Active");
-                data.add(obj);
-                restJson.put(Constant.RETCODE, Constant.REST_SUCCESS);
-                restJson.put("data", data);
-                return restJson;
-            }
-        };
+//        new MockUp<VnfMgr>() {
+//
+//            @Mock
+//            public JSONObject getJob(String jobId, String vnfmId) {
+//                JSONObject restJson = new JSONObject();
+//                JSONArray data = new JSONArray();
+//                JSONObject obj = new JSONObject();
+//                obj.put("id", "11111");
+//                obj.put("status", "Active");
+//                data.add(obj);
+//                restJson.put(Constant.RETCODE, Constant.REST_SUCCESS);
+//                restJson.put("data", data);
+//                return restJson;
+//            }
+//        };
 
         String result = vnfRoa.getJob("123", "1234", null, "1111");
         assertNotNull(result);
     }
 
     @Test
-    public void testHealVnf() throws ServiceException {
+    public void testHealVnf() throws ServiceException, IOException {
         final JSONObject restJson = new JSONObject();
         restJson.put("retCode", Constant.REST_SUCCESS);
-        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {};
-        HttpServletRequest mockInstance = proxyStub.getMockInstance();
-
-        MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
-        HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
-
-        new MockUp<VnfMgr>() {
-
-            @Mock
-            public JSONObject healVnf(JSONObject jsonObject, String vnfInstanceId, String vnfmId)  {
-                JSONObject retJson = new JSONObject();
-                retJson.put("id", "123");
-                restJson.put("data", retJson);
-                return restJson;
-            }
-        };
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
-                return (T)restJson;
-            }
-        };
-
-        String result = vnfRoa.healVnf(mockInstance, mockResInstance, "id", "id");
+//        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {};
+//        HttpServletRequest mockInstance = proxyStub.getMockInstance();
+//
+//        MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
+//        HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
+
+//        new MockUp<VnfMgr>() {
+//
+//            @Mock
+//            public JSONObject healVnf(JSONObject jsonObject, String vnfInstanceId, String vnfmId)  {
+//                JSONObject retJson = new JSONObject();
+//                retJson.put("id", "123");
+//                restJson.put("data", retJson);
+//                return restJson;
+//            }
+//        };
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
+//                return (T)restJson;
+//            }
+//        };
+        Mockito.when(context.getInputStream()).thenReturn(servletInputStream);
+
+        String result = vnfRoa.healVnf(context, resp, "id", "id");
         assertNotNull(result);
 
     }
 
     @Test
-    public void testScaleVnf() throws ServiceException {
+    public void testScaleVnf() throws ServiceException, IOException {
         final JSONObject restJson = new JSONObject();
         restJson.put("retCode", Constant.REST_SUCCESS);
-        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {};
-        HttpServletRequest mockInstance = proxyStub.getMockInstance();
-
-        MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
-        HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
-
-        new MockUp<VnfMgr>() {
-
-            @Mock
-            public JSONObject scaleVNF(JSONObject vnfObject, String vnfmId, String vnfInstanceId) {
-                JSONObject retJson = new JSONObject();
-                retJson.put("id", "123");
-                restJson.put("data", retJson);
-                return restJson;
-            }
-        };
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
-                return (T)restJson;
-            }
-        };
-
-        String result = vnfRoa.scaleVnf(mockInstance, mockResInstance, "id", "id");
+//        MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {};
+//        HttpServletRequest mockInstance = proxyStub.getMockInstance();
+//
+//        MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
+//        HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
+
+//        new MockUp<VnfMgr>() {
+//
+//            @Mock
+//            public JSONObject scaleVNF(JSONObject vnfObject, String vnfmId, String vnfInstanceId) {
+//                JSONObject retJson = new JSONObject();
+//                retJson.put("id", "123");
+//                restJson.put("data", retJson);
+//                return restJson;
+//            }
+//        };
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
+//                return (T)restJson;
+//            }
+//        };
+
+        Mockito.when(context.getInputStream()).thenReturn(servletInputStream);
+        String result = vnfRoa.scaleVnf(context, resp, "id", "id");
 
         JSONObject retJson = new JSONObject();
         retJson.put("id", "123");
@@ -556,24 +572,24 @@ public class VnfRoaTest {
         MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
         HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
 
-        new MockUp<VnfMgr>() {
-
-            @Mock
-            public JSONObject scaleVNF(JSONObject vnfObject, String vnfmId, String vnfInstanceId) {
-                JSONObject retJson = new JSONObject();
-                retJson.put("id", "123");
-                restJson.put("data", retJson);
-                return restJson;
-            }
-        };
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
-                return (T)restJson;
-            }
-        };
+//        new MockUp<VnfMgr>() {
+//
+//            @Mock
+//            public JSONObject scaleVNF(JSONObject vnfObject, String vnfmId, String vnfInstanceId) {
+//                JSONObject retJson = new JSONObject();
+//                retJson.put("id", "123");
+//                restJson.put("data", retJson);
+//                return restJson;
+//            }
+//        };
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
+//                return (T)restJson;
+//            }
+//        };
         String result = vnfRoa.scaleVnf(mockInstance, mockResInstance, "id", "id");
 
         assertEquals(restJson.toString(), result);
@@ -590,24 +606,24 @@ public class VnfRoaTest {
         MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
         HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
 
-        new MockUp<VnfMgr>() {
-
-            @Mock
-            public JSONObject scaleVNF(JSONObject vnfObject, String vnfmId, String vnfInstanceId) {
-                JSONObject retJson = new JSONObject();
-                retJson.put("id", "123");
-                restJson.put("data", retJson);
-                return restJson;
-            }
-        };
-        new MockUp<VnfmJsonUtil>() {
-
-            @SuppressWarnings("unchecked")
-            @Mock
-            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
-                return null;
-            }
-        };
+//        new MockUp<VnfMgr>() {
+//
+//            @Mock
+//            public JSONObject scaleVNF(JSONObject vnfObject, String vnfmId, String vnfInstanceId) {
+//                JSONObject retJson = new JSONObject();
+//                retJson.put("id", "123");
+//                restJson.put("data", retJson);
+//                return restJson;
+//            }
+//        };
+//        new MockUp<VnfmJsonUtil>() {
+//
+//            @SuppressWarnings("unchecked")
+//            @Mock
+//            public <T> T getJsonFromContexts(HttpServletRequest VNFreq) {
+//                return null;
+//            }
+//        };
         String result = vnfRoa.scaleVnf(mockInstance, mockResInstance, "id", "id");
 
         assertNotNull(result);
@@ -616,35 +632,35 @@ public class VnfRoaTest {
 
     @Test
     public void testGetVnfmById() throws ServiceException {
-        new MockUp<VnfmUtil>() {
-
-            @Mock
-            public JSONObject getVnfmById(String vnfmId) {
-                JSONObject json = new JSONObject();
-                json.put("vnfm", "1234");
-                return json;
-            }
-        };
+//        new MockUp<VnfmUtil>() {
+//
+//            @Mock
+//            public JSONObject getVnfmById(String vnfmId) {
+//                JSONObject json = new JSONObject();
+//                json.put("vnfm", "1234");
+//                return json;
+//            }
+//        };
         String result = vnfRoa.getVnfmById("1234", null);
         assertNotNull(result);
     }
 
     @Test
     public void testGetJobFromVnfm() throws ServiceException {
-        new MockUp<VnfMgr>() {
-
-            @Mock
-            public JSONObject getJobFromVnfm(String jobId, String vnfmId) {
-                JSONObject json = new JSONObject();
-                json.put("retCode", "1");
-                return json;
-            }
-
-            @Mock
-            public String transferToLcm(JSONObject restJson) {
-                return "success";
-            }
-        };
+//        new MockUp<VnfMgr>() {
+//
+//            @Mock
+//            public JSONObject getJobFromVnfm(String jobId, String vnfmId) {
+//                JSONObject json = new JSONObject();
+//                json.put("retCode", "1");
+//                return json;
+//            }
+//
+//            @Mock
+//            public String transferToLcm(JSONObject restJson) {
+//                return "success";
+//            }
+//        };
         String result = vnfRoa.getJobFromVnfm("jobId", "vnfmId", null, "responseId");
         assertNotNull(result);
     }
@@ -652,20 +668,46 @@ public class VnfRoaTest {
     @Test
     public void testGetJobFromVnfmFail() throws ServiceException {
 
-        new MockUp<VnfMgr>() {
-
-            @Mock
-            public JSONObject getJobFromVnfm(String jobId, String vnfmId) {
-                JSONObject json = new JSONObject();
-                json.put("retCode", "-1");
-                return json;
-            }
-
-        };
+//        new MockUp<VnfMgr>() {
+//
+//            @Mock
+//            public JSONObject getJobFromVnfm(String jobId, String vnfmId) {
+//                JSONObject json = new JSONObject();
+//                json.put("retCode", "-1");
+//                return json;
+//            }
+//
+//        };
         MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
         HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
         String result = vnfRoa.getJobFromVnfm("jobId", "vnfmId", mockResInstance, "responseId");
         assertNotNull(result);
     }
+ 
+    @Test
+    public void getHealJobBody() throws Exception {
+       VnfRoa vnfRoa = new  VnfRoa();
+       Method m = VnfRoa.class.getDeclaredMethod("getHealJobBody",new Class[] {String.class});
+        m.setAccessible(true);
+        assertNotNull(m.invoke(vnfRoa, "jobId"));
+    }
 
+    @Test
+    public void getJobBody() throws Exception {
+       JSONObject restJson = new JSONObject();
+       JSONObject data = new JSONObject();
+       data.put(Constant.STATUS, Constant.STATUS);
+       restJson.put("data", new JSONObject[] {data});
+       VnfRoa vnfRoa = new  VnfRoa();
+       Method m = VnfRoa.class.getDeclaredMethod("getJobBody",new Class[] {JSONObject.class,String.class});
+        m.setAccessible(true);
+        assertNotNull(m.invoke(vnfRoa, restJson,"jobId"));
+    }
+    
+   @Test
+   public void getVms() {
+          VnfRoa vnfRoa = new  VnfRoa();
+          Mockito.when(vnfMgr1.getVmsFromVnfm(Matchers.anyString(), Matchers.any())).thenReturn(new JSONObject());
+          vnfRoa.getVms("Vmf", resp);
+   }
 }