Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Emc vnx block:Modifying exception types #545

Merged
merged 3 commits into from
Apr 2, 2021
Merged

Emc vnx block:Modifying exception types #545

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d21cfad
Emc vnx block:Modifying exception types
jiangyutan Apr 2, 2021
d1b4454
and
jiangyutan Apr 2, 2021
f642581
Merge branch 'master' into emc_vnx_block_0402
jiangyutan Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions delfin/drivers/dell_emc/vnx/vnx_block/consts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is there is some network connectivity issue? It may not be invalid IP or PORT

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Page display requirements

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok hope the message is displayed accordingly

CONNECTION_ERR: exception.InvalidIpOrPort,
INVALID_ERR: exception.InvalidUsernameOrPassword}
CER_STORE = '2'
CER_REJECT = '3'
Expand Down