From d21cfada3d0c5ab1bcc999026facff8a4dd1a875 Mon Sep 17 00:00:00 2001 From: tanjiangyu <306848916@qq.com> Date: Fri, 2 Apr 2021 14:07:35 +0800 Subject: [PATCH 1/2] Emc vnx block:Modifying exception types --- delfin/drivers/dell_emc/vnx/vnx_block/consts.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/delfin/drivers/dell_emc/vnx/vnx_block/consts.py b/delfin/drivers/dell_emc/vnx/vnx_block/consts.py index 6f14898db..a0bfc80cc 100644 --- a/delfin/drivers/dell_emc/vnx/vnx_block/consts.py +++ b/delfin/drivers/dell_emc/vnx/vnx_block/consts.py @@ -24,8 +24,8 @@ EXCEPTION_MAP = {CER_ERR: exception.SSLCertificateFailed, CALLER_ERR: exception.InvalidUsernameOrPassword, SECURITY_ERR: exception.InvalidUsernameOrPassword, - TRYING_CONNECT_ERR: exception.ConnectTimeout, - CONNECTION_ERR: exception.ConnectTimeout, + TRYING_CONNECT_ERR: exception.InvalidIpOrPort, + CONNECTION_ERR: exception.InvalidIpOrPort, INVALID_ERR: exception.InvalidUsernameOrPassword} CER_STORE = '2' CER_REJECT = '3' From d1b4454facd3d10f3271136b76a04bf6eb549416 Mon Sep 17 00:00:00 2001 From: tanjiangyu <306848916@qq.com> Date: Fri, 2 Apr 2021 15:36:30 +0800 Subject: [PATCH 2/2] and --- delfin/drivers/dell_emc/vnx/vnx_block/consts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/delfin/drivers/dell_emc/vnx/vnx_block/consts.py b/delfin/drivers/dell_emc/vnx/vnx_block/consts.py index a0bfc80cc..c42d38cac 100644 --- a/delfin/drivers/dell_emc/vnx/vnx_block/consts.py +++ b/delfin/drivers/dell_emc/vnx/vnx_block/consts.py @@ -14,7 +14,7 @@ from delfin import exception from delfin.common import constants -SOCKET_TIMEOUT = 30 +SOCKET_TIMEOUT = 10 CER_ERR = 'Unable to validate the identity of the server' CALLER_ERR = 'Caller not privileged' SECURITY_ERR = 'Security file not found'