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

further cleanup in regards the commands that are being used within core

Browse source
This commit is contained in:
Blake J. Harnden 2018-03-01 16:23:58 -08:00
parent 870d87804b
commit 6211b09585
15 changed files with 322 additions and 316 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,12 +1,11 @@
import os
import socket
import subprocess
from core import constants
from core import emane
from core import logger
from core.enumerations import NodeTypes
from core.misc import ipaddress
from core.misc import ipaddress, utils
from core.misc import nodeutils
from core.netns import nodes
from core.xml import xmlutils
@ -26,8 +25,8 @@ class CoreDeploymentWriter(object):
def get_ipv4_addresses(hostname):
if hostname == 'localhost':
addr_list = []
cmd = (constants.IP_BIN, '-o', '-f', 'inet', 'addr', 'show')
output = subprocess.check_output(cmd)
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:
@ -48,8 +47,8 @@ class CoreDeploymentWriter(object):
"""
if hostname == 'localhost':
iface_list = []
cmd = (constants.IP_BIN, '-o', '-f', 'inet', 'addr', 'show')
output = subprocess.check_output(cmd)
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: