a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Trivial nomenclature fix for NVMe hosts on Pure Storage FlashArray (#51616)

pull/4420/head
Simon Dodsley 2019-02-01 14:54:30 -05:00 committed by ansibot
parent 40130b82ae
commit 99c00c6af1
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/ansible/modules/storage/purestorage/purefa_host.py
View File

@ -37,7 +37,7 @@ options:
description: description:
- Defines the host connection protocol for volumes. - Defines the host connection protocol for volumes.
default: iscsi default: iscsi
choices: [ fc, iscsi, nvmef, mixed ] choices: [ fc, iscsi, nvme, mixed ]
wwns: wwns:
description: description:
- List of wwns of the host if protocol is fc or mixed. - List of wwns of the host if protocol is fc or mixed.
@ -46,7 +46,7 @@ options:
- List of IQNs of the host if protocol is iscsi or mixed. - List of IQNs of the host if protocol is iscsi or mixed.
nqn: nqn:
description: description:
- List of NQNs of the host if protocol is nvmef or mixed. - List of NQNs of the host if protocol is nvme or mixed.
version_added: '2.8' version_added: '2.8'
volume: volume:
description: description:
@ -102,10 +102,10 @@ EXAMPLES = r'''
fa_url: 10.10.10.2 fa_url: 10.10.10.2
api_token: e31060a7-21fc-e277-6240-25983c6c4592 api_token: e31060a7-21fc-e277-6240-25983c6c4592
- name: Make host bar with NVMeF ports - name: Make host bar with NVMe ports
purefa_host: purefa_host:
host: bar host: bar
protocol: nvmef protocol: nvme
nqn: nqn:
- nqn.2014-08.com.vendor:nvme:nvm-subsystem-sn-d78432 - nqn.2014-08.com.vendor:nvme:nvm-subsystem-sn-d78432
fa_url: 10.10.10.2 fa_url: 10.10.10.2
@ -142,7 +142,7 @@ from ansible.module_utils.pure import get_system, purefa_argument_spec
AC_REQUIRED_API_VERSION = '1.14' AC_REQUIRED_API_VERSION = '1.14'
NVMEF_API_VERSION = '1.16' NVME_API_VERSION = '1.16'
try: try:
@ -154,13 +154,13 @@ except ImportError:
def _set_host_initiators(module, array): def _set_host_initiators(module, array):
"""Set host initiators.""" """Set host initiators."""
if module.params['protocol'] in ['nvmef', 'mixed']: if module.params['protocol'] in ['nvme', 'mixed']:
if module.params['nqn']: if module.params['nqn']:
try: try:
array.set_host(module.params['host'], array.set_host(module.params['host'],
nqnlist=module.params['nqn']) nqnlist=module.params['nqn'])
except Exception: except Exception:
module.fail_json(msg='Setting of NVMeF NQN failed.') module.fail_json(msg='Setting of NVMe NQN failed.')
if module.params['protocol'] in ['iscsi', 'mixed']: if module.params['protocol'] in ['iscsi', 'mixed']:
if module.params['iqn']: if module.params['iqn']:
try: try:
@ -178,14 +178,14 @@ def _set_host_initiators(module, array):
def _update_host_initiators(module, array): def _update_host_initiators(module, array):
"""Change host initiator if iscsi or nvmef or add new FC WWNs""" """Change host initiator if iscsi or nvme or add new FC WWNs"""
if module.params['protocol'] in ['nvmef', 'mixed']: if module.params['protocol'] in ['nvme', 'mixed']:
if module.params['nqn']: if module.params['nqn']:
try: try:
array.set_host(module.params['host'], array.set_host(module.params['host'],
nqnlist=module.params['nqn']) nqnlist=module.params['nqn'])
except Exception: except Exception:
module.fail_json(msg='Change of NVMeF NQN failed.') module.fail_json(msg='Change of NVMe NQN failed.')
if module.params['protocol'] in ['iscsi', 'mixed']: if module.params['protocol'] in ['iscsi', 'mixed']:
if module.params['iqn']: if module.params['iqn']:
try: try:
@ -313,7 +313,7 @@ def main():
argument_spec.update(dict( argument_spec.update(dict(
host=dict(type='str', required=True), host=dict(type='str', required=True),
state=dict(type='str', default='present', choices=['absent', 'present']), state=dict(type='str', default='present', choices=['absent', 'present']),
protocol=dict(type='str', default='iscsi', choices=['fc', 'iscsi', 'nvmef', 'mixed']), protocol=dict(type='str', default='iscsi', choices=['fc', 'iscsi', 'nvme', 'mixed']),
nqn=dict(type='list'), nqn=dict(type='list'),
iqn=dict(type='list'), iqn=dict(type='list'),
wwns=dict(type='list'), wwns=dict(type='list'),
@ -331,10 +331,9 @@ def main():
array = get_system(module) array = get_system(module)
api_version = array._list_available_rest_versions() api_version = array._list_available_rest_versions()
if module.params['nqn'] is not None and NVMEF_API_VERSION not in api_version: if module.params['nqn'] is not None and NVME_API_VERSION not in api_version:
module.fail_json(msg='NVMeF protocol not supported. Please upgrade your array.') module.fail_json(msg='NVMe protocol not supported. Please upgrade your array.')
state = module.params['state'] state = module.params['state']
protocol = module.params['protocol']
host = get_host(module, array) host = get_host(module, array)
if module.params['lun'] and not 1 <= module.params['lun'] <= 4095: if module.params['lun'] and not 1 <= module.params['lun'] <= 4095:
module.fail_json(msg='LUN ID of {0} is out of range (1 to 4095)'.format(module.params['lun'])) module.fail_json(msg='LUN ID of {0} is out of range (1 to 4095)'.format(module.params['lun']))