afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

updates to check_cmd to just return output, as status is pointless

Browse source
This commit is contained in:
Blake J. Harnden 2018-03-02 13:57:50 -08:00
parent 43554cbb62
commit a8ee7f35d6
12 changed files with 45 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

12
daemon/core/xml/xmldeployment.py
View file

@ -25,8 +25,8 @@ class CoreDeploymentWriter(object):
def get_ipv4_addresses(hostname):
if hostname == 'localhost':
addr_list = []
args = (constants.IP_BIN, '-o', '-f', 'inet', 'addr', 'show')
_, output = utils.check_cmd(args)
args = [constants.IP_BIN, '-o', '-f', 'inet', 'addr', 'show']
output = utils.check_cmd(args)
for line in output.split(os.linesep):
split = line.split()
if not split:
@ -43,12 +43,12 @@ class CoreDeploymentWriter(object):
def get_interface_names(hostname):
"""
Uses same methodology of get_ipv4_addresses() to get
parallel list of interface names to go with ...
"""
parallel list of interface names to go with ...
"""
if hostname == 'localhost':
iface_list = []
args = (constants.IP_BIN, '-o', '-f', 'inet', 'addr', 'show')
_, output = utils.check_cmd(args)
args = [constants.IP_BIN, '-o', '-f', 'inet', 'addr', 'show']
output = utils.check_cmd(args)
for line in output.split(os.linesep):
split = line.split()
if not split: