Addressed FIXME's in hurd.py (Extracted functionality and exit early) (#69226)

* Addressed FIXME's in hurd.py

* Added changelog fragment

* Fix function order

* Added self reference

* Changed to 'is None'
pull/69337/head
Chris Holland 5 years ago committed by GitHub
parent 8d43d79191
commit 6d8cfcf539
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
bugfixes:
- hurd - Address FIXMEs. Extract functionality and exit early.

@ -29,25 +29,7 @@ class HurdPfinetNetwork(Network):
platform = 'GNU' platform = 'GNU'
_socket_dir = '/servers/socket/' _socket_dir = '/servers/socket/'
def populate(self, collected_facts=None): def assign_network_facts(self, network_facts, fsysopts_path, socket_path):
network_facts = {}
fsysopts_path = self.module.get_bin_path('fsysopts')
if fsysopts_path is None:
return network_facts
socket_path = None
for l in ('inet', 'inet6'):
link = os.path.join(self._socket_dir, l)
if os.path.exists(link):
socket_path = link
break
# FIXME: extract to method
# FIXME: exit early on falsey socket_path and un-indent whole block
if socket_path:
rc, out, err = self.module.run_command([fsysopts_path, '-L', socket_path]) rc, out, err = self.module.run_command([fsysopts_path, '-L', socket_path])
# FIXME: build up a interfaces datastructure, then assign into network_facts # FIXME: build up a interfaces datastructure, then assign into network_facts
network_facts['interfaces'] = [] network_facts['interfaces'] = []
@ -77,9 +59,28 @@ class HurdPfinetNetwork(Network):
'address': address, 'address': address,
'prefix': prefix, 'prefix': prefix,
}) })
return network_facts
def populate(self, collected_facts=None):
network_facts = {}
fsysopts_path = self.module.get_bin_path('fsysopts')
if fsysopts_path is None:
return network_facts
socket_path = None
for l in ('inet', 'inet6'):
link = os.path.join(self._socket_dir, l)
if os.path.exists(link):
socket_path = link
break
if socket_path is None:
return network_facts return network_facts
return self.assign_network_facts(network_facts, fsysopts_path, socket_path)
class HurdNetworkCollector(NetworkCollector): class HurdNetworkCollector(NetworkCollector):
_platform = 'GNU' _platform = 'GNU'

Loading…
Cancel
Save