ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

aix network facts: Separate out the uname call to reduce total calls (#18288)

Browse source 
* aix network facts: Separate out the uname call to reduce total calls
* Remove duplicate check

Fixes #11289
This commit is contained in:
jctanner 2016-11-01 19:34:26 -04:00 committed by GitHub
parent c16a88cac4
commit 333f6d447b
1 changed files with 41 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/module_utils/facts.py
View file

@ -2837,6 +2837,14 @@ class AIXNetwork(GenericBsdIfconfigNetwork):
all_ipv4_addresses = [], all_ipv4_addresses = [],
all_ipv6_addresses = [], all_ipv6_addresses = [],
) )
uname_rc = None
uname_out = None
uname_err = None
uname_path = self.module.get_bin_path('uname')
if uname_path:
uname_rc, uname_out, uname_err = self.module.run_command([uname_path, '-W'])
rc, out, err = self.module.run_command([ifconfig_path, ifconfig_options]) rc, out, err = self.module.run_command([ifconfig_path, ifconfig_options])
for line in out.splitlines(): for line in out.splitlines():
@ -2866,12 +2874,11 @@ class AIXNetwork(GenericBsdIfconfigNetwork):
self.parse_inet6_line(words, current_if, ips) self.parse_inet6_line(words, current_if, ips)
else: else:
self.parse_unknown_line(words, current_if, ips) self.parse_unknown_line(words, current_if, ips)
uname_path = self.module.get_bin_path('uname')
if uname_path:
rc, out, err = self.module.run_command([uname_path, '-W'])
# don't bother with wpars it does not work # don't bother with wpars it does not work
# zero means not in wpar # zero means not in wpar
if not rc and out.split()[0] == '0': if not uname_rc and uname_out.split()[0] == '0':
if current_if['macaddress'] == 'unknown' and re.match('^en', current_if['device']): if current_if['macaddress'] == 'unknown' and re.match('^en', current_if['device']):
entstat_path = self.module.get_bin_path('entstat') entstat_path = self.module.get_bin_path('entstat')
if entstat_path: if entstat_path:
@ -2888,6 +2895,7 @@ class AIXNetwork(GenericBsdIfconfigNetwork):
buff = re.match('^Device Type:', line) buff = re.match('^Device Type:', line)
if buff and re.match('.*Ethernet', line): if buff and re.match('.*Ethernet', line):
current_if['type'] = 'ether' current_if['type'] = 'ether'
# device must have mtu attribute in ODM # device must have mtu attribute in ODM
if 'mtu' not in current_if: if 'mtu' not in current_if:
lsattr_path = self.module.get_bin_path('lsattr') lsattr_path = self.module.get_bin_path('lsattr')