openstack
/
neutron
Code Issues Proposed changes

Merge "Add debug information of the dhclient process"

This commit is contained in:
Zuul 2018-12-19 03:40:28 +00:00 committed by Gerrit Code Review
parent 8c59cfe98e 02dabd6f10
commit 2cd963f903
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/tests/fullstack/resources/machine.py
View File

@ -16,6 +16,7 @@ from distutils import spawn
import itertools
import netaddr
from oslo_log import log as logging
from neutron_lib.api.definitions import portbindings as pbs
from neutron_lib import constants
@ -27,6 +28,7 @@ from neutron.tests.common import machine_fixtures
from neutron.tests.common import net_helpers
FULLSTACK_DHCLIENT_SCRIPT = 'fullstack-dhclient-script'
LOG = logging.getLogger(__name__)
class FakeFullstackMachinesList(list):
@ -146,6 +148,12 @@ class FakeFullstackMachine(machine_fixtures.FakeMachineBase):
return
try:
self.dhclient_async.stop()
cmd = self.dhclient_async.cmd
stdout = list(self.dhclient_async.iter_stdout())
stderr = list(self.dhclient_async.iter_stderr())
LOG.debug('Stopping async dhclient [%(cmd)s]. stdout: '
'[%(stdout)s] - stderr: [%(stderr)s]',
{'cmd': cmd, 'stdout': stdout, 'stderr': stderr})
except async_process.AsyncProcessException:
# If it was already stopped than we don't care about it
pass