setup module, make missing sysctl minor issue (#81297)

Signed-off-by: Brian Coca <brian.coca+git@gmail.com>
Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>
Co-authored-by: Abhijeet Kasurde <akasurde@redhat.com>
pull/80505/merge
Brian Coca 7 months ago committed by GitHub
parent ac6200b597
commit 7e0a476ba2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -0,0 +1,2 @@
bugfixes:
- setup/gather_facts will now warn and skip missing ``sysctl`` instead of being a fatal error.

@ -1348,14 +1348,16 @@ class AnsibleModule(object):
# and we don't want to break modules unnecessarily # and we don't want to break modules unnecessarily
return None return None
def get_bin_path(self, arg, required=False, opt_dirs=None): def get_bin_path(self, arg, required=False, opt_dirs=None, warning=None):
''' '''
Find system executable in PATH. Find system executable in PATH.
:param arg: The executable to find. :param arg: The executable to find.
:param required: if executable is not found and required is ``True``, fail_json :param required: if the executable is not found and required is ``True``, fail_json
:param opt_dirs: optional list of directories to search in addition to ``PATH`` :param opt_dirs: optional list of directories to search in addition to ``PATH``
:returns: if found return full path; otherwise return None :param warning: optional message when arg not found, only works when required=False
:returns: if found return full path; otherwise return original arg, unless 'warning' then return None
:raises: Sysexit: if arg is not found and required=True (via fail_json)
''' '''
bin_path = None bin_path = None
@ -1364,8 +1366,8 @@ class AnsibleModule(object):
except ValueError as e: except ValueError as e:
if required: if required:
self.fail_json(msg=to_text(e)) self.fail_json(msg=to_text(e))
else: elif warning is not None:
return bin_path self.module.warn("Unable to find %s, %s" % (arg, warning))
return bin_path return bin_path

@ -12,13 +12,18 @@ from ansible.module_utils.common.warnings import deprecate
def get_bin_path(arg, opt_dirs=None, required=None): def get_bin_path(arg, opt_dirs=None, required=None):
''' '''
Find system executable in PATH. Raises ValueError if the executable is not found. Find system executable in PATH. Raises ValueError if the executable is not found.
Optional arguments:
- required: [Deprecated] Before 2.10, if executable is not found and required is true it raises an Exception. :param arg: the executable to find
In 2.10 and later, an Exception is always raised. This parameter will be removed in 2.21. :type arg: string
- opt_dirs: optional list of directories to search in addition to PATH :param opt_dirs: optional list of directories to search in addition to PATH
:type opt_dirs: list of strings
:param required: DEPRECATED. This parameter will be removed in 2.21
:type required: boolean
:returns: path to arg (should be abs path unless PATH or opt_dirs are relative paths)
:raises: ValueError: if arg is not found
In addition to PATH and opt_dirs, this function also looks through /sbin, /usr/sbin and /usr/local/sbin. A lot of In addition to PATH and opt_dirs, this function also looks through /sbin, /usr/sbin and /usr/local/sbin. A lot of
modules, especially for gathering facts, depend on this behaviour. modules, especially for gathering facts, depend on this behaviour.
If found return full path, otherwise raise ValueError.
''' '''
if required is not None: if required is not None:
deprecate( deprecate(
@ -27,26 +32,34 @@ def get_bin_path(arg, opt_dirs=None, required=None):
collection_name="ansible.builtin", collection_name="ansible.builtin",
) )
paths = []
sbin_paths = ['/sbin', '/usr/sbin', '/usr/local/sbin']
opt_dirs = [] if opt_dirs is None else opt_dirs opt_dirs = [] if opt_dirs is None else opt_dirs
sbin_paths = ['/sbin', '/usr/sbin', '/usr/local/sbin'] # Construct possible paths with precedence
paths = [] # passed in paths
for d in opt_dirs: for d in opt_dirs:
if d is not None and os.path.exists(d): if d is not None and os.path.exists(d):
paths.append(d) paths.append(d)
# system configured paths
paths += os.environ.get('PATH', '').split(os.pathsep) paths += os.environ.get('PATH', '').split(os.pathsep)
bin_path = None
# mangle PATH to include /sbin dirs # existing /sbin dirs, if not there already
for p in sbin_paths: for p in sbin_paths:
if p not in paths and os.path.exists(p): if p not in paths and os.path.exists(p):
paths.append(p) paths.append(p)
# Search for binary
bin_path = None
for d in paths: for d in paths:
if not d: if not d:
continue continue
path = os.path.join(d, arg) path = os.path.join(d, arg)
if os.path.exists(path) and not os.path.isdir(path) and is_executable(path): if os.path.exists(path) and not os.path.isdir(path) and is_executable(path):
# fist found wins
bin_path = path bin_path = path
break break
if bin_path is None: if bin_path is None:
raise ValueError('Failed to find required executable "%s" in paths: %s' % (arg, os.pathsep.join(paths))) raise ValueError('Failed to find required executable "%s" in paths: %s' % (arg, os.pathsep.join(paths)))

@ -129,7 +129,7 @@ class AIXHardware(Hardware):
rc, out, err = self.module.run_command("/usr/sbin/lsattr -El sys0 -a fwversion") rc, out, err = self.module.run_command("/usr/sbin/lsattr -El sys0 -a fwversion")
data = out.split() data = out.split()
dmi_facts['firmware_version'] = data[1].strip('IBM,') dmi_facts['firmware_version'] = data[1].strip('IBM,')
lsconf_path = self.module.get_bin_path("lsconf") lsconf_path = self.module.get_bin_path("lsconf", warning="dmi facts skipped")
if lsconf_path: if lsconf_path:
rc, out, err = self.module.run_command(lsconf_path) rc, out, err = self.module.run_command(lsconf_path)
if rc == 0 and out: if rc == 0 and out:
@ -160,8 +160,9 @@ class AIXHardware(Hardware):
""" """
vgs_facts = {} vgs_facts = {}
lsvg_path = self.module.get_bin_path("lsvg") warn = "vgs facts skipped"
xargs_path = self.module.get_bin_path("xargs") lsvg_path = self.module.get_bin_path("lsvg", warning=warn)
xargs_path = self.module.get_bin_path("xargs", warning=warn)
cmd = "%s -o | %s %s -p" % (lsvg_path, xargs_path, lsvg_path) cmd = "%s -o | %s %s -p" % (lsvg_path, xargs_path, lsvg_path)
if lsvg_path and xargs_path: if lsvg_path and xargs_path:
rc, out, err = self.module.run_command(cmd, use_unsafe_shell=True) rc, out, err = self.module.run_command(cmd, use_unsafe_shell=True)
@ -194,7 +195,8 @@ class AIXHardware(Hardware):
# AIX does not have mtab but mount command is only source of info (or to use # AIX does not have mtab but mount command is only source of info (or to use
# api calls to get same info) # api calls to get same info)
mount_path = self.module.get_bin_path('mount') mount_path = self.module.get_bin_path('mount', warning="skipping mount facts")
if mount_path:
rc, mount_out, err = self.module.run_command(mount_path) rc, mount_out, err = self.module.run_command(mount_path)
if mount_out: if mount_out:
for line in mount_out.split('\n'): for line in mount_out.split('\n'):
@ -232,8 +234,10 @@ class AIXHardware(Hardware):
device_facts = {} device_facts = {}
device_facts['devices'] = {} device_facts['devices'] = {}
lsdev_cmd = self.module.get_bin_path('lsdev', True) warn = 'device facts are skipped'
lsattr_cmd = self.module.get_bin_path('lsattr', True) lsdev_cmd = self.module.get_bin_path('lsdev', warning=warn)
lsattr_cmd = self.module.get_bin_path('lsattr', warning=warn)
if lsdev_cmd and lsattr_cmd:
rc, out_lsdev, err = self.module.run_command(lsdev_cmd) rc, out_lsdev, err = self.module.run_command(lsdev_cmd)
for line in out_lsdev.splitlines(): for line in out_lsdev.splitlines():

@ -94,10 +94,15 @@ class DarwinHardware(Hardware):
total_used = 0 total_used = 0
page_size = 4096 page_size = 4096
vm_stat_command = self.module.get_bin_path('vm_stat')
vm_stat_command = self.module.get_bin_path(
'vm_stat',
warning='falling back to sysctl for memtotal_mb, default to 0 for memfree_mb'
)
if vm_stat_command is None: if vm_stat_command is None:
return memory_facts return memory_facts
if vm_stat_command:
rc, out, err = self.module.run_command(vm_stat_command) rc, out, err = self.module.run_command(vm_stat_command)
if rc == 0: if rc == 0:
# Free = Total - (Wired + active + inactive) # Free = Total - (Wired + active + inactive)
@ -128,9 +133,13 @@ class DarwinHardware(Hardware):
return memory_facts return memory_facts
def get_uptime_facts(self): def get_uptime_facts(self):
# On Darwin, the default format is annoying to parse. # On Darwin, the default format is annoying to parse.
# Use -b to get the raw value and decode it. # Use -b to get the raw value and decode it.
sysctl_cmd = self.module.get_bin_path('sysctl') sysctl_cmd = self.module.get_bin_path('sysctl', warning='skipping uptime facts')
if not sysctl_cmd:
return {}
cmd = [sysctl_cmd, '-b', 'kern.boottime'] cmd = [sysctl_cmd, '-b', 'kern.boottime']
# We need to get raw bytes, not UTF-8. # We need to get raw bytes, not UTF-8.

@ -23,7 +23,6 @@ import time
from ansible.module_utils.facts.hardware.base import Hardware, HardwareCollector from ansible.module_utils.facts.hardware.base import Hardware, HardwareCollector
from ansible.module_utils.facts.timeout import TimeoutError, timeout from ansible.module_utils.facts.timeout import TimeoutError, timeout
from ansible.module_utils.facts.utils import get_file_content, get_mount_size from ansible.module_utils.facts.utils import get_file_content, get_mount_size

@ -40,6 +40,9 @@ class HPUXHardware(Hardware):
def populate(self, collected_facts=None): def populate(self, collected_facts=None):
hardware_facts = {} hardware_facts = {}
# TODO: very inefficient calls to machinfo,
# should just make one and then deal with finding the data (see facts/sysctl)
# but not going to change unless there is hp/ux for testing
cpu_facts = self.get_cpu_facts(collected_facts=collected_facts) cpu_facts = self.get_cpu_facts(collected_facts=collected_facts)
memory_facts = self.get_memory_facts() memory_facts = self.get_memory_facts()
hw_facts = self.get_hw_facts() hw_facts = self.get_hw_facts()

@ -161,7 +161,13 @@ class NetBSDHardware(Hardware):
def get_uptime_facts(self): def get_uptime_facts(self):
# On NetBSD, we need to call sysctl with -n to get this value as an int. # On NetBSD, we need to call sysctl with -n to get this value as an int.
sysctl_cmd = self.module.get_bin_path('sysctl') sysctl_cmd = self.module.get_bin_path(
'sysctl',
warning="skipping uptime facts"
)
if sysctl_cmd is None:
return {}
cmd = [sysctl_cmd, '-n', 'kern.boottime'] cmd = [sysctl_cmd, '-n', 'kern.boottime']
rc, out, err = self.module.run_command(cmd) rc, out, err = self.module.run_command(cmd)

@ -112,7 +112,13 @@ class OpenBSDHardware(Hardware):
def get_uptime_facts(self): def get_uptime_facts(self):
# On openbsd, we need to call it with -n to get this value as an int. # On openbsd, we need to call it with -n to get this value as an int.
sysctl_cmd = self.module.get_bin_path('sysctl') sysctl_cmd = self.module.get_bin_path(
'sysctl',
warning="skipping uptime facts"
)
if sysctl_cmd is None:
return {}
cmd = [sysctl_cmd, '-n', 'kern.boottime'] cmd = [sysctl_cmd, '-n', 'kern.boottime']
rc, out, err = self.module.run_command(cmd) rc, out, err = self.module.run_command(cmd)

@ -172,7 +172,14 @@ class SunOSHardware(Hardware):
rc, platform, err = self.module.run_command('/usr/bin/uname -i') rc, platform, err = self.module.run_command('/usr/bin/uname -i')
platform_sbin = '/usr/platform/' + platform.rstrip() + '/sbin' platform_sbin = '/usr/platform/' + platform.rstrip() + '/sbin'
prtdiag_path = self.module.get_bin_path("prtdiag", opt_dirs=[platform_sbin]) prtdiag_path = self.module.get_bin_path(
"prtdiag",
opt_dirs=[platform_sbin],
warning="skipping dmi facts"
)
if prtdiag_path is None:
return dmi_facts
rc, out, err = self.module.run_command(prtdiag_path) rc, out, err = self.module.run_command(prtdiag_path)
# rc returns 1 # rc returns 1
if out: if out:

@ -31,9 +31,13 @@ class AIXNetwork(GenericBsdIfconfigNetwork):
def get_default_interfaces(self, route_path): def get_default_interfaces(self, route_path):
interface = dict(v4={}, v6={}) interface = dict(v4={}, v6={})
netstat_path = self.module.get_bin_path('netstat') netstat_path = self.module.get_bin_path(
'netstat',
warning="skipping default interface facts"
)
if netstat_path is None:
return interface['v4'], interface['v6']
if netstat_path:
rc, out, err = self.module.run_command([netstat_path, '-nr']) rc, out, err = self.module.run_command([netstat_path, '-nr'])
lines = out.splitlines() lines = out.splitlines()
@ -58,9 +62,7 @@ class AIXNetwork(GenericBsdIfconfigNetwork):
all_ipv6_addresses=[], all_ipv6_addresses=[],
) )
uname_rc = None uname_rc = uname_out = uname_err = None
uname_out = None
uname_err = None
uname_path = self.module.get_bin_path('uname') uname_path = self.module.get_bin_path('uname')
if uname_path: if uname_path:
uname_rc, uname_out, uname_err = self.module.run_command([uname_path, '-W']) uname_rc, uname_out, uname_err = self.module.run_command([uname_path, '-W'])

@ -47,7 +47,10 @@ class FcWwnInitiatorFactCollector(BaseFactCollector):
elif sys.platform.startswith('sunos'): elif sys.platform.startswith('sunos'):
# on solaris 10 or solaris 11 should use `fcinfo hba-port` # on solaris 10 or solaris 11 should use `fcinfo hba-port`
# TBD (not implemented): on solaris 9 use `prtconf -pv` # TBD (not implemented): on solaris 9 use `prtconf -pv`
cmd = module.get_bin_path('fcinfo') cmd = module.get_bin_path(
'fcinfo',
warning="skipping fibre wwn initiator facts"
)
if cmd: if cmd:
cmd = cmd + " hba-port" cmd = cmd + " hba-port"
rc, fcinfo_out, err = module.run_command(cmd) rc, fcinfo_out, err = module.run_command(cmd)
@ -59,8 +62,14 @@ class FcWwnInitiatorFactCollector(BaseFactCollector):
data = line.split(' ') data = line.split(' ')
fc_facts['fibre_channel_wwn'].append(data[-1].rstrip()) fc_facts['fibre_channel_wwn'].append(data[-1].rstrip())
elif sys.platform.startswith('aix'): elif sys.platform.startswith('aix'):
cmd = module.get_bin_path('lsdev') cmd = module.get_bin_path(
lscfg_cmd = module.get_bin_path('lscfg') 'lsdev',
warning="skipping fibre wwn initiator facts"
)
lscfg_cmd = module.get_bin_path(
'lscfg',
warning="skipping fibre wwn initiator facts"
)
if cmd and lscfg_cmd: if cmd and lscfg_cmd:
# get list of available fibre-channel devices (fcs) # get list of available fibre-channel devices (fcs)
cmd = cmd + " -Cc adapter -l fcs*" cmd = cmd + " -Cc adapter -l fcs*"
@ -81,8 +90,15 @@ class FcWwnInitiatorFactCollector(BaseFactCollector):
data = line.split('.') data = line.split('.')
fc_facts['fibre_channel_wwn'].append(data[-1].rstrip()) fc_facts['fibre_channel_wwn'].append(data[-1].rstrip())
elif sys.platform.startswith('hp-ux'): elif sys.platform.startswith('hp-ux'):
cmd = module.get_bin_path('ioscan') cmd = module.get_bin_path(
fcmsu_cmd = module.get_bin_path('fcmsutil', opt_dirs=['/opt/fcms/bin']) 'ioscan',
warning="skipping fibre wwn initiator facts"
)
fcmsu_cmd = module.get_bin_path(
'fcmsutil',
opt_dirs=['/opt/fcms/bin'],
warning="skipping fibre wwn initiator facts"
)
# go ahead if we have both commands available # go ahead if we have both commands available
if cmd and fcmsu_cmd: if cmd and fcmsu_cmd:
# ioscan / get list of available fibre-channel devices (fcd) # ioscan / get list of available fibre-channel devices (fcd)

@ -34,12 +34,18 @@ class GenericBsdIfconfigNetwork(Network):
def populate(self, collected_facts=None): def populate(self, collected_facts=None):
network_facts = {} network_facts = {}
ifconfig_path = self.module.get_bin_path('ifconfig') ifconfig_path = self.module.get_bin_path(
'ifconfig',
warning="skipping network facts"
)
if ifconfig_path is None: if ifconfig_path is None:
return network_facts return network_facts
route_path = self.module.get_bin_path('route') route_path = self.module.get_bin_path(
'route',
warning="skipping network facts"
)
if route_path is None: if route_path is None:
return network_facts return network_facts

@ -29,7 +29,11 @@ class HPUXNetwork(Network):
def populate(self, collected_facts=None): def populate(self, collected_facts=None):
network_facts = {} network_facts = {}
netstat_path = self.module.get_bin_path('netstat') netstat_path = self.module.get_bin_path(
'netstat',
opt_dirs=['/usr/bin'],
warning="skipping network facts"
)
if netstat_path is None: if netstat_path is None:
return network_facts return network_facts
@ -46,7 +50,15 @@ class HPUXNetwork(Network):
def get_default_interfaces(self): def get_default_interfaces(self):
default_interfaces = {} default_interfaces = {}
rc, out, err = self.module.run_command("/usr/bin/netstat -nr") netstat_path = self.module.get_bin_path(
'netstat',
opt_dirs=['/usr/bin'],
warning="skipping default interface facts"
)
if netstat_path is None:
return default_interfaces
rc, out, err = self.module.run_command("%s -nr" % netstat_path)
lines = out.splitlines() lines = out.splitlines()
for line in lines: for line in lines:
words = line.split() words = line.split()
@ -59,7 +71,15 @@ class HPUXNetwork(Network):
def get_interfaces_info(self): def get_interfaces_info(self):
interfaces = {} interfaces = {}
rc, out, err = self.module.run_command("/usr/bin/netstat -niw") netstat_path = self.module.get_bin_path(
'netstat',
opt_dirs=['/usr/bin'],
warning="skipping default interface info facts"
)
if netstat_path is None:
return interfaces
rc, out, err = self.module.run_command("%s -niw" % netstat_path)
lines = out.splitlines() lines = out.splitlines()
for line in lines: for line in lines:
words = line.split() words = line.split()

@ -63,7 +63,10 @@ class HurdPfinetNetwork(Network):
def populate(self, collected_facts=None): def populate(self, collected_facts=None):
network_facts = {} network_facts = {}
fsysopts_path = self.module.get_bin_path('fsysopts') fsysopts_path = self.module.get_bin_path(
'fsysopts',
warning="skipping network facts"
)
if fsysopts_path is None: if fsysopts_path is None:
return network_facts return network_facts

@ -21,7 +21,6 @@ import sys
import ansible.module_utils.compat.typing as t import ansible.module_utils.compat.typing as t
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.utils import get_file_content
from ansible.module_utils.facts.network.base import NetworkCollector from ansible.module_utils.facts.network.base import NetworkCollector
@ -80,9 +79,11 @@ class IscsiInitiatorNetworkCollector(NetworkCollector):
iscsi_facts['iscsi_iqn'] = line.split('=', 1)[1] iscsi_facts['iscsi_iqn'] = line.split('=', 1)[1]
break break
elif sys.platform.startswith('aix'): elif sys.platform.startswith('aix'):
try: cmd = module.get_bin_path(
cmd = get_bin_path('lsattr') 'lsattr',
except ValueError: warning="skipping iscsi initiator facts"
)
if cmd is None:
return iscsi_facts return iscsi_facts
cmd += " -E -l iscsi0" cmd += " -E -l iscsi0"
@ -92,10 +93,12 @@ class IscsiInitiatorNetworkCollector(NetworkCollector):
iscsi_facts['iscsi_iqn'] = line.split()[1].rstrip() iscsi_facts['iscsi_iqn'] = line.split()[1].rstrip()
elif sys.platform.startswith('hp-ux'): elif sys.platform.startswith('hp-ux'):
# try to find it in the default PATH and opt_dirs cmd = module.get_bin_path(
try: 'iscsiutil',
cmd = get_bin_path('iscsiutil', opt_dirs=['/opt/iscsi/bin']) opt_dirs=['/opt/iscsi/bin'],
except ValueError: warning="skipping iscsi initiator facts"
)
if cmd is None:
return iscsi_facts return iscsi_facts
cmd += " -l" cmd += " -l"

@ -22,8 +22,16 @@ class FacterFactCollector(BaseFactCollector):
namespace=namespace) namespace=namespace)
def find_facter(self, module): def find_facter(self, module):
facter_path = module.get_bin_path('facter', opt_dirs=['/opt/puppetlabs/bin']) facter_path = module.get_bin_path(
cfacter_path = module.get_bin_path('cfacter', opt_dirs=['/opt/puppetlabs/bin']) 'facter',
opt_dirs=['/opt/puppetlabs/bin'],
warning="falling back to cfacter to gather facter facts"
)
cfacter_path = module.get_bin_path(
'cfacter',
opt_dirs=['/opt/puppetlabs/bin'],
warning="skipping facter facts"
)
# Prefer to use cfacter if available # Prefer to use cfacter if available
if cfacter_path is not None: if cfacter_path is not None:
@ -73,7 +81,6 @@ class FacterFactCollector(BaseFactCollector):
try: try:
facter_dict = json.loads(facter_output) facter_dict = json.loads(facter_output)
except Exception: except Exception:
# FIXME: maybe raise a FactCollectorError with some info attrs? module.warn("Failed to parse facter facts")
pass
return facter_dict return facter_dict

@ -36,10 +36,12 @@ class OhaiFactCollector(BaseFactCollector):
namespace=namespace) namespace=namespace)
def find_ohai(self, module): def find_ohai(self, module):
ohai_path = module.get_bin_path('ohai') return module.get_bin_path(
return ohai_path 'ohai',
warning="skipping ohai facts"
)
def run_ohai(self, module, ohai_path,): def run_ohai(self, module, ohai_path):
rc, out, err = module.run_command(ohai_path) rc, out, err = module.run_command(ohai_path)
return rc, out, err return rc, out, err
@ -67,7 +69,6 @@ class OhaiFactCollector(BaseFactCollector):
try: try:
ohai_facts = json.loads(ohai_output) ohai_facts = json.loads(ohai_output)
except Exception: except Exception:
# FIXME: useful error, logging, something... module.warn("Failed to gather ohai facts")
pass
return ohai_facts return ohai_facts

@ -21,11 +21,13 @@ from ansible.module_utils.common.text.converters import to_text
def get_sysctl(module, prefixes): def get_sysctl(module, prefixes):
sysctl_cmd = module.get_bin_path('sysctl')
cmd = [sysctl_cmd]
cmd.extend(prefixes)
sysctl = dict() sysctl = dict()
sysctl_cmd = module.get_bin_path('sysctl', warning='skipping sysctl based facts')
if sysctl_cmd is not None:
cmd = [sysctl_cmd]
cmd.extend(prefixes)
try: try:
rc, out, err = module.run_command(cmd) rc, out, err = module.run_command(cmd)

@ -89,34 +89,28 @@ FCMSUTIL_OUT = """
""" """
def mock_get_bin_path(cmd, required=False, opt_dirs=None): def mock_get_bin_path(cmd, required=False, opt_dirs=None, warning=None):
result = None cmds = {
if cmd == 'lsdev': 'lsdev': '/usr/sbin/lsdev',
result = '/usr/sbin/lsdev' 'lscfg': '/usr/sbin/lscfg',
elif cmd == 'lscfg': 'fcinfo': '/usr/sbin/fcinfo',
result = '/usr/sbin/lscfg' 'ioscan': '/usr/bin/ioscan',
elif cmd == 'fcinfo': 'fcmsutil': '/opt/fcms/bin/fcmsutil',
result = '/usr/sbin/fcinfo' }
elif cmd == 'ioscan': return cmds.get(cmd, None)
result = '/usr/bin/ioscan'
elif cmd == 'fcmsutil':
result = '/opt/fcms/bin/fcmsutil'
return result
def mock_run_command(cmd): def mock_run_command(cmd):
rc = 0 rc = 0
if 'lsdev' in cmd: COMMANDS = {
result = LSDEV_OUTPUT '/usr/sbin/lsdev': LSDEV_OUTPUT,
elif 'lscfg' in cmd: '/usr/sbin/lscfg': LSCFG_OUTPUT,
result = LSCFG_OUTPUT '/usr/sbin/fcinfo': FCINFO_OUTPUT,
elif 'fcinfo' in cmd: '/usr/bin/ioscan': IOSCAN_OUT,
result = FCINFO_OUTPUT '/opt/fcms/bin/fcmsutil': FCMSUTIL_OUT,
elif 'ioscan' in cmd: }
result = IOSCAN_OUT result = COMMANDS.get(cmd.split()[0])
elif 'fcmsutil' in cmd: if result is None:
result = FCMSUTIL_OUT
else:
rc = 1 rc = 1
result = 'Error' result = 'Error'
return (rc, result, '') return (rc, result, '')

@ -22,12 +22,12 @@ import unittest
from ansible.module_utils.facts.network import generic_bsd from ansible.module_utils.facts.network import generic_bsd
def get_bin_path(command): def get_bin_path(command, warning=None):
if command == 'ifconfig': cmds = {
return 'fake/ifconfig' 'ifconfig': 'fake/ifconfig',
elif command == 'route': 'route': 'fake/route',
return 'fake/route' }
return None return cmds.get(command, None)
netbsd_ifconfig_a_out_7_1 = r''' netbsd_ifconfig_a_out_7_1 = r'''

@ -41,13 +41,13 @@ def test_get_iscsi_info(mocker):
inst = iscsi.IscsiInitiatorNetworkCollector() inst = iscsi.IscsiInitiatorNetworkCollector()
mocker.patch('sys.platform', 'aix6') mocker.patch('sys.platform', 'aix6')
mocker.patch('ansible.module_utils.facts.network.iscsi.get_bin_path', return_value='/usr/sbin/lsattr') mocker.patch.object(module, 'get_bin_path', return_value='/usr/sbin/lsattr')
mocker.patch.object(module, 'run_command', return_value=(0, LSATTR_OUTPUT, '')) mocker.patch.object(module, 'run_command', return_value=(0, LSATTR_OUTPUT, ''))
aix_iscsi_expected = {"iscsi_iqn": "iqn.localhost.hostid.7f000002"} aix_iscsi_expected = {"iscsi_iqn": "iqn.localhost.hostid.7f000002"}
assert aix_iscsi_expected == inst.collect(module=module) assert aix_iscsi_expected == inst.collect(module=module)
mocker.patch('sys.platform', 'hp-ux') mocker.patch('sys.platform', 'hp-ux')
mocker.patch('ansible.module_utils.facts.network.iscsi.get_bin_path', return_value='/opt/iscsi/bin/iscsiutil') mocker.patch.object(module, 'get_bin_path', return_value='/opt/iscsi/bin/iscsiutil')
mocker.patch.object(module, 'run_command', return_value=(0, ISCSIUTIL_OUTPUT, '')) mocker.patch.object(module, 'run_command', return_value=(0, ISCSIUTIL_OUTPUT, ''))
hpux_iscsi_expected = {"iscsi_iqn": " iqn.2001-04.com.hp.stor:svcio"} hpux_iscsi_expected = {"iscsi_iqn": " iqn.2001-04.com.hp.stor:svcio"}
assert hpux_iscsi_expected == inst.collect(module=module) assert hpux_iscsi_expected == inst.collect(module=module)

Loading…
Cancel
Save