internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 14:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor iscsi network facts module, remove external grep call, add unit test (#55643)

Browse Source 
* remove external grep call and parse with python
* use function for repeated code
* use module.get_bin_path() for iscsiutil on HPUX
* some code opt for HPUX
* clean up non-module code, module being defined is a requirement for this code
* import get_bin_path() directly and use without module prefix
* Add integration tests for AIX and HP-UX
* add changelog fragment
* Apply suggestions from code review
Co-Authored-By: mator <matorola@gmail.com>
* Apply suggestions from code review #2
Co-Authored-By: Sam Doran <sdoran@redhat.com>
* Remove strict requirement on executable to exist for get_bin_path() as
it will allow facts gathering to continue without an error. Almost all
other files under facts do not have "required=True" (except 2 files,
which should be probably fixed). And check return value for
get_bin_path() , before run attempt.

* add check for AIX lsattr run_command return code
This commit is contained in:
Anatoly Pugachev
2019-05-07 18:26:20 +02:00
committed by Brian Coca
parent 53ed1bfc49
commit 6e73150244
3 changed files with 77 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/ansible/module_utils/facts/network/iscsi.py
View File

@@ -21,6 +21,7 @@ __metaclass__ = type
import sys
import subprocess
from ansible.module_utils.common.process import get_bin_path
from ansible.module_utils.facts.utils import get_file_content
from ansible.module_utils.facts.network.base import NetworkCollector
@@ -79,24 +80,26 @@ class IscsiInitiatorNetworkCollector(NetworkCollector):
iscsi_facts['iscsi_iqn'] = line.split('=', 1)[1]
break
elif sys.platform.startswith('aix'):
if module is not None:
rc, out, err = module.run_command('/usr/sbin/lsattr -E -l iscsi0 | grep initiator_name')
if out:
iscsi_facts['iscsi_iqn'] = out.split()[1].rstrip()
else:
aixcmd = '/usr/sbin/lsattr -E -l iscsi0 | grep initiator_name'
aixret = subprocess.check_output(aixcmd, shell=True)
if aixret[0].isalpha():
iscsi_facts['iscsi_iqn'] = aixret.split()[1].rstrip()
cmd = get_bin_path('lsattr')
if cmd:
cmd += " -E -l iscsi0"
rc, out, err = module.run_command(cmd)
if rc == 0 and out:
line = self.findstr(out, 'initiator_name')
iscsi_facts['iscsi_iqn'] = line.split()[1].rstrip()
elif sys.platform.startswith('hp-ux'):
if module is not None:
rc, out, err = module.run_command("/opt/iscsi/bin/iscsiutil -l | grep 'Initiator Name'",
use_unsafe_shell=True)
# try to find it in the default PATH and opt_dirs
cmd = get_bin_path('iscsiutil', opt_dirs=['/opt/iscsi/bin'])
if cmd:
cmd += " -l"
rc, out, err = module.run_command(cmd)
if out:
iscsi_facts['iscsi_iqn'] = out.split(":", 1)[1].rstrip()
else:
hpuxcmd = "/opt/iscsi/bin/iscsiutil -l | grep 'Initiator Name'"
hpuxret = subprocess.check_output(hpuxcmd, shell=True)
if hpuxret[0].isalpha():
iscsi_facts['iscsi_iqn'] = hpuxret.split(":", 1)[1].rstrip()
line = self.findstr(out, 'Initiator Name')
iscsi_facts['iscsi_iqn'] = line.split(":", 1)[1].rstrip()
return iscsi_facts
def findstr(self, text, match):
for line in text.splitlines():
if match in line:
found = line
return found