Merge changes Iea50cfc7,I1f200234,I4c23872b,I45412480

* changes:
  Code coverage should be at least 55% Issue-ID: VFC-1726
  Code coverage should be at least 55% Issue-ID: VFC-1726
  Code coverage should be at least 55% Issue-ID: VFC-1726
  Code coverage should be at least 55% Issue-ID: VFC-1726

4 files changed, 324 insertions, 10 deletions

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/TestConstant.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/TestConstant.java
index 7780c648..2b40315e 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/TestConstant.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/TestConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Huawei Technologies Co., Ltd.
+ * Copyright 2020 Huawei Technologies Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,25 +17,141 @@ package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant;
 
 import junit.framework.Assert;
 import org.junit.Test;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.ParamConstants;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.UrlConstant;
 
 import static org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant.AUTHLIST;
 
 import java.util.List;
 
-/**
- * Created by QuanZhong on 2017/3/17.
- */
 public class TestConstant {
     @Test
     public void testCreate(){
         List<String> authlist = AUTHLIST;
         authlist.contains("abc");
-        String url = UrlConstant.PORT_COMMON;
-        authlist.contains(url);
-        String abc = ParamConstants.CONNECTMGR_CONNECT;
-        authlist.contains(abc);
+        String post = Constant.POST;
+        authlist.contains(post);
+        String put = Constant.PUT;
+        authlist.contains(put);
+        String delete = Constant.DELETE;
+        authlist.contains(delete);
+        String get = Constant.GET;
+        authlist.contains(get);
+        String asyncpost = Constant.ASYNCPOST;
+        authlist.contains(asyncpost);
+        String asyncget = Constant.ASYNCGET;
+        authlist.contains(asyncget);
+        String asyncput = Constant.ASYNCPUT;
+        authlist.contains(asyncput);
+        String asyncdelete = Constant.ASYNCDELETE;
+        authlist.contains(asyncdelete);
+        String https = Constant.HTTPS;
+        authlist.contains(https);
+        String encodeing = Constant.ENCODEING;
+        authlist.contains(encodeing);
+        String cookie = Constant.COOKIE;
+        authlist.contains(cookie);
+        String accesssession = Constant.ACCESSSESSION;
+        authlist.contains(accesssession);
+        String contentType = Constant.CONTENT_TYPE;
+        authlist.contains(contentType);
+        String application = Constant.APPLICATION;
+        authlist.contains(application);
+        String headerSubjectToken = Constant.HEADER_SUBJECT_TOKEN;
+        authlist.contains(headerSubjectToken);
+        String headerAuthToken = Constant.HEADER_AUTH_TOKEN;
+        authlist.contains(headerAuthToken);
+        String xAuthToken = Constant.X_AUTH_TOKEN;
+        authlist.contains(xAuthToken);
+        String downloadcsarSuccess = Constant.DOWNLOADCSAR_SUCCESS;
+        authlist.contains(downloadcsarSuccess);
+        int unzipSuccess = Constant.UNZIP_SUCCESS;
+        authlist.contains(unzipSuccess);
+        int unzipFail  = Constant.UNZIP_FAIL;
+        authlist.contains(unzipFail);
+        String downloadcsarFail = Constant.DOWNLOADCSAR_FAIL;
+        authlist.contains(downloadcsarFail);
+        int httpOk = Constant.HTTP_OK;
+        authlist.contains(httpOk);
+        int httpCreated = Constant.HTTP_CREATED;
+        authlist.contains(httpCreated);
+        int httpAccepted = Constant.HTTP_ACCEPTED;
+        authlist.contains(httpAccepted);
+        int httpNocontent = Constant.HTTP_NOCONTENT;
+        authlist.contains(httpNocontent);
+        int httpBadRequest = Constant.HTTP_BAD_REQUEST;
+        authlist.contains(httpBadRequest);
+        int httpUnauthorized = Constant.HTTP_UNAUTHORIZED;
+        authlist.contains(httpUnauthorized);
+        int httpNotfound  = Constant.HTTP_NOTFOUND;
+        authlist.contains(httpNotfound);
+        int httpNotAcceptable = Constant.HTTP_NOT_ACCEPTABLE;
+        authlist.contains(httpNotAcceptable);
+        int httpConflict = Constant.HTTP_CONFLICT;
+        authlist.contains(httpConflict);
+        int httpInvalidParameters = Constant.HTTP_INVALID_PARAMETERS;
+        authlist.contains(httpInvalidParameters);
+        int httpInnererror = Constant.HTTP_INNERERROR;
+        authlist.contains(httpInnererror);
+        int internalException = Constant.INTERNAL_EXCEPTION;
+        authlist.contains(internalException);
+        int repeatRegTime = Constant.REPEAT_REG_TIME;
+        authlist.contains(repeatRegTime);
+        int minPwdLength = Constant.MIN_PWD_LENGTH;
+        authlist.contains(minPwdLength);
+        int maxPwdLength = Constant.MAX_PWD_LENGTH;
+        authlist.contains(maxPwdLength);
+        int minUrlLength = Constant.MIN_URL_LENGTH;
+        authlist.contains(minUrlLength);
+        int maxVnfmNameLength = Constant.MAX_VNFM_NAME_LENGTH;
+        authlist.contains(maxVnfmNameLength);
+        int minVnfmNameLength = Constant.MIN_VNFM_NAME_LENGTH;
+        authlist.contains(maxVnfmNameLength);
+        int maxUrlLength = Constant.MAX_URL_LENGTH;
+        authlist.contains(maxUrlLength);
+        int restSuccess = Constant.REST_SUCCESS;
+        authlist.contains(restSuccess);
+        int defaultCollectionSize = Constant.DEFAULT_COLLECTION_SIZE;
+        authlist.contains(defaultCollectionSize);
+        int restFail = Constant.REST_FAIL;
+        authlist.contains(restFail);
+        String roarand = Constant.ROARAND;
+        authlist.contains(roarand);
+        String anonymous = Constant.ANONYMOUS;
+        authlist.contains(anonymous);
+        String certificate = Constant.CERTIFICATE;
+        authlist.contains(certificate);
+        String retcode = Constant.RETCODE;
+        authlist.contains(retcode);
+        String reason = Constant.REASON;
+        authlist.contains(reason);
+        String status = Constant.STATUS;
+        authlist.contains(status);
+        String vnfpkginfo = Constant.VNFPKGINFO;
+        authlist.contains(vnfpkginfo);
+        int errorStatusCode = Constant.ERROR_STATUS_CODE;
+        authlist.contains(errorStatusCode);
+        String colon = Constant.COLON;
+        authlist.contains(colon);
+        String errormsg = Constant.ERRORMSG;
+        authlist.contains(errormsg);
+        String vimid = Constant.VIMID;
+        authlist.contains(vimid);
+        String vnfmid = Constant.VNFMID;
+        authlist.contains(vnfmid);
+        String action = Constant.ACTION;
+        authlist.contains(action);
+        String vnfdid = Constant.VNFDID;
+        authlist.contains(vnfdid);
+        String jobid = Constant.JOBID;
+        authlist.contains(jobid);
+        String fileSeparator = Constant.FILE_SEPARATOR;
+        authlist.contains(fileSeparator);
+        String password = Constant.PASSWORD;
+        authlist.contains(password);
+        String username = Constant.USERNAME;
+        authlist.contains(username);
+        String localHost = Constant.LOCAL_HOST;
+        authlist.contains(localHost);
+
         Assert.assertTrue(true);
     }
 }
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/TestParamConstants.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/TestParamConstants.java
new file mode 100644
index 00000000..f312cdbe
--- /dev/null
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/TestParamConstants.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2020 Huawei Technologies Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant;
+
+import junit.framework.Assert;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant.AUTHLIST;
+
+public class TestParamConstants {
+    @Test
+    public void testCreate(){
+        List<String> authlist = AUTHLIST;
+        authlist.contains("abc");
+        String abc = ParamConstants.CONNECTMGR_CONNECT;
+        authlist.contains(abc);
+        String getTokensV2 = ParamConstants.GET_TOKENS_V2;
+        authlist.contains(getTokensV2);
+        String getTokensV3 = ParamConstants.GET_TOKENS_V3;
+        authlist.contains(getTokensV3);
+        String getTokenSucResp = ParamConstants.GET_TOKEN_SUC_RESP;
+        authlist.contains(getTokenSucResp);
+        String getTokenFailResp = ParamConstants.GET_TOKEN_FAIL_RESP;
+        authlist.contains(getTokenFailResp);
+        String rest3rdConnection = ParamConstants.REST_3RD_CONNECTION;
+        authlist.contains(rest3rdConnection);
+        String rest3rdDisconnect = ParamConstants.REST_3RD_DISCONNECT;
+        authlist.contains(rest3rdDisconnect);
+        String rest3rdHandshake= ParamConstants.REST_3RD_HANDSHAKE;
+        authlist.contains(rest3rdHandshake);
+        String csmAuthConnectSouth= ParamConstants.CSM_AUTH_CONNECT_SOUTH;
+        authlist.contains(csmAuthConnectSouth);
+        String csmAuthConnectSouthDisconnect = ParamConstants.CSM_AUTH_CONNECT_SOUTH_DISCONNECT;
+        authlist.contains(csmAuthConnectSouthDisconnect);
+        String csmAuthConnect = ParamConstants.CSM_AUTH_CONNECT;
+        authlist.contains(csmAuthConnect);
+        String csmAuthDisconnect = ParamConstants.CSM_AUTH_DISCONNECT;
+        authlist.contains(csmAuthDisconnect);
+        String csmAuthHandshake  = ParamConstants.CSM_AUTH_HANDSHAKE;
+        authlist.contains(csmAuthHandshake);
+        String vnfmmed = ParamConstants.VNFMMED;
+        authlist.contains(vnfmmed);
+        String connectmgrConnect = ParamConstants.CONNECTMGR_CONNECT;
+        authlist.contains(connectmgrConnect);
+        String connectmgrDisconnect = ParamConstants.CONNECTMGR_DISCONNECT;
+        authlist.contains(connectmgrDisconnect);
+        String connectmgrHandshake = ParamConstants.CONNECTMGR_HANDSHAKE;
+        authlist.contains(connectmgrHandshake);
+        String createVnfPerf = ParamConstants.CREATE_VNF_PERF;
+        authlist.contains(createVnfPerf);
+        String vnfmgrInstance = ParamConstants.VNFMGR_INSTANCE;
+        authlist.contains(vnfmgrInstance);
+        String vnfdFlavor = ParamConstants.VNFD_FLAVOR;
+        authlist.contains(vnfdFlavor);
+        String updateResource = ParamConstants.UPDATE_RESOURCE;
+        authlist.contains(updateResource);
+        String vnfQuery = ParamConstants.VNF_QUERY;
+        authlist.contains(vnfQuery);
+        String vmsQuery = ParamConstants.VMS_QUERY;
+        authlist.contains(vmsQuery);
+        String vnfmgrVnfkpi = ParamConstants.VNFMGR_VNFKPI;
+        authlist.contains(vnfmgrVnfkpi);
+        String resVnf = ParamConstants.RES_VNF;
+        authlist.contains(resVnf);
+        String notifyVnfPerf = ParamConstants.NOTIFY_VNF_PERF;
+        authlist.contains(notifyVnfPerf);
+        String paramModule = ParamConstants.PARAM_MODULE;
+        authlist.contains(paramModule);
+        String getAllSos = ParamConstants.GET_ALL_SOS;
+        authlist.contains(getAllSos);
+        String operationLogPath = ParamConstants.OPERATION_LOG_PATH;
+        authlist.contains(operationLogPath);
+        String systemLogPath = ParamConstants.SYSTEM_LOG_PATH;
+        authlist.contains(systemLogPath);
+        String securityLogPath = ParamConstants.SECURITY_LOG_PATH;
+        authlist.contains(securityLogPath);
+        String getVnfmVnf = ParamConstants.GET_VNFM_VNF;
+        authlist.contains(getVnfmVnf);
+        String getResNet = ParamConstants.GET_RES_NET;
+        authlist.contains(getResNet);
+        String getJobStatus = ParamConstants.GET_JOB_STATUS;
+        authlist.contains(getJobStatus);
+        String vnfInstance = ParamConstants.VNF_INSTANCE;
+        authlist.contains(vnfInstance);
+        String vnfInstanceDel = ParamConstants.VNF_INSTANCE_DEL;
+        authlist.contains(vnfInstanceDel);
+        String vnfInstanceGetU2000 = ParamConstants.VNF_INSTANCE_GET_U2000;
+        authlist.contains(vnfInstanceGetU2000);
+        String vnfInstanceGet = ParamConstants.VNF_INSTANCE_GET;
+        authlist.contains(vnfInstanceGet);
+        String vnfConfigurationGet = ParamConstants.VNF_CONFIGURATION_GET;
+        authlist.contains(vnfConfigurationGet);
+        String vnfScale = ParamConstants.VNF_SCALE;
+        authlist.contains(vnfScale);
+        String vnfGetVminfo = ParamConstants.VNF_GET_VMINFO;
+        authlist.contains(vnfGetVminfo);
+        String msbRegisterUrl = ParamConstants.MSB_REGISTER_URL;
+        authlist.contains(msbRegisterUrl);
+        String msbUnregisterUrl = ParamConstants.MSB_UNREGISTER_URL;
+        authlist.contains(msbUnregisterUrl);
+        String esrGetVnfmUrl = ParamConstants.ESR_GET_VNFM_URL;
+        authlist.contains(esrGetVnfmUrl);
+        String esrGetVnfmsUrl = ParamConstants.ESR_GET_VNFMS_URL;
+        authlist.contains(esrGetVnfmsUrl);
+        String grantResUrl = ParamConstants.GRANT_RES_URL;
+        authlist.contains(grantResUrl);
+        String healVnf = ParamConstants.HEAL_VNF;
+        authlist.contains(healVnf);
+        Assert.assertTrue(true);
+    }
+}
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/TestUrlConstant.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/TestUrlConstant.java
new file mode 100644
index 00000000..604e2f1b
--- /dev/null
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/TestUrlConstant.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2020 Huawei Technologies Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant;
+
+import junit.framework.Assert;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant.AUTHLIST;
+
+
+public class TestUrlConstant {
+    @Test
+    public void testCreate(){
+        List<String> authlist = AUTHLIST;
+        authlist.contains("abc");
+        String url = UrlConstant.PORT_COMMON;
+        authlist.contains(url);
+        String abc = ParamConstants.CONNECTMGR_CONNECT;
+        authlist.contains(abc);
+        String url_job_status_get  = UrlConstant.URL_JOBSTATUS_GET;
+        authlist.contains(url_job_status_get);
+        String url_rest_msb_register  = UrlConstant.REST_MSB_REGISTER;
+        authlist.contains(url_rest_msb_register);
+        String url_rest_drivermgr_register  = UrlConstant.REST_DRIVERMGR_REGISTER;
+        authlist.contains(url_rest_drivermgr_register);
+        String url_rest_csarinfo_get  = UrlConstant.REST_CSARINFO_GET;
+        authlist.contains(url_rest_csarinfo_get);
+        String url_rest_vnfminfo_get  = UrlConstant.REST_VNFMINFO_GET;
+        authlist.contains(url_rest_vnfminfo_get);
+        String url_allcloud_get  = UrlConstant.URL_ALLCLOUD_GET;
+        authlist.contains(url_allcloud_get);
+        String url_allcloud_new_get  = UrlConstant.URL_ALLCLOUD_NEW_GET;
+        authlist.contains(url_allcloud_new_get);
+        String url_vnfpackage_post  = UrlConstant.URL_VNFPACKAGE_POST;
+        authlist.contains(url_vnfpackage_post);
+        String url_vnfdinfo_get  = UrlConstant.URL_VNFDINFO_GET;
+        authlist.contains(url_vnfdinfo_get);
+        String url_vnfdplaninfo_get  = UrlConstant.URL_VNFDPLANINFO_GET;
+        authlist.contains(url_vnfdplaninfo_get);
+        String portUploadvnfpkg  = UrlConstant.PORT_UPLOADVNFPKG;
+        authlist.contains(portUploadvnfpkg);
+        Assert.assertTrue(true);
+    }
+}
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslCertificateSocketTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslCertificateSocketTest.java
index 0e31faf8..f0246d6f 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslCertificateSocketTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslCertificateSocketTest.java
@@ -58,4 +58,17 @@ public class SslCertificateSocketTest {
             e.printStackTrace();
         }
     }
+
+
+    @Test
+    public void createSocketTest6() {
+        SslCertificateSocket socket = new SslCertificateSocket();
+        try {
+            HttpConnectionParams params = new HttpConnectionParams();
+            params.setConnectionTimeout(3000);
+            socket.createSocket("http://127.0.0.1", 1234);
+        } catch(IOException e) {
+            e.printStackTrace();
+        }
+    }
 }