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

Jump to bottom

Fix failure due to missing API version check #61925

Merged
merged 1 commit into from Sep 9, 2019
Merged

Fix failure due to missing API version check #61925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions changelogs/fragments/61925-fix_purefa_fact_info_api_check.yml
View file
Open in desktop
@@ -0,0 +1,3 @@
bugfixes:
- purefa_info - Fix missing API version check when calling I(admins) or I(all) as the subset
- _purefa_facts - Fix missing API version check when calling I(admins) or I(all) as the subset
17 changes: 10 additions & 7 deletions lib/ansible/modules/storage/purestorage/_purefa_facts.py
View file
Open in desktop
Expand Up @@ -340,6 +340,7 @@
from ansible.module_utils.pure import get_system, purefa_argument_spec


ADMIN_API_VERSION = '1.14'
S3_REQUIRED_API_VERSION = '1.16'
LATENCY_REQUIRED_API_VERSION = '1.16'
AC_REQUIRED_API_VERSION = '1.14'
Expand Down Expand Up @@ -461,14 +462,16 @@ def generate_config_dict(array):


def generate_admin_dict(array):
api_version = array._list_available_rest_versions()
admin_facts = {}
admins = array.list_admins()
for admin in range(0, len(admins)):
admin_name = admins[admin]['name']
admin_facts[admin_name] = {
'type': admins[admin]['type'],
'role': admins[admin]['role'],
}
if ADMIN_API_VERSION in api_version:
admins = array.list_admins()
for admin in range(0, len(admins)):
admin_name = admins[admin]['name']
admin_facts[admin_name] = {
'type': admins[admin]['type'],
'role': admins[admin]['role'],
}
return admin_facts


Expand Down
17 changes: 10 additions & 7 deletions lib/ansible/modules/storage/purestorage/purefa_info.py
View file
Open in desktop
Expand Up @@ -408,6 +408,7 @@
from ansible.module_utils.pure import get_system, purefa_argument_spec
import time

ADMIN_API_VERSION = '1.14'
S3_REQUIRED_API_VERSION = '1.16'
LATENCY_REQUIRED_API_VERSION = '1.16'
AC_REQUIRED_API_VERSION = '1.14'
Expand Down Expand Up @@ -530,13 +531,15 @@ def generate_config_dict(array):

def generate_admin_dict(array):
admin_info = {}
admins = array.list_admins()
for admin in range(0, len(admins)):
admin_name = admins[admin]['name']
admin_info[admin_name] = {
'type': admins[admin]['type'],
'role': admins[admin]['role'],
}
api_version = array._list_available_rest_versions()
if ADMIN_API_VERSION in api_version:
admins = array.list_admins()
for admin in range(0, len(admins)):
admin_name = admins[admin]['name']
admin_info[admin_name] = {
'type': admins[admin]['type'],
'role': admins[admin]['role'],
}
return admin_info


Expand Down