Mirrors/network
1
0
Fork 0
mirror of https://github.com/linux-system-roles/network.git synced 2026-07-21 18:28:54 +00:00
Code Issues Projects Releases Wiki Activity

library: don't call run_command() via AnsibleUtil

Browse source
This commit is contained in:
Thomas Haller 2018-01-18 13:43:42 +01:00
parent 25497bfa63
commit 080fb56bfe
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
library/network_connections.py
View file

@ -1965,6 +1965,9 @@ class RunEnvironment:
def log(self, idx, severity, msg, warn_traceback = False, force_fail = False):
raise NotImplementedError()
def run_command(self, argv, encoding = None):
raise NotImplementedError()
class _AnsibleUtil(RunEnvironment):
ARGS = {
@ -1993,6 +1996,9 @@ class _AnsibleUtil(RunEnvironment):
self._module = module
return module
def run_command(self, argv, encoding = None):
return self.module.run_command(argv, encoding = encoding)
@property
def params(self):
return self.module.params
@ -2114,6 +2120,9 @@ class Cmd:
self._check_mode = CheckMode.PREPARE
def run_command(argv, encoding = None):
return self.run_env.run_command(argv, encoding = encoding)
def log_debug(self, idx, msg):
self.log(idx, LogLevel.DEBUG, msg)
@ -2596,7 +2605,7 @@ class Cmd_initscripts(Cmd):
cmd = 'ifdown'
if self.check_mode == CheckMode.REAL_RUN:
rc, out, err = AnsibleUtil.module.run_command([cmd, name], encoding=None)
rc, out, err = self.run_env.run_command([cmd, name])
self.log_info(idx, 'call `%s %s`: rc=%d, out="%s", err="%s"' % (cmd, name, rc, out, err))
if rc != 0:
self.log_error(idx, 'call `%s %s` failed with exit status %d' % (cmd, name, rc))