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.

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

Fixed issues of using AviCredentials due to import errors #52661

Merged
merged 1 commit into from
Mar 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/ansible/modules/network/avi/avi_api_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@

try:
from ansible.module_utils.network.avi.avi import (
avi_common_argument_spec, ansible_return, AviCredentials, HAS_AVI)
from avi.sdk.avi_api import ApiSession
avi_common_argument_spec, ansible_return, HAS_AVI)
from avi.sdk.avi_api import ApiSession, AviCredentials
from avi.sdk.utils.ansible_utils import avi_obj_cmp, cleanup_absent_fields

except ImportError:
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/modules/network/avi/avi_api_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@

try:
from ansible.module_utils.network.avi.avi import (
avi_common_argument_spec, HAS_AVI, AviCredentials)
from avi.sdk.avi_api import ApiSession
avi_common_argument_spec, HAS_AVI)
from avi.sdk.avi_api import ApiSession, AviCredentials
except ImportError:
HAS_AVI = False

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@
try:
from ansible.module_utils.network.avi.avi import (
avi_common_argument_spec, HAS_AVI)
from avi.sdk.avi_api import ApiSession
from avi.sdk.avi_api import ApiSession, AviCredentials
from avi.sdk.utils.ansible_utils import (
avi_obj_cmp, cleanup_absent_fields, ansible_return,
AviCheckModeResponse, AviCredentials)
AviCheckModeResponse)
except ImportError:
HAS_AVI = False

Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/modules/network/avi/avi_useraccount.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@

try:
from ansible.module_utils.network.avi.avi import (
avi_common_argument_spec, ansible_return, AviCredentials, HAS_AVI)
from avi.sdk.avi_api import ApiSession
avi_common_argument_spec, ansible_return, HAS_AVI)
from avi.sdk.avi_api import ApiSession, AviCredentials
from avi.sdk.utils.ansible_utils import avi_obj_cmp, cleanup_absent_fields

except ImportError:
Expand Down